diff --git a/dependency-management/dependency-management-impl/pom.xml b/dependency-management/dependency-management-impl/pom.xml index 6ab586bae2..f40ab2af38 100644 --- a/dependency-management/dependency-management-impl/pom.xml +++ b/dependency-management/dependency-management-impl/pom.xml @@ -37,6 +37,10 @@ org.springframework spring-context + + + jakarta.annotation + jakarta.annotation-api org.apache.logging.log4j diff --git a/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/DependencyServiceImpl.java b/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/DependencyServiceImpl.java index 213e70e0b0..259cf3ede5 100644 --- a/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/DependencyServiceImpl.java +++ b/dependency-management/dependency-management-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 index 416b97792f..5f2966132d 100644 --- a/engine/data/score-data-api/pom.xml +++ b/engine/data/score-data-api/pom.xml @@ -38,11 +38,11 @@ commons-lang - org.eclipse.persistence - javax.persistence + jakarta.annotation + jakarta.annotation-api - org.hibernate + org.hibernate.orm hibernate-core @@ -52,29 +52,18 @@ com.querydsl querydsl-apt - provided + jakarta + + + + com.querydsl + querydsl-jpa + jakarta - - com.mysema.maven - apt-maven-plugin - 1.0.9 - - - - process - - - target/generated-sources/java - com.querydsl.apt.jpa.JPAAnnotationProcessor - - - - - org.apache.maven.plugins maven-javadoc-plugin 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 index 2c6157f333..7cedd2adc6 100644 --- 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 index bae33138ab..14fa63ae1d 100644 --- 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 { 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 index fbebb812f3..2c97855de8 100644 --- 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 index 1afcdd8f3d..07bfa9e9f0 100644 --- 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/engine/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreMySQLDialect.java b/engine/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreMySQLDialect.java index e9ecd0d2fc..0190062670 100644 --- a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/dialects/ScoreMySQLDialect.java +++ b/engine/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); } } \ No newline at end of file diff --git a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/partitions/entities/PartitionGroup.java b/engine/data/score-data-api/src/main/java/io/cloudslang/engine/partitions/entities/PartitionGroup.java index 64e77e945d..75947e6107 100644 --- a/engine/data/score-data-api/src/main/java/io/cloudslang/engine/partitions/entities/PartitionGroup.java +++ b/engine/data/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 index d769fa7f84..b7c26091f9 100644 --- a/engine/data/score-data-impl/pom.xml +++ b/engine/data/score-data-impl/pom.xml @@ -57,11 +57,6 @@ h2 test - - org.hibernate - hibernate-entitymanager - test - org.mockito mockito-all diff --git a/engine/data/score-data-impl/src/main/java/io/cloudslang/engine/partitions/services/PartitionTemplateImpl.java b/engine/data/score-data-impl/src/main/java/io/cloudslang/engine/partitions/services/PartitionTemplateImpl.java index 0212476f23..952097df94 100644 --- a/engine/data/score-data-impl/src/main/java/io/cloudslang/engine/partitions/services/PartitionTemplateImpl.java +++ b/engine/data/score-data-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/engine/data/score-data-impl/src/main/java/io/cloudslang/engine/versioning/entities/VersionCounter.java b/engine/data/score-data-impl/src/main/java/io/cloudslang/engine/versioning/entities/VersionCounter.java index d0f4be0493..392a5b604b 100644 --- a/engine/data/score-data-impl/src/main/java/io/cloudslang/engine/versioning/entities/VersionCounter.java +++ b/engine/data/score-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/engine/data/score-data-impl/src/test/java/io/cloudslang/engine/partitions/services/PartitionTemplateWithEmfTest.java b/engine/data/score-data-impl/src/test/java/io/cloudslang/engine/partitions/services/PartitionTemplateWithEmfTest.java index 5a0acd6284..4fc5316882 100644 --- a/engine/data/score-data-impl/src/test/java/io/cloudslang/engine/partitions/services/PartitionTemplateWithEmfTest.java +++ b/engine/data/score-data-impl/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/engine/data/score-data-impl/src/test/java/io/cloudslang/engine/versioning/repositories/VersionRepositoryTest.java b/engine/data/score-data-impl/src/test/java/io/cloudslang/engine/versioning/repositories/VersionRepositoryTest.java index 5b9adbf21f..6592e28eed 100644 --- a/engine/data/score-data-impl/src/test/java/io/cloudslang/engine/versioning/repositories/VersionRepositoryTest.java +++ b/engine/data/score-data-impl/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 index de3f40c299..261812620c 100644 --- a/engine/node/score-node-api/pom.xml +++ b/engine/node/score-node-api/pom.xml @@ -42,8 +42,8 @@ spring-data-jpa - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${project.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 index a3a48bd3fe..a10a6b5204 100644 --- 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 index 260f0b1240..840e73787e 100644 --- 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 index e5ef8247d9..8c7883c6b8 100644 --- a/engine/node/score-node-impl/pom.xml +++ b/engine/node/score-node-impl/pom.xml @@ -37,7 +37,7 @@ - org.hibernate + org.hibernate.orm hibernate-core @@ -103,12 +103,6 @@ test - - org.hibernate - hibernate-entitymanager - test - - org.liquibase liquibase-core diff --git a/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/repositories/WorkerNodeRepository.java b/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/repositories/WorkerNodeRepository.java index 1ec9a26fa6..1c7bea1b5a 100644 --- a/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/repositories/WorkerNodeRepository.java +++ b/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/repositories/WorkerNodeRepository.java @@ -51,11 +51,6 @@ public interface WorkerNodeRepository extends JpaRepository { @Query("select distinct g from WorkerNode w join w.groups g where w.deleted = false") List 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 findGroups(List groupName); diff --git a/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/services/WorkerNodeServiceImpl.java b/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/services/WorkerNodeServiceImpl.java index 974103f963..20c288e119 100644 --- a/engine/node/score-node-impl/src/main/java/io/cloudslang/engine/node/services/WorkerNodeServiceImpl.java +++ b/engine/node/score-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/engine/node/score-node-impl/src/test/java/io/cloudslang/engine/node/services/WorkerNodeServiceTest.java b/engine/node/score-node-impl/src/test/java/io/cloudslang/engine/node/services/WorkerNodeServiceTest.java index 7eff167590..9cab89d728 100644 --- a/engine/node/score-node-impl/src/test/java/io/cloudslang/engine/node/services/WorkerNodeServiceTest.java +++ b/engine/node/score-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 index 65cc2a35d9..deba46f9c4 100644 --- a/engine/orchestrator/score-orchestrator-api/pom.xml +++ b/engine/orchestrator/score-orchestrator-api/pom.xml @@ -38,13 +38,19 @@ score-data-api - org.hibernate + org.hibernate.orm hibernate-core com.querydsl querydsl-apt - provided + jakarta + + + + com.querydsl + querydsl-jpa + jakarta diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContextByteaTypeDescriptor.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContextByteaTypeDescriptor.java index 622ff50ebf..57be4bd69f 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContextByteaTypeDescriptor.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContextByteaTypeDescriptor.java @@ -16,17 +16,14 @@ package io.cloudslang.orchestrator.entities; -import org.hibernate.type.AbstractSingleColumnStandardBasicType; -import org.hibernate.type.descriptor.java.SerializableTypeDescriptor; -import org.hibernate.type.descriptor.sql.LongVarbinaryTypeDescriptor; +import org.hibernate.type.descriptor.java.SerializableJavaType; +import org.hibernate.usertype.UserTypeSupport; -public class BranchContextByteaTypeDescriptor extends AbstractSingleColumnStandardBasicType { +import java.sql.Types; - public BranchContextByteaTypeDescriptor() { - super(LongVarbinaryTypeDescriptor.INSTANCE, new SerializableTypeDescriptor<>(BranchContexts.class)); - } +public class BranchContextByteaTypeDescriptor extends UserTypeSupport { - public String getName() { - return BranchContexts.class.getName(); + public BranchContextByteaTypeDescriptor() { + super(new SerializableJavaType<>(BranchContexts.class).getJavaTypeClass(), Types.LONGVARBINARY); } } \ No newline at end of file diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionByteaTypeDescriptor.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionByteaTypeDescriptor.java index 37be4b8ade..bbb2f1905a 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionByteaTypeDescriptor.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionByteaTypeDescriptor.java @@ -17,17 +17,14 @@ package io.cloudslang.orchestrator.entities; import io.cloudslang.score.facade.entities.Execution; -import org.hibernate.type.AbstractSingleColumnStandardBasicType; -import org.hibernate.type.descriptor.java.SerializableTypeDescriptor; -import org.hibernate.type.descriptor.sql.LongVarbinaryTypeDescriptor; +import org.hibernate.type.descriptor.java.SerializableJavaType; +import org.hibernate.usertype.UserTypeSupport; -public class ExecutionByteaTypeDescriptor extends AbstractSingleColumnStandardBasicType { +import java.sql.Types; - public ExecutionByteaTypeDescriptor() { - super(LongVarbinaryTypeDescriptor.INSTANCE, new SerializableTypeDescriptor<>(Execution.class)); - } +public class ExecutionByteaTypeDescriptor extends UserTypeSupport { - public String getName() { - return Execution.class.getName(); + public ExecutionByteaTypeDescriptor() { + super(new SerializableJavaType<>(Execution.class).getJavaTypeClass(), Types.LONGVARBINARY); } } diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java index 698066daa3..78ab50ca65 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java @@ -17,11 +17,11 @@ package io.cloudslang.orchestrator.entities; import io.cloudslang.score.facade.entities.Execution; -import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Lob; +import org.hibernate.annotations.Type; /** * Created by IntelliJ IDEA. @@ -33,7 +33,7 @@ public class ExecutionObjEntity { @Lob @Column(name = "EXECUTION_OBJECT") - @Type(type = "io.cloudslang.orchestrator.entities.ExecutionByteaTypeDescriptor") + @Type(value = io.cloudslang.orchestrator.entities.ExecutionByteaTypeDescriptor.class) private Execution executionObj; public Execution getExecutionObj() { diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java index 4a8cd86d6b..7ed08d1963 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java @@ -20,17 +20,20 @@ import io.cloudslang.score.facade.execution.ExecutionStatus; import io.cloudslang.score.facade.execution.ExecutionSummary; import org.apache.commons.lang.builder.EqualsBuilder; +import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import org.hibernate.usertype.UserTypeLegacyBridge; + import java.util.Arrays; /** @@ -56,7 +59,8 @@ public class ExecutionState extends AbstractIdentifiable { @Column(name = "EXECUTION_OBJECT") @Lob - @Type(type = "org.hibernate.type.ImageType") + @Type(value = UserTypeLegacyBridge.class, + parameters = @Parameter(name = UserTypeLegacyBridge.TYPE_NAME_PARAM_KEY, value = "image")) @Basic(fetch = FetchType.LAZY) private byte[] executionObject; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java index 846f1fabae..be60eae8d7 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java @@ -17,19 +17,20 @@ package io.cloudslang.orchestrator.entities; import io.cloudslang.engine.data.AbstractIdentifiable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.hibernate.annotations.Immutable; +import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import org.hibernate.usertype.UserTypeLegacyBridge; /** * Created with IntelliJ IDEA. @@ -53,12 +54,14 @@ public class FinishedBranch extends AbstractIdentifiable { @Lob @Basic(fetch = FetchType.LAZY) + @Type(value = UserTypeLegacyBridge.class, + parameters = @Parameter(name = UserTypeLegacyBridge.TYPE_NAME_PARAM_KEY, value = "text")) @Column(name = "BRANCH_EXCEPTION", updatable = false) private String branchException; @Column(name = "BRANCH_CONTEXT", nullable = false, updatable = false) @Lob - @Type(type = "io.cloudslang.orchestrator.entities.BranchContextByteaTypeDescriptor") + @Type(value = io.cloudslang.orchestrator.entities.BranchContextByteaTypeDescriptor.class) private BranchContexts branchContexts; @ManyToOne diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java index f0ecc5ce5f..2e56865ce2 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java @@ -20,19 +20,19 @@ import io.cloudslang.score.facade.entities.Execution; import io.cloudslang.engine.data.AbstractIdentifiable; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Column; -import javax.persistence.Enumerated; -import javax.persistence.Basic; -import javax.persistence.Embedded; -import javax.persistence.OneToMany; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Basic; +import jakarta.persistence.Embedded; +import jakarta.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.FetchType; import java.util.HashSet; import java.util.Set; -import static javax.persistence.EnumType.STRING; +import static jakarta.persistence.EnumType.STRING; /** * Created with IntelliJ IDEA. diff --git a/engine/orchestrator/score-orchestrator-impl/pom.xml b/engine/orchestrator/score-orchestrator-impl/pom.xml index a9a20193ed..1579e81fe3 100644 --- a/engine/orchestrator/score-orchestrator-impl/pom.xml +++ b/engine/orchestrator/score-orchestrator-impl/pom.xml @@ -62,7 +62,7 @@ - org.hibernate + org.hibernate.orm hibernate-core @@ -79,6 +79,7 @@ com.querydsl querydsl-jpa + jakarta @@ -127,12 +128,6 @@ test - - org.hibernate - hibernate-entitymanager - test - - org.hibernate.validator hibernate-validator diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java index 939484d71e..01d33e2809 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java @@ -27,7 +27,7 @@ import org.springframework.data.jpa.repository.QueryHints; import org.springframework.data.repository.query.Param; -import javax.persistence.QueryHint; +import jakarta.persistence.QueryHint; import java.lang.Long; import java.lang.String; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionRepositoryCustomImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionRepositoryCustomImpl.java index 049f56ae6c..f6377aee6e 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionRepositoryCustomImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionRepositoryCustomImpl.java @@ -18,9 +18,9 @@ import io.cloudslang.orchestrator.entities.SuspendedExecution; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/MergedConfigurationServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/MergedConfigurationServiceImpl.java index 686e70fe3d..3ee191ee37 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/MergedConfigurationServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/MergedConfigurationServiceImpl.java @@ -20,13 +20,12 @@ import io.cloudslang.engine.node.services.WorkerNodeService; import io.cloudslang.orchestrator.entities.MergedConfigurationDataContainer; import io.cloudslang.orchestrator.model.MergedConfigurationHolder; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import java.util.HashSet; import java.util.Map; import java.util.Set; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java index 37e0cfa5e3..8e143228e3 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java @@ -19,10 +19,10 @@ import io.cloudslang.engine.data.SimpleHiloIdentifierGenerator; import io.cloudslang.orchestrator.entities.ExecutionState; import io.cloudslang.score.facade.execution.ExecutionStatus; +import jakarta.persistence.EntityManagerFactory; import liquibase.integration.spring.SpringLiquibase; import org.apache.commons.dbcp.BasicDataSource; import org.hibernate.jpa.HibernatePersistenceProvider; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,9 +40,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.PlatformTransactionManager; -import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; -import java.util.*; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Properties; +import java.util.UUID; import static org.fest.assertions.Assertions.assertThat; @@ -52,7 +55,7 @@ */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration -public class ExecutionStateRepositoryTest{ +public class ExecutionStateRepositoryTest { @Autowired private ExecutionStateRepository executionStateRepository; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java index 468ed1e287..f78496a33c 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java @@ -21,8 +21,6 @@ import io.cloudslang.engine.queue.entities.ExecutionMessageConverter; import io.cloudslang.engine.queue.repositories.ExecutionQueueRepository; import io.cloudslang.engine.queue.services.QueueDispatcherService; -import io.cloudslang.score.events.FastEventBus; -import io.cloudslang.score.facade.entities.Execution; import io.cloudslang.orchestrator.entities.BranchContexts; import io.cloudslang.orchestrator.entities.FinishedBranch; import io.cloudslang.orchestrator.entities.SplitMessage; @@ -30,6 +28,7 @@ import io.cloudslang.orchestrator.repositories.FinishedBranchRepository; import io.cloudslang.orchestrator.repositories.SuspendedExecutionsRepository; import io.cloudslang.score.api.EndBranchDataContainer; +import io.cloudslang.score.events.FastEventBus; import io.cloudslang.score.facade.entities.Execution; import io.cloudslang.score.lang.SystemContext; import org.junit.Before; @@ -41,7 +40,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.Pageable; import org.springframework.test.context.ContextConfiguration; @@ -58,7 +56,6 @@ import static ch.lambdaj.Lambda.on; import static ch.lambdaj.Lambda.select; import static io.cloudslang.orchestrator.enums.SuspendedExecutionReason.MULTI_INSTANCE; -import static io.cloudslang.orchestrator.enums.SuspendedExecutionReason.NON_BLOCKING; import static io.cloudslang.orchestrator.enums.SuspendedExecutionReason.PARALLEL; import static io.cloudslang.orchestrator.enums.SuspendedExecutionReason.PARALLEL_LOOP; import static java.util.EnumSet.of; diff --git a/engine/queue/score-queue-impl/pom.xml b/engine/queue/score-queue-impl/pom.xml index 85ebf17173..5dcc4576d9 100644 --- a/engine/queue/score-queue-impl/pom.xml +++ b/engine/queue/score-queue-impl/pom.xml @@ -109,13 +109,7 @@ - org.hibernate - hibernate-entitymanager - test - - - - org.hibernate + org.hibernate.orm hibernate-core diff --git a/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/repositories/ExecutionQueueRepositoryImpl.java b/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/repositories/ExecutionQueueRepositoryImpl.java index 91564dd952..9965d4e4d8 100644 --- a/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/repositories/ExecutionQueueRepositoryImpl.java +++ b/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/repositories/ExecutionQueueRepositoryImpl.java @@ -36,7 +36,7 @@ import org.springframework.jdbc.support.JdbcUtils; import org.springframework.jdbc.support.MetaDataAccessException; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.sql.DataSource; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/engine/score-facade/pom.xml b/engine/score-facade/pom.xml index 761864f635..516dfa210d 100644 --- a/engine/score-facade/pom.xml +++ b/engine/score-facade/pom.xml @@ -42,7 +42,7 @@ - org.hibernate + org.hibernate.orm hibernate-core diff --git a/engine/score-facade/src/main/java/io/cloudslang/score/facade/entities/RunningExecutionPlan.java b/engine/score-facade/src/main/java/io/cloudslang/score/facade/entities/RunningExecutionPlan.java index 0eca20f10a..139255b30b 100644 --- a/engine/score-facade/src/main/java/io/cloudslang/score/facade/entities/RunningExecutionPlan.java +++ b/engine/score-facade/src/main/java/io/cloudslang/score/facade/entities/RunningExecutionPlan.java @@ -22,13 +22,13 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** * Created by IntelliJ IDEA. diff --git a/package/score-all/pom.xml b/package/score-all/pom.xml index a19fc6b4d8..eaa0fc9a7b 100644 --- a/package/score-all/pom.xml +++ b/package/score-all/pom.xml @@ -72,10 +72,6 @@ ${project.version} - - org.hibernate - hibernate-entitymanager - org.liquibase liquibase-core diff --git a/package/score-all/src/main/java/io/cloudslang/schema/context/ScoreDatabaseContext.java b/package/score-all/src/main/java/io/cloudslang/schema/context/ScoreDatabaseContext.java index 61a7717bca..d39c5bc7ab 100644 --- a/package/score-all/src/main/java/io/cloudslang/schema/context/ScoreDatabaseContext.java +++ b/package/score-all/src/main/java/io/cloudslang/schema/context/ScoreDatabaseContext.java @@ -28,7 +28,7 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import java.util.Properties; diff --git a/pom.xml b/pom.xml index 42ad3943b5..15bf927d48 100644 --- a/pom.xml +++ b/pom.xml @@ -52,10 +52,10 @@ 3.0.1 3.0.0-M4 3.1.0 - 3.0.0-M5 + 3.2.1 3.8.1 3.2.0 - 3.1.2 + 3.6.0 3.0.0-M1 3.6.0 @@ -64,13 +64,13 @@ 1.3.0 8.0.20 42.6.1 - 5.3.32 - 5.4.28.Final - 4.2.1 + 6.0.3 + 6.2.5.Final + 5.0.0 UTF-8 - 1.8 - 1.8 + 17 + 17 overwriten_by_ci @@ -225,7 +225,7 @@ org.glassfish jakarta.el - 3.0.4 + 5.0.0-M1 @@ -295,7 +295,7 @@ org.springframework.data spring-data-jpa - 2.4.5 + 3.1.1 junit @@ -307,23 +307,12 @@ - org.eclipse.persistence - javax.persistence - 2.2.1 - - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - - + jakarta.annotation + jakarta.annotation-api + 2.1.1 - org.hibernate + org.hibernate.orm hibernate-core ${hibernate.version} @@ -346,18 +335,15 @@ com.querydsl querydsl-apt ${querydsl.version} + jakarta provided + com.querydsl querydsl-jpa - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - - ${querydsl.version} + jakarta @@ -376,9 +362,9 @@ 2.15.2 - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + 3.0.2 @@ -505,9 +491,9 @@ none - javax.interceptor - javax.interceptor-api - 1.2 + jakarta.interceptor + jakarta.interceptor-api + 2.1.0 @@ -536,6 +522,12 @@ org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} + + + + -parameters + + org.apache.maven.plugins @@ -566,6 +558,18 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.io=ALL-UNNAMED + + + com.mycila license-maven-plugin diff --git a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonExecutionPooledAndCachedEngine.java b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonExecutionPooledAndCachedEngine.java index e9d99d0ab6..a92743bb5e 100644 --- a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonExecutionPooledAndCachedEngine.java +++ b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonExecutionPooledAndCachedEngine.java @@ -24,12 +24,12 @@ import io.cloudslang.runtime.impl.ExecutionEngine; import io.cloudslang.runtime.impl.python.pool.ViburEmbeddedPythonPoolService; import io.cloudslang.runtime.impl.python.pool.ViburEmbeddedPythonPoolServiceImpl; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.vibur.objectpool.util.ConcurrentLinkedQueueCollection; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.io.Serializable; import java.util.Map; import java.util.Set; diff --git a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java index 435802581b..d89770d0c4 100644 --- a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java +++ b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java @@ -20,7 +20,7 @@ import io.cloudslang.runtime.api.python.PythonExecutionResult; import io.cloudslang.runtime.api.python.PythonRuntimeService; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.Serializable; import java.util.Map; import java.util.Set; diff --git a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/executor/services/PythonExecutorLifecycleManagerServiceImpl.java b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/executor/services/PythonExecutorLifecycleManagerServiceImpl.java index 32f1046c86..2df3904a4d 100644 --- a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/executor/services/PythonExecutorLifecycleManagerServiceImpl.java +++ b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/executor/services/PythonExecutorLifecycleManagerServiceImpl.java @@ -27,8 +27,8 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.net.MalformedURLException; import java.net.URL; import java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/external/ExternalPythonRuntimeServiceImpl.java b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/external/ExternalPythonRuntimeServiceImpl.java index d6c9a1bb3b..53af062ffc 100644 --- a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/external/ExternalPythonRuntimeServiceImpl.java +++ b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/external/ExternalPythonRuntimeServiceImpl.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.Serializable; import java.util.Map; import java.util.Set; diff --git a/runtime-management/runtime-management-impl/src/test/java/io/cloudslang/runtime/impl/python/PythonExecutorTest.java b/runtime-management/runtime-management-impl/src/test/java/io/cloudslang/runtime/impl/python/PythonExecutorTest.java index 23ed1badbf..d35bc5d8f2 100644 --- a/runtime-management/runtime-management-impl/src/test/java/io/cloudslang/runtime/impl/python/PythonExecutorTest.java +++ b/runtime-management/runtime-management-impl/src/test/java/io/cloudslang/runtime/impl/python/PythonExecutorTest.java @@ -41,7 +41,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.File; import java.io.Serializable; import java.text.MessageFormat; diff --git a/score-api/pom.xml b/score-api/pom.xml index ea063f8561..518317b920 100644 --- a/score-api/pom.xml +++ b/score-api/pom.xml @@ -29,6 +29,11 @@ score-api + + org.hibernate.orm + hibernate-core + + commons-lang commons-lang diff --git a/score-api/src/main/java/io/cloudslang/score/api/WorkerStatusTypeDescriptor.java b/score-api/src/main/java/io/cloudslang/score/api/WorkerStatusTypeDescriptor.java new file mode 100644 index 0000000000..609229e0eb --- /dev/null +++ b/score-api/src/main/java/io/cloudslang/score/api/WorkerStatusTypeDescriptor.java @@ -0,0 +1,28 @@ +/* + * Copyright © 2014-2017 EntIT Software LLC, a Micro Focus company (L.P.) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.cloudslang.score.api; + +import io.cloudslang.score.api.nodes.WorkerStatus; +import org.hibernate.usertype.UserTypeSupport; + +import java.sql.Types; + +public class WorkerStatusTypeDescriptor extends UserTypeSupport { + public WorkerStatusTypeDescriptor() { + super(WorkerStatus.class, Types.INTEGER); + } +} diff --git a/score-tests/src/test/java/io/cloudslang/samples/StandAloneTest.java b/score-tests/src/test/java/io/cloudslang/samples/StandAloneTest.java index 2184a3515b..2eb8b33a97 100644 --- a/score-tests/src/test/java/io/cloudslang/samples/StandAloneTest.java +++ b/score-tests/src/test/java/io/cloudslang/samples/StandAloneTest.java @@ -28,6 +28,7 @@ import io.cloudslang.score.events.EventConstants; import io.cloudslang.score.events.ScoreEvent; import io.cloudslang.score.events.ScoreEventListener; +import jakarta.annotation.PostConstruct; import junit.framework.Assert; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +40,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.annotation.PostConstruct; import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; diff --git a/score-tests/src/test/java/io/cloudslang/schema/EngineTest.java b/score-tests/src/test/java/io/cloudslang/schema/EngineTest.java index 778822c171..dd2d2e733e 100644 --- a/score-tests/src/test/java/io/cloudslang/schema/EngineTest.java +++ b/score-tests/src/test/java/io/cloudslang/schema/EngineTest.java @@ -55,7 +55,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import java.util.List; import java.util.Properties; diff --git a/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/ExecutionServiceImpl.java b/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/ExecutionServiceImpl.java index 05ec23b5a9..b5e279cfd5 100644 --- a/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/ExecutionServiceImpl.java +++ b/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/ExecutionServiceImpl.java @@ -42,14 +42,14 @@ import io.cloudslang.worker.execution.reflection.ReflectionAdapter; import io.cloudslang.worker.management.WorkerConfigurationService; import io.cloudslang.worker.management.services.dbsupport.WorkerDbSupportService; +import jakarta.annotation.PostConstruct; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import java.io.Serializable; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/SessionDataHandlerImpl.java b/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/SessionDataHandlerImpl.java index b29787051d..14d5ae6c76 100644 --- a/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/SessionDataHandlerImpl.java +++ b/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/SessionDataHandlerImpl.java @@ -75,7 +75,7 @@ public Map getSessionsExecutionData(Long executionId, Long branc return sessionDataHolder.getSessionData(); } - private SessionDataHolder getSessionDataHolder(Long executionId, Long branchId) { + private synchronized SessionDataHolder getSessionDataHolder(Long executionId, Long branchId) { final Map sessionMap = sessionsExecutionDataMap.computeIfAbsent(executionId, (e) -> new HashMap<>()); return sessionMap.computeIfAbsent(branchId, SessionDataHolder::new); diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/WorkerRegistration.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/WorkerRegistration.java index 6cde401047..9501ff21bf 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/WorkerRegistration.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/WorkerRegistration.java @@ -20,9 +20,9 @@ import java.net.UnknownHostException; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/ScheduledWorkerLoadMonitor.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/ScheduledWorkerLoadMonitor.java index cf51579fac..0c4eb72929 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/ScheduledWorkerLoadMonitor.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/ScheduledWorkerLoadMonitor.java @@ -21,7 +21,7 @@ import io.cloudslang.worker.management.services.WorkerMonitorInfoEnum; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.Serializable; import java.util.Map; diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/WorkerMonitorsImpl.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/WorkerMonitorsImpl.java index 8b0dd06fac..0871306251 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/WorkerMonitorsImpl.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/monitor/WorkerMonitorsImpl.java @@ -23,7 +23,7 @@ import io.cloudslang.worker.management.services.WorkerMonitorInfoEnum; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/InBuffer.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/InBuffer.java index 2d9c44dc53..417928a7d0 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/InBuffer.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/InBuffer.java @@ -32,8 +32,8 @@ import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.ContextRefreshedEvent; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; import java.util.List; diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/OutboundBufferImpl.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/OutboundBufferImpl.java index 4cc9f19d57..7c9c774c2d 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/OutboundBufferImpl.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/OutboundBufferImpl.java @@ -20,14 +20,13 @@ import io.cloudslang.orchestrator.entities.Message; import io.cloudslang.orchestrator.services.OrchestratorDispatcherService; import io.cloudslang.worker.management.ExecutionsActivityListener; -import org.apache.commons.lang3.ArrayUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/SimpleExecutionRunnableFactory.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/SimpleExecutionRunnableFactory.java index 5644918e08..793bfe50c9 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/SimpleExecutionRunnableFactory.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/SimpleExecutionRunnableFactory.java @@ -16,27 +16,14 @@ package io.cloudslang.worker.management.services; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.cloudslang.engine.queue.entities.ExecutionMessageConverter; import io.cloudslang.engine.queue.services.QueueStateIdGeneratorService; -import io.cloudslang.orchestrator.services.SuspendedExecutionService; import io.cloudslang.worker.execution.services.ExecutionService; import io.cloudslang.worker.management.WorkerConfigurationService; +import jakarta.annotation.Resource; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; - -import static java.lang.Long.MAX_VALUE; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.TimeUnit.SECONDS; - public class SimpleExecutionRunnableFactory implements FactoryBean { @Autowired diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/WorkerManager.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/WorkerManager.java index 0de3ee99db..3cd743764c 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/WorkerManager.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/io/cloudslang/worker/management/services/WorkerManager.java @@ -33,8 +33,8 @@ import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.ContextRefreshedEvent; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; import java.io.File; import java.io.FileFilter; import java.util.Collection; diff --git a/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/PerformanceMetricsCollector.java b/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/PerformanceMetricsCollector.java index 0689cbc1c2..d3ab55b9b7 100644 --- a/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/PerformanceMetricsCollector.java +++ b/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/PerformanceMetricsCollector.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; import oshi.software.os.OSProcess; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.Serializable; import java.lang.Boolean; import java.util.ArrayList; diff --git a/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/CpuUtilizationService.java b/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/CpuUtilizationService.java index 608701fc77..d048151f62 100644 --- a/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/CpuUtilizationService.java +++ b/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/CpuUtilizationService.java @@ -17,12 +17,12 @@ import io.cloudslang.worker.monitor.metric.WorkerPerfMetric; import io.cloudslang.worker.monitor.service.WorkerPerformanceMetric; +import jakarta.annotation.PostConstruct; import org.apache.commons.lang3.tuple.Pair; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.software.os.OSProcess; -import javax.annotation.PostConstruct; import java.io.Serializable; import static io.cloudslang.worker.monitor.metric.WorkerPerfMetric.formatTo2Decimal; diff --git a/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/MemoryUtilizationService.java b/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/MemoryUtilizationService.java index 68f9b4bda1..63a53ca5bd 100644 --- a/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/MemoryUtilizationService.java +++ b/worker/worker-monitor/score-worker-monitor-impl/src/main/java/io/cloudslang/worker/monitor/metrics/MemoryUtilizationService.java @@ -22,7 +22,7 @@ import oshi.hardware.GlobalMemory; import oshi.software.os.OSProcess; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.Serializable; import static io.cloudslang.worker.monitor.metric.WorkerPerfMetric.formatTo2Decimal;