java 17 changes (#483)

* java 17 changes * synchronize getSessionDataHolder * revert not required refactor * upgrade jakarta.el glassfish * oo_worker_nodes status column set to integer upgrade querydsl and generate q classes based on jakarta classifier * add jakarta classifier * remove not needed changed * add fixes --------- Co-authored-by: GIlca <[email protected]> Co-authored-by: Larisa Bratean <[email protected]> Co-authored-by: Larisa Bratean <[email protected]>
CloudSlang · Jul 29, 2024 · 70843e7 · 70843e7
1 parent 965889a
commit 70843e7
Show file tree

Hide file tree

Showing 62 changed files with 260 additions and 261 deletions.
diff --git a/dependency-management/dependency-management-impl/pom.xml b/dependency-management/dependency-management-impl/pom.xml
@@ -37,6 +37,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
          <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/...ment-impl/src/main/java/io/cloudslang/dependency/impl/services/DependencyServiceImpl.java b/...ment-impl/src/main/java/io/cloudslang/dependency/impl/services/DependencyServiceImpl.java
@@ -34,7 +34,7 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;

diff --git a/engine/data/score-data-api/pom.xml b/engine/data/score-data-api/pom.xml
@@ -38,11 +38,11 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>javax.persistence</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
@@ -52,29 +52,18 @@
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
-            <scope>provided</scope>
+            <classifier>jakarta</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <classifier>jakarta</classifier>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.mysema.maven</groupId>
-                <artifactId>apt-maven-plugin</artifactId>
-                <version>1.0.9</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/generated-sources/java</outputDirectory>
-                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/data/AbstractIdentifiable.java b/engine/data/score-data-api/src/main/java/io/cloudslang/engine/data/AbstractIdentifiable.java
@@ -18,10 +18,10 @@
 
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * Date: 12/23/13

diff --git a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/data/HiloFactoryBean.java b/engine/data/score-data-api/src/main/java/io/cloudslang/engine/data/HiloFactoryBean.java
@@ -19,7 +19,7 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.sql.DataSource;
 
 public class HiloFactoryBean implements FactoryBean<IdentityGenerator> {

diff --git a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/data/SqlUtils.java b/engine/data/score-data-api/src/main/java/io/cloudslang/engine/data/SqlUtils.java
@@ -16,9 +16,9 @@
 
 package io.cloudslang.engine.data;
 
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

diff --git a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreH2Dialect.java b/engine/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreH2Dialect.java
@@ -22,9 +22,17 @@
 
 public class ScoreH2Dialect extends H2Dialect {
 
-    public ScoreH2Dialect() {
-        super();
-        registerColumnType(Types.LONGVARBINARY, "binary");
+    @Override
+    protected String columnType(int sqlTypeCode) {
+        if (sqlTypeCode == Types.LONGVARBINARY) {
+            return "blob";
+        }
+
+        if (sqlTypeCode == Types.LONGVARCHAR) {
+            return "clob";
+        }
+
+        return super.columnType(sqlTypeCode);
     }
 
     @Override

diff --git a/...ne/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreMySQLDialect.java b/...ne/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreMySQLDialect.java
@@ -28,8 +28,12 @@
  */
 public class ScoreMySQLDialect extends MySQLDialect {
 
-    public ScoreMySQLDialect() {
-        super();
-        registerColumnType(Types.BOOLEAN, "bit");
+    @Override
+    protected String columnType(int sqlTypeCode) {
+        if (sqlTypeCode == Types.BOOLEAN) {
+            return "bit";
+        }
+
+        return super.columnType(sqlTypeCode);
     }
 }
diff --git a/...score-data-api/src/main/java/io/cloudslang/engine/partitions/entities/PartitionGroup.java b/...score-data-api/src/main/java/io/cloudslang/engine/partitions/entities/PartitionGroup.java
@@ -20,9 +20,9 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 /**
  * Date: 4/23/12

diff --git a/engine/data/score-data-impl/pom.xml b/engine/data/score-data-impl/pom.xml
@@ -57,11 +57,6 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

diff --git a/...ta-impl/src/main/java/io/cloudslang/engine/partitions/services/PartitionTemplateImpl.java b/...ta-impl/src/main/java/io/cloudslang/engine/partitions/services/PartitionTemplateImpl.java
@@ -22,10 +22,9 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Required;
 import org.springframework.context.ApplicationContext;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -136,17 +135,14 @@ public void setBeanName(String name) {
 		this.groupName = name;
 	}
 
-	@Required
 	public void setGroupSize(int groupSize) {
 		this.groupSize = groupSize;
 	}
 
-	@Required
 	public void setTimeThreshold(long timeThreshold) {
 		this.timeThreshold = timeThreshold;
 	}
 
-	@Required
 	public void setSizeThreshold(long sizeThreshold) {
 		this.sizeThreshold = sizeThreshold;
 	}

diff --git a/...core-data-impl/src/main/java/io/cloudslang/engine/versioning/entities/VersionCounter.java b/...core-data-impl/src/main/java/io/cloudslang/engine/versioning/entities/VersionCounter.java
@@ -19,9 +19,9 @@
 import io.cloudslang.engine.data.AbstractIdentifiable;
 import org.apache.commons.lang.builder.EqualsBuilder;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.Objects;
 
 

diff --git a/.../src/test/java/io/cloudslang/engine/partitions/services/PartitionTemplateWithEmfTest.java b/.../src/test/java/io/cloudslang/engine/partitions/services/PartitionTemplateWithEmfTest.java
@@ -45,7 +45,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import static org.fest.assertions.Assertions.assertThat;

diff --git a/...mpl/src/test/java/io/cloudslang/engine/versioning/repositories/VersionRepositoryTest.java b/...mpl/src/test/java/io/cloudslang/engine/versioning/repositories/VersionRepositoryTest.java
@@ -41,9 +41,9 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
 import javax.sql.DataSource;
 import java.util.Properties;
 

diff --git a/engine/node/score-node-api/pom.xml b/engine/node/score-node-api/pom.xml
@@ -42,8 +42,8 @@
             <artifactId>spring-data-jpa</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/engine/node/score-node-api/src/main/java/io/cloudslang/engine/node/entities/WorkerLock.java b/engine/node/score-node-api/src/main/java/io/cloudslang/engine/node/entities/WorkerLock.java
@@ -18,9 +18,9 @@
 
 import io.cloudslang.engine.data.AbstractIdentifiable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 /**
  * User: varelasa

diff --git a/engine/node/score-node-api/src/main/java/io/cloudslang/engine/node/entities/WorkerNode.java b/engine/node/score-node-api/src/main/java/io/cloudslang/engine/node/entities/WorkerNode.java
@@ -16,30 +16,29 @@
 
 package io.cloudslang.engine.node.entities;
 
+import io.cloudslang.score.api.WorkerStatusTypeDescriptor;
 import io.cloudslang.score.api.nodes.WorkerStatus;
 import io.cloudslang.engine.data.AbstractIdentifiable;
 import io.cloudslang.score.facade.TempConstants;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.SelectBeforeUpdate;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.validation.constraints.Size;
+import org.hibernate.annotations.Type;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Created by IntelliJ IDEA.
@@ -56,6 +55,7 @@ public class WorkerNode extends AbstractIdentifiable implements Worker {
     @Column(name = "UUID", nullable = false, unique = true, length = 48)
     private String uuid;
 
+    @Type(value = WorkerStatusTypeDescriptor.class)
     @Column(name = "STATUS", nullable = false, length = 20)
     private WorkerStatus status;
 

diff --git a/engine/node/score-node-impl/pom.xml b/engine/node/score-node-impl/pom.xml
@@ -37,7 +37,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 
@@ -103,12 +103,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>

diff --git a/...-node-impl/src/main/java/io/cloudslang/engine/node/repositories/WorkerNodeRepository.java b/...-node-impl/src/main/java/io/cloudslang/engine/node/repositories/WorkerNodeRepository.java
@@ -51,11 +51,6 @@ public interface WorkerNodeRepository extends JpaRepository<WorkerNode,Long> {
 	@Query("select distinct g from WorkerNode w join w.groups g where w.deleted = false")
 	List<String> findGroups();
 
-	@Query(value = "update WorkerNode w set w.ackTime = current_time where w.uuid = ?1")
-	@Modifying
-	void updateAckTime(String uuid);
-
-
 	@Query("select distinct g from WorkerNode w join w.groups g where g in ?1")
 	List<String> findGroups(List<String> groupName);
 

diff --git a/...ore-node-impl/src/main/java/io/cloudslang/engine/node/services/WorkerNodeServiceImpl.java b/...ore-node-impl/src/main/java/io/cloudslang/engine/node/services/WorkerNodeServiceImpl.java
@@ -33,7 +33,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;

diff --git a/...ore-node-impl/src/test/java/io/cloudslang/engine/node/services/WorkerNodeServiceTest.java b/...ore-node-impl/src/test/java/io/cloudslang/engine/node/services/WorkerNodeServiceTest.java
@@ -48,7 +48,7 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Arrays;
 import java.util.Date;

diff --git a/engine/orchestrator/score-orchestrator-api/pom.xml b/engine/orchestrator/score-orchestrator-api/pom.xml
@@ -38,13 +38,19 @@
             <artifactId>score-data-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
-            <scope>provided</scope>
+            <classifier>jakarta</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <classifier>jakarta</classifier>
         </dependency>
     </dependencies>