Merge branch 'release/2.8.12'

sumaris-net · Nov 21, 2023 · cde86a6 · cde86a6
2 parents 61599d2 + 58ec3a9
commit cde86a6
Show file tree

Hide file tree

Showing 36 changed files with 461 additions and 90 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>net.sumaris</groupId>
   <artifactId>sumaris-pod</artifactId>
-  <version>2.8.12-SNAPSHOT</version>
+  <version>2.8.12</version>
   <packaging>pom</packaging>
   <name>SUMARiS</name>
   <description>SUMARiS :: Maven parent</description>

diff --git a/src/site/markdown/doc b/src/site/markdown/doc
diff --git a/src/site/resources/sql/create-table-hsqldb.sql b/src/site/resources/sql/create-table-hsqldb.sql
diff --git a/sumaris-core-shared/pom.xml b/sumaris-core-shared/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.8.12-SNAPSHOT</version>
+    <version>2.8.12</version>
   </parent>
 
   <artifactId>sumaris-core-shared</artifactId>

diff --git a/sumaris-core-shared/src/main/java/net/sumaris/core/dao/schema/DatabaseSchemaDaoImpl.java b/sumaris-core-shared/src/main/java/net/sumaris/core/dao/schema/DatabaseSchemaDaoImpl.java
@@ -196,8 +196,10 @@ public void generateCreateSchemaFile(String filename, boolean doExecute, boolean
         // Add table and columns comment
         try {
             appendRemarks(filename, metadata);
-        } catch (SQLException | IOException e) {
-            throw new SumarisTechnicalException("Error when appending comments on file", e);
+        } catch (Exception e) {
+            // FIXME java.lang.NullPointerException: Cannot invoke "org.hibernate.boot.model.relational.QualifiedName.getCatalogName()" because "name" is null
+            // throw new SumarisTechnicalException("Error when appending comments on file", e);
+            log.error("Failed to export remarks: {}", e.getMessage(), e);
         }
     }
 
@@ -785,9 +787,12 @@ private void appendRemarks(String filename, Metadata metadata) throws SQLExcepti
             HibernateConnectionProvider.setConnection(connection);
         }
 
-        try {
+        try (SessionFactory sf = metadata.buildSessionFactory()) {
             String schemaName = connection.getSchema();
-            metadata.buildSessionFactory().getMetamodel().getEntities().stream()
+            sf.getMetamodel()
+                .getEntities()
+                .stream()
+                .filter(entityType -> entityType.getName() != null)
                 .sorted(Comparator.comparing(EntityType::getName))
                 .forEach(entityType -> {
                     Table table = entityType.getJavaType().getAnnotation(Table.class);
@@ -798,6 +803,7 @@ private void appendRemarks(String filename, Metadata metadata) throws SQLExcepti
                         }
                         // iterate attributes
                         entityType.getAttributes().stream()
+                            .filter(attribute -> attribute.getName() != null)
                             .sorted(Comparator.comparing(Attribute::getName))
                             .forEach(attribute -> {
                                 if (attribute.getJavaMember() instanceof Field) {

diff --git a/sumaris-core-shared/src/main/java/net/sumaris/core/model/annotation/EntityEnums.java b/sumaris-core-shared/src/main/java/net/sumaris/core/model/annotation/EntityEnums.java
@@ -129,6 +129,10 @@ public static String name(IEntityEnum enumeration) {
         return enumeration.name();
     }
 
+    public static boolean isResolved(IEntityEnum enumeration) {
+        return !isUnresolved(enumeration);
+    }
+
     public static boolean isUnresolved(IEntityEnum enumeration) {
         try {
             Object id = Beans.getProperty((Object)enumeration, "id");

diff --git a/sumaris-core/pom.xml b/sumaris-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.8.12-SNAPSHOT</version>
+    <version>2.8.12</version>
   </parent>
 
   <artifactId>sumaris-core</artifactId>
@@ -182,6 +182,10 @@
       <artifactId>liquibase-slf4j</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
 
   </dependencies>
 

diff --git a/sumaris-core/src/main/java/net/sumaris/core/model/data/DenormalizedBatch.java b/sumaris-core/src/main/java/net/sumaris/core/model/data/DenormalizedBatch.java
@@ -215,12 +215,14 @@ public class DenormalizedBatch  implements IEntity<Integer> {
     private DenormalizedBatch parent;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "operation_fk")
+    @JoinColumn(name = "operation_fk",
+        foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, foreignKeyDefinition = "foreign key (operation_fk) references operation(id) on delete cascade"))
     @ToString.Exclude
     private Operation operation;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "sale_fk")
+    @JoinColumn(name = "sale_fk",
+        foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, foreignKeyDefinition = "foreign key (sale_fk) references sale(id) on delete cascade"))
     @ToString.Exclude
     private Sale sale;
 

diff --git a/sumaris-core/src/main/java/net/sumaris/core/model/data/DenormalizedBatchSortingValue.java b/sumaris-core/src/main/java/net/sumaris/core/model/data/DenormalizedBatchSortingValue.java
@@ -80,7 +80,8 @@ public class DenormalizedBatchSortingValue implements IEntity<Integer>
     private QualitativeValue qualitativeValue;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "batch_fk", nullable = false)
+    @JoinColumn(name = "batch_fk", nullable = false,
+        foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, foreignKeyDefinition = "foreign key (batch_fk) references denormalized_batch(id) on delete cascade"))
     @ToString.Exclude
     private DenormalizedBatch batch;
 

diff --git a/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog-2.8.12.xml b/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog-2.8.12.xml
@@ -0,0 +1,99 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<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 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.12.xsd"
+    logicalFilePath="https://github.com/sumaris-net/sumaris-pod/blob/master/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog-2.8.12.xml">
+
+  <!-- Drop the denormalized_batch_operation_fkc constraint -->
+  <changeSet author="[email protected]" id="1700496722792-001">
+    <preConditions onFail="MARK_RAN">
+      <foreignKeyConstraintExists foreignKeyName="denormalized_batch_operation_fkc" />
+    </preConditions>
+    <dropForeignKeyConstraint baseTableName="denormalized_batch"
+                              constraintName="denormalized_batch_operation_fkc"/>
+  </changeSet>
+
+  <!-- Add a new  foreign key with delete cascade -->
+  <changeSet author="[email protected]" id="1700496722792-002">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <foreignKeyConstraintExists foreignKeyName="denormalized_batch_operation_fkc" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseTableName="denormalized_batch"
+                             baseColumnNames="operation_fk"
+                             referencedTableName="operation"
+                             referencedColumnNames="id"
+                             constraintName="denormalized_batch_operation_fkc"
+                             onDelete="CASCADE"/>
+  </changeSet>
+
+  <!-- Drop the denormalized_batch_sale_fkc constraint -->
+  <changeSet author="[email protected]" id="1700496722792-003">
+    <preConditions onFail="MARK_RAN">
+      <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sale_fkc" />
+    </preConditions>
+    <dropForeignKeyConstraint baseTableName="denormalized_batch"
+                              constraintName="denormalized_batch_sale_fkc"/>
+  </changeSet>
+
+  <!-- Add a new denormalized_batch_sale_fkc with delete cascade -->
+  <changeSet author="[email protected]" id="1700496722792-004">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sale_fkc" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseTableName="denormalized_batch"
+                             baseColumnNames="sale_fk"
+                             referencedTableName="sale"
+                             referencedColumnNames="id"
+                             constraintName="denormalized_batch_sale_fkc"
+                             onDelete="CASCADE"/>
+  </changeSet>
+
+
+  <!-- Drop the denormalized_batch_sort_val_batch_fkc constraint -->
+  <changeSet author="[email protected]" id="1700496722792-005">
+    <preConditions onFail="MARK_RAN">
+      <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sort_val_batch_fkc" />
+    </preConditions>
+    <dropForeignKeyConstraint baseTableName="denormalized_batch_sort_val"
+                              constraintName="denormalized_batch_sort_val_batch_fkc"/>
+  </changeSet>
+
+  <!-- Add a new denormalized_batch_sort_val_batch_fkc with delete cascade -->
+  <changeSet author="[email protected]" id="1700496722792-006">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sort_val_batch_fkc" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseTableName="denormalized_batch_sort_val"
+                             baseColumnNames="batch_fk"
+                             referencedTableName="denormalized_batch"
+                             referencedColumnNames="id"
+                             constraintName="denormalized_batch_sort_val_batch_fkc"
+                             onDelete="CASCADE"/>
+  </changeSet>
+
+  <!-- update SYSTEM_VERSION -->
+  <changeSet author="[email protected]" id="1700496722792-200" runOnChange="true">
+    <delete tableName="SYSTEM_VERSION">
+      <where>LABEL='2.8.12'</where>
+    </delete>
+    <insert tableName="SYSTEM_VERSION">
+      <column name="ID" valueComputed="NEXT VALUE FOR SYSTEM_VERSION_SEQ"/>
+      <column name="LABEL">2.8.12</column>
+      <column name="DESCRIPTION">
+        - Add ON DELETE CASCADE on DENORMALIZED_BATCH.OPERATION_FK;
+      </column>
+      <column name="CREATION_DATE" valueComputed="sysdate"/>
+      <column name="UPDATE_DATE" valueComputed="current_timestamp"/>
+      <column name="COMMENTS">
+        - Add ON DELETE CASCADE on DENORMALIZED_BATCH.OPERATION_FK;
+      </column>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
diff --git a/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog-master.xml b/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/hsqldb/db-changelog-master.xml
@@ -196,10 +196,11 @@
 
     <include relativeToChangelogFile="true" file="db-changelog-2.7.0.xml"/>
 
-    <!-- Refresh schema objects (functions, procedures, triggers, ...) -->
-    <include relativeToChangelogFile="true" file="db-changelog-refresh.xml"/>
-
     <include relativeToChangelogFile="true" file="db-changelog-2.8.2.xml"/>
     <include relativeToChangelogFile="true" file="adap/db-changelog-2.8.2.xml"/>
 
+    <include relativeToChangelogFile="true" file="db-changelog-2.8.12.xml"/>
+
+    <!-- Refresh schema objects (functions, procedures, triggers, ...) -->
+    <include relativeToChangelogFile="true" file="db-changelog-refresh.xml"/>
 </databaseChangeLog>
diff --git a/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/pgsql/db-changelog-2.8.12.xml b/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/pgsql/db-changelog-2.8.12.xml
@@ -0,0 +1,98 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<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 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.12.xsd"
+    logicalFilePath="https://github.com/sumaris-net/sumaris-pod/blob/master/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/pgsql/db-changelog-2.8.12.xml">
+
+  <!-- Drop the denormalized_batch_operation_fkc constraint -->
+  <changeSet author="[email protected]" id="1700496722792-001">
+    <preConditions onFail="MARK_RAN">
+      <foreignKeyConstraintExists foreignKeyName="denormalized_batch_operation_fkc" />
+    </preConditions>
+    <dropForeignKeyConstraint baseTableName="denormalized_batch"
+                              constraintName="denormalized_batch_operation_fkc"/>
+  </changeSet>
+
+  <!-- Add a new denormalized_batch_operation_fkc with delete cascade -->
+  <changeSet author="[email protected]" id="1700496722792-002">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <foreignKeyConstraintExists foreignKeyName="denormalized_batch_operation_fkc" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseTableName="denormalized_batch"
+                             baseColumnNames="operation_fk"
+                             referencedTableName="operation"
+                             referencedColumnNames="id"
+                             constraintName="denormalized_batch_operation_fkc"
+                             onDelete="CASCADE"/>
+  </changeSet>
+
+  <!-- Drop the denormalized_batch_sale_fkc constraint -->
+  <changeSet author="[email protected]" id="1700496722792-003">
+    <preConditions onFail="MARK_RAN">
+      <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sale_fkc" />
+    </preConditions>
+    <dropForeignKeyConstraint baseTableName="denormalized_batch"
+                              constraintName="denormalized_batch_sale_fkc"/>
+  </changeSet>
+
+  <!-- Add a new denormalized_batch_sale_fkc with delete cascade -->
+  <changeSet author="[email protected]" id="1700496722792-004">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sale_fkc" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseTableName="denormalized_batch"
+                             baseColumnNames="sale_fk"
+                             referencedTableName="sale"
+                             referencedColumnNames="id"
+                             constraintName="denormalized_batch_sale_fkc"
+                             onDelete="CASCADE"/>
+  </changeSet>
+
+  <!-- Drop the denormalized_batch_sort_val_batch_fkc constraint -->
+  <changeSet author="[email protected]" id="1700496722792-005">
+    <preConditions onFail="MARK_RAN">
+      <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sort_val_batch_fkc" />
+    </preConditions>
+    <dropForeignKeyConstraint baseTableName="denormalized_batch_sort_val"
+                              constraintName="denormalized_batch_sort_val_batch_fkc"/>
+  </changeSet>
+
+  <!-- Add a new denormalized_batch_sort_val_batch_fkc with delete cascade -->
+  <changeSet author="[email protected]" id="1700496722792-006">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <foreignKeyConstraintExists foreignKeyName="denormalized_batch_sort_val_batch_fkc" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseTableName="denormalized_batch_sort_val"
+                             baseColumnNames="batch_fk"
+                             referencedTableName="denormalized_batch"
+                             referencedColumnNames="id"
+                             constraintName="denormalized_batch_sort_val_batch_fkc"
+                             onDelete="CASCADE"/>
+  </changeSet>
+
+  <!-- update SYSTEM_VERSION -->
+  <changeSet author="[email protected]" id="1700496722792-200" runOnChange="true">
+    <delete tableName="SYSTEM_VERSION">
+      <where>LABEL='2.8.12'</where>
+    </delete>
+    <insert tableName="SYSTEM_VERSION">
+      <column name="ID" valueComputed="nextval('system_version_seq')"/>
+      <column name="LABEL">2.8.12</column>
+      <column name="DESCRIPTION">
+        - Add ON DELETE CASCADE on DENORMALIZED_BATCH.OPERATION_FK;
+      </column>
+      <column name="CREATION_DATE" valueComputed="current_timestamp"/>
+      <column name="UPDATE_DATE" valueComputed="current_timestamp"/>
+      <column name="COMMENTS">
+        - Add ON DELETE CASCADE on DENORMALIZED_BATCH.OPERATION_FK;
+      </column>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
diff --git a/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/pgsql/db-changelog-master.xml b/sumaris-core/src/main/resources/net/sumaris/core/db/changelog/pgsql/db-changelog-master.xml
@@ -70,6 +70,7 @@
 
   <include relativeToChangelogFile="true" file="db-changelog-2.3.6.xml"/>
   <include relativeToChangelogFile="true" file="db-changelog-2.7.0.xml"/>
+  <include relativeToChangelogFile="true" file="db-changelog-2.8.12.xml"/>
 
   <!-- Refresh schema objects (functions, procedures, triggers, ...) -->
   <include relativeToChangelogFile="true" file="db-changelog-refresh.xml"/>

diff --git a/sumaris-extraction/pom.xml b/sumaris-extraction/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sumaris</groupId>
 		<artifactId>sumaris-pod</artifactId>
-		<version>2.8.12-SNAPSHOT</version>
+		<version>2.8.12</version>
 	</parent>
 
 	<artifactId>sumaris-extraction</artifactId>