Merge pull request #980 from galasa-dev/java17-uplift

Java17 uplift
galasa-dev · Aug 20, 2024 · 103087e · 103087e
2 parents 86ff4d5 + 90a580a
commit 103087e
Show file tree

Hide file tree

Showing 10 changed files with 735 additions and 632 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -48,7 +48,7 @@ jobs:
       - name: Setup JDK 
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'semeru'
 
       - name: Print githash
@@ -58,7 +58,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 6.9.2
+          gradle-version: 8.9
 
       - name: Build Managers source code
         if: github.event_name == 'push'

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup JDK 
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'semeru'
 
       - name: Print githash
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 6.9.2
+          gradle-version: 8.9
 
       - name: Build Managers source code
         run: |

diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle
@@ -21,7 +21,7 @@ dependencies {
 }
 
 jacoco {
-    toolVersion = "0.8.6"
+    toolVersion = "0.8.7"
 }
 
 test {

diff --git a/...a-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle b/...a-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'galasa.manager'
     id 'checkstyle'
     id 'pmd'
-    id("com.github.spotbugs") version "4.7.0"
+    id("com.github.spotbugs") version "6.0.20"
 }
 
 description = 'Galasa SDV Manager'

diff --git a/...t/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml b/...t/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml
@@ -5,6 +5,10 @@
     <Match>
         <Class name="dev.galasa.sdv.internal.properties.SdvPropertiesSingleton" />
         <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
+    </Match>
+     <Match>
+        <Class name="dev.galasa.sdv.internal.properties.SdvPropertiesSingleton" />
+        <Bug pattern="SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR" />
     </Match>
     <Match>
         <Class name="dev.galasa.sdv.internal.properties.SdvPropertiesSingleton" />

diff --git a/...dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java b/...dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java
diff --git a/...rent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java b/...rent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java
@@ -38,7 +38,6 @@
 import dev.galasa.zosbatch.IZosBatchJob;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -51,6 +50,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
+import sun.misc.Unsafe;
 
 
 class TestSdvManagerImpl {
@@ -93,7 +93,7 @@ class TestSdvManagerImpl {
     private String frameworkString = "framework";
     private String sdvRecorderVarName = "sdvRecorder";
     private String logString = "LOG";
-    private String modifiersString = "modifiers";
+    private String theUnsafeString = "theUnsafe";
     private String regionaApplid = "APPL1";
     private String runName = "RUN123";
     private String regionbApplid = "APPL2";
@@ -764,13 +764,14 @@ void testProvisionGenerateOldCicsVersionForRegionA()
         sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionGenerate();
@@ -912,13 +913,14 @@ void testProvisionGenerateNoSecMsg() throws ClassNotFoundException, Instantiatio
         sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionGenerate();
@@ -1057,13 +1059,14 @@ void testProvisionGenerateNoUsersForRegion()
         sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionGenerate();
@@ -1422,13 +1425,14 @@ void testProvisionStopEndRecordingException() throws InstantiationException,
         frameworkField.set(sdvManager, framework);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionStop();
@@ -1539,13 +1543,14 @@ void testProvisionStopReleaseUsersException() throws InstantiationException,
         frameworkField.set(sdvManager, framework);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionStop();
@@ -1656,13 +1661,14 @@ void testProvisionStopcleanUpEnvironmentsException() throws InstantiationExcepti
         frameworkField.set(sdvManager, framework);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionStop();
@@ -1896,13 +1902,14 @@ void testReleaseUsersException() throws CredentialsException, NoSuchFieldExcepti
         frameworkField.set(sdvManager, framework);
 
         // Replace LOG
-        Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
-        loggerField.setAccessible(true);
-        // remove final modifier
-        Field modifiersField = Field.class.getDeclaredField(modifiersString);
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL);
-        loggerField.set(sdvManager, mockLog);
+        final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString);
+        unsafeField.setAccessible(true);
+        final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+        final Field loggerField = sdvManagerImplClass.getDeclaredField(logString);
+        final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField);
+        final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField);
+        unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog);
 
         // Make call to funtion under test
         sdvManager.provisionStop();