Bump codbex-platform-parent to 13.1.0 (Dirigible 13 / Spring Boot 4 migration)

application/src/main/java/com/codbex/kronos/KronosApplication.java

@@ -13,10 +13,10 @@
 import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

application/src/main/resources/application-app-default.properties

@@ -1,2 +1,2 @@
 server.port=80
-dirigible.scan.packages=org.eclipse.dirigible.components,com.codbex.kronos
+dirigible.scan.packages=org.eclipse.dirigible.components,org.eclipse.dirigible.engine,com.codbex.kronos

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codbex.platform</groupId>
         <artifactId>codbex-platform-parent</artifactId>
-        <version>12.89.0</version>
+        <version>13.1.0</version>
     </parent>
 
     <name>codbex - kronos - parent</name>
@@ -126,6 +126,11 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-jdbc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>

xs/components/engine-hdb/pom.xml

@@ -139,7 +139,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>testcontainers-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBDD.java

@@ -24,9 +24,6 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
-
 import com.google.gson.annotations.Expose;
 
 /**
@@ -46,20 +43,17 @@ public class HDBDD extends HDBDataStructure {
     private Long id;
 
     /** The tables. */
-    @OneToMany(mappedBy = "hdbdd", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "hdbdd", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     private List<HDBTable> tables = new ArrayList<HDBTable>();
 
     /** The tables. */
-    @OneToMany(mappedBy = "hdbdd", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "hdbdd", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     private List<HDBTableType> tableTypes = new ArrayList<HDBTableType>();
 
     /** The views. */
-    @OneToMany(mappedBy = "hdbdd", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "hdbdd", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     private List<HDBView> views = new ArrayList<HDBView>();
 

xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBSynonymGroup.java

@@ -23,9 +23,6 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
-
 import com.google.gson.annotations.Expose;
 
 /**
@@ -45,8 +42,7 @@ public class HDBSynonymGroup extends HDBDataStructure {
     private Long id;
 
     /** The target. */
-    @OneToMany(mappedBy = "group", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "group", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     /** The synonym definitions. */
     Map<String, HDBSynonym> synonymDefinitions = new HashMap<>();

xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTable.java

@@ -27,8 +27,6 @@
 import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -62,16 +60,14 @@ public class HDBTable extends HDBDataStructure {
     /**
      * The columns.
      */
-    @OneToMany(mappedBy = "table", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "table", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     private List<HDBTableColumn> columns = new ArrayList<HDBTableColumn>();
 
     /**
      * The indexes.
      */
-    @OneToMany(mappedBy = "table", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "table", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Nullable
     @Expose
     private List<HDBTableIndex> indexes = new ArrayList<HDBTableIndex>();

xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableConstraints.java

@@ -26,8 +26,6 @@
 import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -51,22 +49,19 @@ public class HDBTableConstraints {
     private HDBTableConstraintPrimaryKey primaryKey;
 
     /** The foreign keys. */
-    @OneToMany(mappedBy = "constraints", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "constraints", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Nullable
     @Expose
     private List<HDBTableConstraintForeignKey> foreignKeys = new ArrayList<HDBTableConstraintForeignKey>();
 
     /** The unique indices. */
-    @OneToMany(mappedBy = "constraints", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "constraints", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Nullable
     @Expose
     private List<HDBTableConstraintUnique> uniqueIndexes = new ArrayList<HDBTableConstraintUnique>();
 
     /** The checks. */
-    @OneToMany(mappedBy = "constraints", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "constraints", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Nullable
     @Expose
     private List<HDBTableConstraintCheck> checks = new ArrayList<HDBTableConstraintCheck>();

xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableStructure.java

@@ -26,8 +26,6 @@
 import jakarta.persistence.OneToOne;
 import java.util.ArrayList;
 import java.util.List;
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -54,8 +52,7 @@ public class HDBTableStructure extends HDBDataStructure {
     /**
      * The columns.
      */
-    @OneToMany(mappedBy = "tableStructure", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "tableStructure", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     private List<HDBTableStructureColumn> columns = new ArrayList<HDBTableStructureColumn>();
 

xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableType.java

@@ -26,8 +26,6 @@
 import jakarta.persistence.OneToOne;
 import java.util.ArrayList;
 import java.util.List;
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -54,8 +52,7 @@ public class HDBTableType extends HDBDataStructure {
     /**
      * The columns.
      */
-    @OneToMany(mappedBy = "tableType", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(mappedBy = "tableType", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Expose
     private List<HDBTableTypeColumn> columns = new ArrayList<HDBTableTypeColumn>();
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbdd/HDBDDDataStructureParserTest.java

@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureDataStructureParserTest.java

@@ -17,8 +17,8 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureProcessorTest.java

@@ -12,8 +12,8 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaDataStructureParserTest.java

@@ -16,8 +16,8 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaProcessorTest.java

@@ -28,8 +28,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceDataStructureParserTest.java

@@ -17,8 +17,8 @@
 import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceProcessorsTest.java

@@ -33,8 +33,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.*;
 import org.mockito.stubbing.Answer;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbstructure/HDBTableStructureDataStructureParserTest.java

@@ -22,8 +22,8 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymDataStructureParserTest.java

@@ -17,8 +17,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymProcessorTest.java

@@ -29,8 +29,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableAlterHandlerTest.java

@@ -28,8 +28,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableDataStructureParserTest.java

@@ -33,8 +33,8 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableProcessorsTest.java

@@ -24,8 +24,8 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionDataStructureParserTest.java

@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionProcessorTest.java

@@ -29,8 +29,8 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.*;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDataStructureParserTest.java

@@ -20,8 +20,8 @@
 
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 

xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDropProcessorTest.java

@@ -21,8 +21,8 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.*;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;