ci: finalize release 2.8.0 (#658)

Informatievlaanderen · Jul 2, 2024 · cfca5f3 · cfca5f3
2 parents 401f794 + c063b43
commit cfca5f3
Show file tree

Hide file tree

Showing 105 changed files with 836 additions and 185 deletions.
diff --git a/docs/_ldio/ldio-transformers/ldio-version-object-creator.md b/docs/_ldio/ldio-transformers/ldio-version-object-creator.md
@@ -15,9 +15,9 @@ The Version Object Creator will transform a State Object to a Version Object.
 | Property                 | Description                                                                                                                    | Required | Default                                   | Example                                   | Supported values |
 |:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------|:---------|:------------------------------------------|:------------------------------------------|:-----------------|
 | _date-observed-property_ | Property path (IRI format '<>') that points to a literal which should be used as timestampPath. Defaults to current timestamp. | No       | Current Timestamp                         | \<https://example.org/ObservedAt\>        | String           |
-| _member-type_            | Defines the RDF type of the version object                                                                                     | No       | N/A                                       | https://example.org/Person                | String           |
+| _member-type_            | Defines the RDF type of the object to be transformed to a version object.                                                      | Yes      | N/A                                       | https://example.org/Person                | String           |
 | _delimiter_              | Defines how the version object id will be constructed. (versionOf + delimiter + dateObserved)                                  | No       | /                                         | /                                         | String           |
-| _generatedAt-property_   | A statement will be added to the model with the observedAt value and the given property.                                       | No       | http://www.w3.org/ns/prov#generatedAtTime | http://www.w3.org/ns/prov#generatedAtTime | String           |
+| _generatedAt-property_   | A statement will be added to the model with the generatedAt value and the given property.                                      | No       | http://www.w3.org/ns/prov#generatedAtTime | http://www.w3.org/ns/prov#generatedAtTime | String           |
 | _versionOf-property_     | A statement will be added to the model with the versionOf value and the given property.                                        | No       | http://purl.org/dc/terms/isVersionOf      | http://purl.org/dc/terms/isVersionOf      | String           |
 
 ## Example
@@ -82,7 +82,9 @@ The YAML configuration of this example would be as follows:
 transformers:
   - name: Ldio:VersionObjectCreator
     config:
-      member-type: http://example.org/Something
+      member-type: 
+        - http://example.org/Something
+        - http://example.org/SomethingElse
       delimiter: "#"
       date-observed-property: <http://example.org/created>/<http://www.w3.org/2006/time#inXSDDateTimeStamp>
       generatedAt-property: http://www.w3.org/ns/prov#generatedAtTime

diff --git a/ldi-api/pom.xml b/ldi-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes</groupId>
         <artifactId>linked-data-interactions</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ldi-core/change-detection-filter/pom.xml b/ldi-core/change-detection-filter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>change-detection-filter</artifactId>

diff --git a/ldi-core/file-archiving/pom.xml b/ldi-core/file-archiving/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>file-archiving</artifactId>

diff --git a/ldi-core/geojson-to-wkt/pom.xml b/ldi-core/geojson-to-wkt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geojson-to-wkt</artifactId>

diff --git a/ldi-core/json-to-ld-adapter/pom.xml b/ldi-core/json-to-ld-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>json-to-ld-adapter</artifactId>

diff --git a/ldi-core/ldes-client/pom.xml b/ldi-core/ldes-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ldi-core/ldes-client/starting-node/pom.xml b/ldi-core/ldes-client/starting-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldes-client</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.client</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>starting-node</artifactId>

diff --git a/ldi-core/ldes-client/tree-node-fetcher/pom.xml b/ldi-core/ldes-client/tree-node-fetcher/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldes-client</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.client</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/ldi-core/ldes-client/tree-node-relations-fetcher/pom.xml b/ldi-core/ldes-client/tree-node-relations-fetcher/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldes-client</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.client</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ldi-core/ldes-client/tree-node-supplier/pom.xml b/ldi-core/ldes-client/tree-node-supplier/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldes-client</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.client</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tree-node-supplier</artifactId>

diff --git a/...ient/tree-node-supplier/src/main/java/ldes/client/treenodesupplier/TreeNodeProcessor.java b/...ient/tree-node-supplier/src/main/java/ldes/client/treenodesupplier/TreeNodeProcessor.java
@@ -14,9 +14,12 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 import static java.lang.Thread.sleep;
+import static ldes.client.treenodesupplier.domain.valueobject.ClientStatus.*;
 
 public class TreeNodeProcessor {
 
@@ -25,13 +28,16 @@ public class TreeNodeProcessor {
 	private final TreeNodeFetcher treeNodeFetcher;
 	private final LdesMetaData ldesMetaData;
 	private final RequestExecutor requestExecutor;
+	private final Consumer<ClientStatus> clientStatusConsumer;
 	private MemberRecord memberRecord;
 
 	public TreeNodeProcessor(LdesMetaData ldesMetaData, StatePersistence statePersistence,
-	                         RequestExecutor requestExecutor, TimestampExtractor timestampExtractor) {
+	                         RequestExecutor requestExecutor, TimestampExtractor timestampExtractor,
+	                         Consumer<ClientStatus> clientStatusConsumer) {
 		this.treeNodeRecordRepository = statePersistence.getTreeNodeRecordRepository();
 		this.memberRepository = statePersistence.getMemberRepository();
 		this.requestExecutor = requestExecutor;
+		this.clientStatusConsumer = clientStatusConsumer;
 		this.treeNodeFetcher = new TreeNodeFetcher(requestExecutor, timestampExtractor);
 		this.ldesMetaData = ldesMetaData;
 	}
@@ -99,11 +105,24 @@ private void saveNewRelations(TreeNodeResponse treeNodeResponse) {
 	}
 
 	private TreeNodeRecord getNextTreeNode() {
-		return treeNodeRecordRepository
+		TreeNodeRecord treeNodeRecord = treeNodeRecordRepository
 				.getTreeNodeRecordWithStatusAndEarliestNextVisit(TreeNodeStatus.IMMUTABLE_WITH_UNPROCESSED_MEMBERS)
 				.orElseGet(() -> treeNodeRecordRepository.getTreeNodeRecordWithStatusAndEarliestNextVisit(TreeNodeStatus.NOT_VISITED)
 						.orElseGet(() -> treeNodeRecordRepository.getTreeNodeRecordWithStatusAndEarliestNextVisit(TreeNodeStatus.MUTABLE_AND_ACTIVE)
-								.orElseThrow(() -> new EndOfLdesException("No fragments to mutable or new fragments to process -> LDES ends."))));
+								.orElseThrow(() -> {
+									clientStatusConsumer.accept(COMPLETED);
+									return new EndOfLdesException("No fragments to mutable or new fragments to process -> LDES ends.");
+								})));
+
+		if (Objects.requireNonNull(treeNodeRecord.getTreeNodeStatus()) == TreeNodeStatus.IMMUTABLE_WITH_UNPROCESSED_MEMBERS ||
+		    treeNodeRecord.getTreeNodeStatus() == TreeNodeStatus.IMMUTABLE_WITHOUT_UNPROCESSED_MEMBERS ||
+		    treeNodeRecord.getTreeNodeStatus() == TreeNodeStatus.NOT_VISITED) {
+			clientStatusConsumer.accept(REPLICATING);
+		} else if (treeNodeRecord.getTreeNodeStatus() == TreeNodeStatus.MUTABLE_AND_ACTIVE) {
+			clientStatusConsumer.accept(SYNCHRONISING);
+		}
+
+		return treeNodeRecord;
 	}
 
 	private void waitUntilNextVisit(TreeNodeRecord treeNodeRecord) {

diff --git a/...-supplier/src/main/java/ldes/client/treenodesupplier/domain/valueobject/ClientStatus.java b/...-supplier/src/main/java/ldes/client/treenodesupplier/domain/valueobject/ClientStatus.java
@@ -0,0 +1,5 @@
+package ldes.client.treenodesupplier.domain.valueobject;
+
+public enum ClientStatus {
+	REPLICATING, SYNCHRONISING, COMPLETED, ERROR
+}
diff --git a/...nt/tree-node-supplier/src/test/java/ldes/client/performance/TreeNodeProcessorFactory.java b/...nt/tree-node-supplier/src/test/java/ldes/client/performance/TreeNodeProcessorFactory.java
@@ -19,9 +19,11 @@
 import ldes.client.treenodesupplier.repository.MemberVersionRepository;
 import ldes.client.treenodesupplier.repository.TreeNodeRecordRepository;
 import org.apache.jena.riot.Lang;
+import org.mockito.Mockito;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 class TreeNodeProcessorFactory {
 
@@ -36,7 +38,7 @@ TreeNodeProcessor createTreeNodeProcessor(StatePersistenceStrategy statePersiste
 		};
 		final RequestExecutor requestExecutor = requestExecutorFactory.createNoAuthExecutor();
 		final TimestampExtractor timestampExtractor = new TimestampFromCurrentTimeExtractor();
-		return new TreeNodeProcessor(ldesMetaData, statePersistence, requestExecutor, timestampExtractor);
+		return new TreeNodeProcessor(ldesMetaData, statePersistence, requestExecutor, timestampExtractor, Mockito.mock(Consumer.class));
 	}
 
 	private PostgreSQLContainer startPostgresContainer() {

diff --git a/...nt/tree-node-supplier/src/test/java/ldes/client/treenodesupplier/MemberSupplierSteps.java b/...nt/tree-node-supplier/src/test/java/ldes/client/treenodesupplier/MemberSupplierSteps.java
@@ -15,10 +15,7 @@
 import ldes.client.treenodesupplier.domain.services.MemberRepositoryFactory;
 import ldes.client.treenodesupplier.domain.services.MemberVersionRepositoryFactory;
 import ldes.client.treenodesupplier.domain.services.TreeNodeRecordRepositoryFactory;
-import ldes.client.treenodesupplier.domain.valueobject.LdesMetaData;
-import ldes.client.treenodesupplier.domain.valueobject.StatePersistence;
-import ldes.client.treenodesupplier.domain.valueobject.SuppliedMember;
-import ldes.client.treenodesupplier.domain.valueobject.TreeNodeStatus;
+import ldes.client.treenodesupplier.domain.valueobject.*;
 import ldes.client.treenodesupplier.filters.ExactlyOnceFilter;
 import ldes.client.treenodesupplier.filters.LatestStateFilter;
 import ldes.client.treenodesupplier.filters.MemberFilter;
@@ -31,9 +28,11 @@
 import ldes.client.treenodesupplier.repository.TreeNodeRecordRepository;
 import org.apache.jena.riot.Lang;
 import org.junit.After;
+import org.mockito.Mockito;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import static org.apache.jena.rdf.model.ResourceFactory.createProperty;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -50,6 +49,7 @@ public class MemberSupplierSteps {
 	private LdesMetaData ldesMetaData;
 	private SuppliedMember suppliedMember;
 	private PostgreSQLContainer<?> postgreSQLContainer;
+	private final Consumer<ClientStatus> clientStatusConsumer = Mockito.mock(Consumer.class);
 
 	// Multi MemberSupplier
 	private final MemberSupplier[] memberSuppliers = new MemberSupplier[2];
@@ -105,7 +105,8 @@ public void iCreateAProcessor() {
 		treeNodeProcessor = new TreeNodeProcessor(ldesMetaData,
 				new StatePersistence(memberRepository, memberIdRepository, treeNodeRecordRepository, memberVersionRepository),
 				requestExecutorFactory.createNoAuthExecutor(),
-				timestampPath.isEmpty() ? new TimestampFromCurrentTimeExtractor() : new TimestampFromPathExtractor(createProperty(timestampPath)));
+				timestampPath.isEmpty() ? new TimestampFromCurrentTimeExtractor() : new TimestampFromPathExtractor(createProperty(timestampPath)),
+				clientStatusConsumer);
 	}
 
 	@Then("Member {string} is processed")
@@ -206,11 +207,11 @@ public void aStatePersistenceStrategyProcessorAndAStatePersistenceStrategyProces
 		memberSuppliers[0] = new MemberSupplierImpl(new TreeNodeProcessor(ldesMetaData,
 				defineStatePersistence(arg0),
 				requestExecutorFactory.createNoAuthExecutor(),
-				new TimestampFromPathExtractor(createProperty(timestampPath))), false);
+				new TimestampFromPathExtractor(createProperty(timestampPath)), clientStatusConsumer), false);
 		memberSuppliers[1] = new MemberSupplierImpl(new TreeNodeProcessor(ldesMetaData,
 				defineStatePersistence(arg1),
 				requestExecutorFactory.createNoAuthExecutor(),
-				new TimestampFromPathExtractor(createProperty(timestampPath))), false);
+				new TimestampFromPathExtractor(createProperty(timestampPath)), clientStatusConsumer), false);
 	}
 
 	@When("I request one member from the MemberSuppliers")

diff --git a/...ier/src/test/java/ldes/client/treenodesupplier/domain/valueobject/SuppliedMemberTest.java b/...ier/src/test/java/ldes/client/treenodesupplier/domain/valueobject/SuppliedMemberTest.java
@@ -4,7 +4,7 @@
 import org.apache.jena.rdf.model.ModelFactory;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class SuppliedMemberTest {
 
@@ -13,8 +13,9 @@ void when_SuppliedMemberIsCreated_ModelIsDeepCopied() {
 		Model model = ModelFactory.createDefaultModel();
 		SuppliedMember suppliedMember = new SuppliedMember("id", model);
 
-		model = null;
-		assertNotNull(suppliedMember.getModel());
+		assertThat(suppliedMember.getModel())
+				.isNotNull()
+				.matches(Model::isEmpty);
 	}
 
 }
diff --git a/ldi-core/ldi-common/pom.xml b/ldi-core/ldi-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldi-common</artifactId>

diff --git a/ldi-core/ldi-infra-sql/pom.xml b/ldi-core/ldi-infra-sql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldi-infra-sql</artifactId>

diff --git a/ldi-core/ngsiv2-to-ld-adapter/pom.xml b/ldi-core/ngsiv2-to-ld-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ngsiv2-to-ld-adapter</artifactId>

diff --git a/ldi-core/pom.xml b/ldi-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>linked-data-interactions</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ldi-core/rdf-adapter/pom.xml b/ldi-core/rdf-adapter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldi-core</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ldi-core/repository-materialiser/pom.xml b/ldi-core/repository-materialiser/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/...erialiser/src/test/java/be/vlaanderen/informatievlaanderen/ldes/ldi/MaterialiserTest.java b/...erialiser/src/test/java/be/vlaanderen/informatievlaanderen/ldes/ldi/MaterialiserTest.java
@@ -7,7 +7,6 @@
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
-import org.eclipse.rdf4j.query.Update;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 import org.eclipse.rdf4j.repository.RepositoryException;

diff --git a/ldi-core/request-executor/pom.xml b/ldi-core/request-executor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldi-core</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>request-executor</artifactId>

diff --git a/...ava/be/vlaanderen/informatievlaanderen/ldes/ldi/requestexecutor/RequestExecutorSteps.java b/...ava/be/vlaanderen/informatievlaanderen/ldes/ldi/requestexecutor/RequestExecutorSteps.java
@@ -136,14 +136,14 @@ public void iHaveARequestExecutorWithRateLimiter() {
 
 	@Then("It takes approximately {int} ms to execute the request {int} times")
 	public void itTakesSecondsToExecuteTheRequestTimes(int ms, int requestCount) {
-		LocalDateTime start = LocalDateTime.now();
+		LocalDateTime startTime = LocalDateTime.now();
 		for (int i = 0; i < requestCount; i++) {
 			response = requestExecutor.execute(request);
 		}
-		LocalDateTime end = LocalDateTime.now();
+		LocalDateTime endTime = LocalDateTime.now();
 
-		assertTrue(Duration.between(start, end).toMillis() > ms - 250);
-		assertTrue(Duration.between(start, end).toMillis() < ms + 250);
+		assertTrue(Duration.between(startTime, endTime).toMillis() > ms - 250);
+		assertTrue(Duration.between(startTime, endTime).toMillis() < ms + 250);
 	}
 
 	@Given("I have a requestExecutor which does {int} retries with custom http status code {int} and limits requests")

diff --git a/ldi-core/rml-adapter/pom.xml b/ldi-core/rml-adapter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldi-core</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ldi-core/sparql-construct/pom.xml b/ldi-core/sparql-construct/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.ldes.ldi</groupId>
         <artifactId>ldi-core</artifactId>
-        <version>2.7.0-SNAPSHOT</version>
+        <version>2.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>