Java17 (#1417)

* java 17 changes * java 17 changes * 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 · 952e53a · 952e53a
1 parent 6d919d6
commit 952e53a
Show file tree

Hide file tree

Showing 26 changed files with 91 additions and 27 deletions.
diff --git a/cloudslang-cli/pom.xml b/cloudslang-cli/pom.xml
@@ -80,6 +80,7 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-core</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -100,6 +101,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -140,6 +142,7 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <!-- liquibase : this is only for fixing liquibase logging issue  -->
@@ -153,6 +156,11 @@
             <artifactId>liquibase-slf4j</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java
@@ -35,7 +35,7 @@
 import org.springframework.shell.core.annotation.CliOption;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java
@@ -16,7 +16,7 @@
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;

diff --git a/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/SlangBootstrapTest.java b/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/SlangBootstrapTest.java
@@ -13,6 +13,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.shell.Bootstrap;
@@ -21,6 +22,7 @@
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore("jdk.internal.reflect.*")
 @PrepareForTest({SlangBootstrap.class, Bootstrap.class})
 public class SlangBootstrapTest {
 

diff --git a/cloudslang-commons/pom.xml b/cloudslang-commons/pom.xml
@@ -11,6 +11,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/cloudslang-commons/src/main/java/io/cloudslang/lang/logging/LoggingServiceImpl.java b/cloudslang-commons/src/main/java/io/cloudslang/lang/logging/LoggingServiceImpl.java
@@ -18,7 +18,7 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.DisposableBean;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;

diff --git a/cloudslang-compiler/pom.xml b/cloudslang-compiler/pom.xml
@@ -25,6 +25,11 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>${score.group}</groupId>
             <artifactId>score-api</artifactId>
@@ -96,6 +101,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/...mpiler/src/main/java/io/cloudslang/lang/compiler/caching/CachedPrecompileServiceImpl.java b/...mpiler/src/main/java/io/cloudslang/lang/compiler/caching/CachedPrecompileServiceImpl.java
@@ -16,7 +16,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.codec.digest.DigestUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 public class CachedPrecompileServiceImpl implements CachedPrecompileService {
 

diff --git a/...g-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ScoreCompilerImpl.java b/...g-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ScoreCompilerImpl.java
@@ -166,7 +166,7 @@ public List<RuntimeException> validateSlangModelWithDirectDependencies(Executabl
      *
      * @param executable the executable to create an {@link io.cloudslang.score.api.ExecutionPlan} for
      * @return {@link io.cloudslang.score.api.ExecutionPlan} of the given
-     * {@link io.cloudslang.lang.compiler.modeller.model.Executable}
+     *{@link io.cloudslang.lang.compiler.modeller.model.Executable}
      */
     private ExecutionPlan compileToExecutionPlan(Executable executable) {
 

diff --git a/cloudslang-content-maven-compiler/pom.xml b/cloudslang-content-maven-compiler/pom.xml
@@ -78,6 +78,7 @@
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
+                <version>2.2.0</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/cloudslang-content-verifier/pom.xml b/cloudslang-content-verifier/pom.xml
@@ -59,6 +59,11 @@
             <artifactId>score-all</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -162,11 +167,13 @@
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/...content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/SlangTestRunner.java b/...content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/SlangTestRunner.java
@@ -316,7 +316,7 @@ private void processActiveTest(final BulkRunMode bulkRunMode, final Map<TestCase
         if (bulkRunMode == BulkRunMode.POSSIBLY_MIXED) {
             TestCaseRunMode runModeForTestCase = testRunInfoService
                     .getRunModeForTestCase(testCase, new RunMultipleTestSuiteConflictResolutionStrategy(),
-                    new SequentialRunTestSuiteResolutionStrategy());
+                        new SequentialRunTestSuiteResolutionStrategy());
             if (runModeForTestCase == TestCaseRunMode.SEQUENTIAL) {
                 resultMap.get(TestCaseRunState.SEQUENTIAL).put(testCaseEntry.getKey(), testCase);
             } else if (runModeForTestCase == TestCaseRunMode.PARALLEL) {

diff --git a/...cloudslang/lang/tools/build/tester/parallel/services/ParallelTestCaseExecutorService.java b/...cloudslang/lang/tools/build/tester/parallel/services/ParallelTestCaseExecutorService.java
@@ -14,7 +14,7 @@
 import java.util.concurrent.Future;
 import org.springframework.beans.factory.DisposableBean;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import static java.lang.Integer.parseInt;
 import static java.lang.String.valueOf;

diff --git a/...io/cloudslang/lang/tools/build/tester/parallel/services/TestCaseEventDispatchService.java b/...io/cloudslang/lang/tools/build/tester/parallel/services/TestCaseEventDispatchService.java
@@ -13,7 +13,7 @@
 import io.cloudslang.lang.tools.build.tester.parallel.testcaseevents.SlangTestCaseEvent;
 import org.apache.commons.lang3.event.EventListenerSupport;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 public class TestCaseEventDispatchService {
 

diff --git a/...n/java/io/cloudslang/lang/tools/build/tester/runconfiguration/TestRunInfoServiceImpl.java b/...n/java/io/cloudslang/lang/tools/build/tester/runconfiguration/TestRunInfoServiceImpl.java
@@ -15,7 +15,7 @@
 import io.cloudslang.lang.tools.build.tester.runconfiguration.strategy.ConflictResolutionStrategy;
 import io.cloudslang.lang.tools.build.tester.runconfiguration.strategy.DefaultResolutionStrategy;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

diff --git a/...r/src/test/java/io/cloudslang/lang/tools/build/tester/parser/TestCasesYamlParserTest.java b/...r/src/test/java/io/cloudslang/lang/tools/build/tester/parser/TestCasesYamlParserTest.java
@@ -117,7 +117,9 @@ public void testCaseFileParsingForNonTestCasesFile() throws Exception {
         RuntimeException exception = assertThrows(RuntimeException.class, () ->
                 parser.parseTestCases(SlangSource.fromFile(fileUri)));
         Assert.assertEquals("There was a problem parsing the YAML source: properties.prop.sl.\n" +
-                "java.lang.String cannot be cast to java.util.Map", exception.getMessage());
+                        "class java.lang.String cannot be cast to class java.util.Map " +
+                        "(java.lang.String and java.util.Map are in module java.base of loader 'bootstrap')",
+                exception.getMessage());
     }
 
     @Test

diff --git a/cloudslang-runtime/pom.xml b/cloudslang-runtime/pom.xml
@@ -35,6 +35,7 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>cloudslang-spi</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -62,6 +63,11 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
@@ -85,11 +91,13 @@
         <dependency>
             <groupId>${score.group}</groupId>
             <artifactId>dependency-management-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>${score.group}</groupId>
             <artifactId>dependency-management-impl</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/...ng-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluator.java b/...ng-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluator.java
@@ -29,7 +29,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/...ang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutor.java b/...ang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutor.java
@@ -17,7 +17,7 @@
 import org.python.core.PyObject;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/services/ScriptsService.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/services/ScriptsService.java
@@ -16,7 +16,7 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;

diff --git a/...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java b/...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java
@@ -47,7 +47,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.Serializable;
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java b/...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java
@@ -48,7 +48,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.Serializable;
 import java.util.Arrays;
 import java.util.HashMap;

diff --git a/...ang-runtime/src/test/java/io/cloudslang/lang/runtime/env/RunEnvironmentSensitiveTest.java b/...ang-runtime/src/test/java/io/cloudslang/lang/runtime/env/RunEnvironmentSensitiveTest.java
@@ -39,10 +39,10 @@
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {RunEnvironmentSensitiveTest.RunEnvironmentSensitiveValueTestConfig.class,
-        SlangEntitiesSpringConfig.class})
+                                 SlangEntitiesSpringConfig.class})
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class RunEnvironmentSensitiveTest {
-    private static final String ENCYPTED = "{Encrypted}";
+    private static final String ENCRYPTED = "{Encrypted}";
     private static final String OBFUSCATED = "{Obfuscated}";
 
     @Test
@@ -233,7 +233,7 @@ public Encryption getTestEncryption() {
 
                 @Override
                 public String encrypt(char[] clearText) {
-                    return ENCYPTED + new String(clearText);
+                    return ENCRYPTED + new String(clearText);
                 }
 
                 @Override
@@ -248,12 +248,12 @@ public char[] deobfuscate(String cypherText) {
 
                 @Override
                 public char[] decrypt(String cypherText) {
-                    return cypherText.substring(ENCYPTED.length()).toCharArray();
+                    return cypherText.substring(ENCRYPTED.length()).toCharArray();
                 }
 
                 @Override
                 public boolean isTextEncrypted(String text) {
-                    return text.startsWith(ENCYPTED);
+                    return text.startsWith(ENCRYPTED);
                 }
             };
         }

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java
@@ -86,6 +86,10 @@ public class ParallelLoopStepsTest {
     private static final String BRANCH_EXCEPTION_MESSAGE = "Exception details placeholder";
     private static final String SUCCESS_RESULT = "SUCCESS";
 
+    static {
+        System.setProperty("python.expressionsEval", "jython");
+    }
+
     @Autowired
     private ParallelLoopExecutionData parallelLoopSteps;
 

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java
@@ -96,6 +96,10 @@
 @ContextConfiguration(classes = StepExecutionDataTest.Config.class)
 public class StepExecutionDataTest {
 
+    static {
+        System.setProperty("python.expressionsEval", "jython");
+    }
+
     @Autowired
     private StepExecutionData stepExecutionData;