ci: finalise release 3.6.1

docs/_configuration/event-stream.md

@@ -152,9 +152,15 @@ policy of a few seconds can be set on the event source of the Event Stream.
 
 ````turtle
 @prefix ldes: <https://w3id.org/ldes#> .
+@prefix server: <http://localhost:8080/> .
+@prefix genericES: <http://localhost:8080/generic-eventstream/> .
+
+server:generic-eventstream a ldes:EventStream ;
+    ldes:eventSource genericES:eventSource .
 
-ldes:retentionPolicy [
+genericES:eventSource a ldes:EventSource ;
+    ldes:retentionPolicy [
         a ldes:LatestVersionSubset ;
         ldes:amount 0 ;
-      ] ;
+    ] .
 ````

docs/_configuration/fragmentations/reference.md

@@ -48,7 +48,7 @@ Example properties:
 
 tree:fragmentationStrategy [
      a tree:ReferenceFragmentation ;
-     tree:fragmentationPath "<http://purl.org/dc/terms/isVersionOf>" ;
+     tree:fragmentationPath <http://purl.org/dc/terms/isVersionOf> ;
      tree:fragmentationKey "version" ;
  ] .
 ```
@@ -84,6 +84,6 @@ The selected object would be
 `<http://njh.me/original-id/123>`
 
 After ingestion the member will be part of the following fragment
-- http://localhost:8080/addresses/by-version?version=<http://njh.me/original-id/123>
+- http://localhost:8080/addresses/by-version?version=http%3A%2F%2Fnjh.me%2Foriginal-id%2F123
 
 NOTE: "version" is based on the configuration property "tree:fragmentationKey".

docs/how-to-run.md

@@ -136,7 +136,7 @@ Here is an explanation provided for all the possibilities on how to tweak and co
     <td>ldes-server.compaction-duration</td>
     <td>Defines how long the redundant compacted fragments will remain on the server</td>
     <td>No</td>
-    <td>PD7</td>
+    <td>P7D</td>
   </tr>
   <tr><td colspan="4"><b>Maintenance</b></td></tr>
   <tr>

ldes-server-admin/ldes-server-admin-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-admin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-admin-common</artifactId>

ldes-server-admin/ldes-server-admin-rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-admin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

ldes-server-admin/ldes-server-admin-rest/src/main/resources/viewShaclShape.ttl

@@ -123,7 +123,7 @@ tree:FragmentationKey
 	sh:name "Fragmentation Path";
     sh:description "Defines the request parameter that will be used in the uri";
     sh:path tree:fragmentationKey ;
-    sh:nodeKind sh:IRI ;
+    sh:datatype xsd:string ;
     sh:maxCount 1 .
 
 ldes:TimeBasedRetentionPolicy
@@ -144,18 +144,18 @@ ldes:VersionBasedRetentionPolicy
     sh:targetClass ldes:LatestVersionSubset ;
     sh:class ldes:LatestVersionSubset ;
     sh:zeroOrOnePath true;
-    sh:property ldes:VersionbaserRetentionAmount .
+    sh:property ldes:VersionbasedRetentionAmount .
 
 tree:TimebasedRetentionValue
 	a sh:PropertyShape;
     sh:name "Value";
     sh:description "The duration during which members will be kept for a certain retention policy.";
     sh:path tree:value ;
-    sh:datatype <http://www.w3.org/2001/XMLSchema#duration> ;
+    sh:datatype xsd:duration ;
     sh:minCount 1 ;
     sh:maxCount 1 .
 
-ldes:VersionbaserRetentionAmount
+ldes:VersionbasedRetentionAmount
 	a sh:PropertyShape;
     sh:name "Amount";
     sh:description "The duration during which members will be kept for a certain retention policy.";

ldes-server-admin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

ldes-server-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-application</artifactId>

ldes-server-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-domain</artifactId>

ldes-server-fetch/ldes-server-fetch-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-fetch</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-fetch-common</artifactId>

ldes-server-fetch/ldes-server-fetch-rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-fetch</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-fetch-rest</artifactId>

ldes-server-fetch/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>ldes-server-fetch</artifactId>

ldes-server-fragmentation/ldes-server-fragmentation-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldes-server-fragmentation</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ldes-server-fragmentation/ldes-server-fragmentation-common/src/main/java/be/vlaanderen/informatievlaanderen/ldes/server/fragmentation/factory/RootBucketCreatorImpl.java

@@ -16,7 +16,7 @@ public RootBucketCreatorImpl(BucketRepository bucketRepository) {
 	@Override
 	public void createRootBucketForView(ViewName viewName) {
 		if (bucketRepository.retrieveRootBucket(viewName).isEmpty()) {
-			bucketRepository.insertBucket(Bucket.createRootBucketForView(viewName));
+			bucketRepository.insertRootBucket(Bucket.createRootBucketForView(viewName));
 		}
 	}
 }

ldes-server-fragmentation/ldes-server-fragmentation-common/src/main/java/be/vlaanderen/informatievlaanderen/ldes/server/fragmentation/repository/BucketRepository.java

@@ -6,6 +6,6 @@
 import java.util.Optional;
 
 public interface BucketRepository {
-	Bucket insertBucket(Bucket bucket);
+	Bucket insertRootBucket(Bucket bucket);
 	Optional<Bucket> retrieveRootBucket(ViewName viewName);
 }

ldes-server-fragmentation/ldes-server-fragmentation-common/src/test/java/be/vlaanderen/informatievlaanderen/ldes/server/fragmentation/RootBucketCreatorImplTest.java

@@ -29,7 +29,7 @@ void when_RootFragmentDoesNotExist_ItIsCreatedAndSaved() {
 
 		InOrder inOrder = inOrder(bucketRepository);
 		inOrder.verify(bucketRepository).retrieveRootBucket(VIEW_NAME);
-		inOrder.verify(bucketRepository).insertBucket(Bucket.createRootBucketForView(VIEW_NAME));
+		inOrder.verify(bucketRepository).insertRootBucket(Bucket.createRootBucketForView(VIEW_NAME));
 		inOrder.verifyNoMoreInteractions();
 	}
 

ldes-server-fragmentation/ldes-server-fragmentation-geospatial/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ldes-server-fragmentation</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ldes-server-fragmentation/ldes-server-fragmentation-reference/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ldes-server-fragmentation</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

ldes-server-fragmentation/ldes-server-fragmentation-timebased-hierarchical/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-fragmentation</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-fragmentation-timebased-hierarchical</artifactId>

ldes-server-fragmentation/ldes-server-pagination/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>ldes-server-fragmentation</artifactId>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ldes-server-pagination</artifactId>

ldes-server-fragmentation/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
     	<groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
     	<artifactId>ldes-server</artifactId>
-    	<version>3.6.0</version>
+    	<version>3.6.1-SNAPSHOT</version>
   	</parent>
 
 	<artifactId>ldes-server-fragmentation</artifactId>

ldes-server-infra-postgres/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <modules>
@@ -24,7 +24,7 @@
 
     <properties>
         <postgresql.version>42.7.4</postgresql.version>
-        <hibernate-extensions.version>3.7.4</hibernate-extensions.version>
+        <hibernate-extensions.version>3.9.0</hibernate-extensions.version>
     </properties>
 
     <dependencies>

ldes-server-infra-postgres/postgres-admin-repository/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-infra-postgres</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgres-admin-repository</artifactId>

ldes-server-infra-postgres/postgres-fetch-repository/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-infra-postgres</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgres-fetch-repository</artifactId>

ldes-server-infra-postgres/postgres-fragmentation-repository/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-infra-postgres</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgres-fragmentation-repository</artifactId>

ldes-server-infra-postgres/postgres-fragmentation-repository/src/main/java/be/vlaanderen/informatievlaanderen/ldes/server/fragmentation/postgres/BucketPostgresRepository.java

@@ -31,10 +31,10 @@ public BucketPostgresRepository(ViewEntityRepository viewEntityRepository, Bucke
 
 	@Override
 	@Transactional
-	public Bucket insertBucket(Bucket bucket) {
+	public Bucket insertRootBucket(Bucket bucket) {
 		String sql = """
-				INSERT INTO pages (bucket_id, expiration, partial_url)
-				VALUES (:bucketId, NULL, :partialUrl)
+				INSERT INTO pages (bucket_id, expiration, partial_url, is_root)
+				VALUES (:bucketId, NULL, :partialUrl, true)
 				ON CONFLICT DO NOTHING
 				""";
 		ViewEntity view = viewEntityRepository.findByViewName(bucket.getViewName().getCollectionName(), bucket.getViewName().getViewName())

ldes-server-infra-postgres/postgres-fragmentation-repository/src/test/java/be/vlaanderen/informatievlaanderen/ldes/server/fragmentation/postgres/BucketPostgresRepositoryTest.java

@@ -41,7 +41,7 @@ void test_Insertion() {
 		final Bucket bucketToSave = new Bucket(BucketDescriptor.of(new BucketDescriptorPair("key", "value"), new BucketDescriptorPair("k", "v")), VIEW_NAME);
 		final Bucket expectedSavedBucket = new Bucket(1L, BucketDescriptor.of(new BucketDescriptorPair("key", "value"), new BucketDescriptorPair("k", "v")), VIEW_NAME, List.of(), 0);
 
-		final Bucket result = bucketPostgresRepository.insertBucket(bucketToSave);
+		final Bucket result = bucketPostgresRepository.insertRootBucket(bucketToSave);
 
 		assertThat(result)
 				.usingRecursiveComparison()

ldes-server-infra-postgres/postgres-ingest-repository/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-infra-postgres</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgres-ingest-repository</artifactId>

ldes-server-infra-postgres/postgres-liquibase/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-infra-postgres</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgres-liquibase</artifactId>

ldes-server-infra-postgres/postgres-liquibase/src/main/resources/db/changelog/3_6_1/add_is_root_column.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+    <changeSet id="add_is_root_column" author="vsds">
+        <preConditions onError="MARK_RAN">
+            <not>
+                <columnExists tableName="pages" columnName="is_root" />
+            </not>
+        </preConditions>
+        <addColumn tableName="pages">
+            <column name="is_root" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false" />
+            </column>
+        </addColumn>
+        <sqlFile path="add_is_root_values.sql" relativeToChangelogFile="true" />
+    </changeSet>
+</databaseChangeLog>

ldes-server-infra-postgres/postgres-liquibase/src/main/resources/db/changelog/3_6_1/add_is_root_values.sql

@@ -0,0 +1,7 @@
+WITH root_page_partial_urls AS (
+    SELECT CONCAT('/', c.name, '/', v.name) AS partial_url
+    FROM collections c
+    JOIN views v ON c.collection_id = v.collection_id
+)
+UPDATE pages SET is_root = true, immutable = false
+WHERE partial_url IN (SELECT partial_url FROM root_page_partial_urls);

ldes-server-infra-postgres/postgres-liquibase/src/main/resources/db/changelog/3_6_1/alter_open_pages_view.sql

@@ -0,0 +1,16 @@
+DROP VIEW IF EXISTS open_pages;
+
+CREATE VIEW open_pages AS
+SELECT DISTINCT ON (p.bucket_id) p.page_id,
+                                 p.bucket_id,
+                                 p.partial_url,
+                                 v.page_size,
+                                 count(pm.member_id) AS assigned_members
+FROM pages p
+    JOIN buckets b ON b.bucket_id = p.bucket_id
+    JOIN views v ON v.view_id = b.view_id
+    LEFT JOIN page_members pm ON pm.page_id = p.page_id
+WHERE NOT p.immutable
+GROUP BY p.page_id, v.page_size, p.bucket_id, p.is_root
+ORDER BY p.bucket_id, p.is_root
+;

ldes-server-infra-postgres/postgres-liquibase/src/main/resources/db/changelog/3_6_1/master.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+    <include relativeToChangelogFile="true" file="add_is_root_column.xml"/>
+    <include relativeToChangelogFile="true" file="alter_open_pages_view.sql"/>
+</databaseChangeLog>

ldes-server-infra-postgres/postgres-liquibase/src/main/resources/db/changelog/master.xml

@@ -12,5 +12,6 @@
     <include file="/db/changelog/3_5_0/master.xml" />
     <include file="/db/changelog/3_5_1/master.xml" />
     <include file="/db/changelog/3_6_0/master.xml" />
+    <include file="/db/changelog/3_6_1/master.xml" />
 
 </databaseChangeLog>

ldes-server-infra-postgres/postgres-maintenance-repository/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>be.vlaanderen.informatievlaanderen.vsds</groupId>
         <artifactId>ldes-server-infra-postgres</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgres-maintenance-repository</artifactId>