feat(Java 11): Upgrade to Java version 11

bullhorn · Apr 26, 2022 · 16e9440 · 16e9440
1 parent 11c5dba
commit 16e9440
Show file tree

Hide file tree

Showing 35 changed files with 119 additions and 157 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -17,5 +17,4 @@ indent_size = 4
 
 # Matches the exact files either package.json or .travis.yml
 [{package.json,.travis.yml}]
-indent_style = space
 indent_size = 2
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
-jdk: openjdk8
+jdk: openjdk11
 cache:
   directories:
     - node_modules

diff --git a/dataloader.iml b/dataloader.iml
@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -54,7 +54,6 @@
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware.kryo:kryo:2.24.0" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware.minlog:minlog:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
     <orderEntry type="library" name="Maven: de.javakaffee:kryo-serializers:0.37" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:kryo:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:reflectasm:1.10.1" level="project" />
@@ -150,11 +149,14 @@
     <orderEntry type="library" name="Maven: org.opengis:geoapi:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: javax.measure:jsr-275:0.9.3" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.javacsv:javacsv:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.17.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.10.19" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.12.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.12.9" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>

diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.17.2</version>
         </dependency>
 
         <dependency>
@@ -58,29 +58,19 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>4.5.1</version>
             <scope>test</scope>
         </dependency>
 
-        <!-- For Java 11 compatibility -->
+        <!-- For compatibility with older java 1.8 used in sdk-rest -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
     </dependencies>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-            </plugin>
-        </plugins>
-    </reporting>
-
     <build>
         <plugins>
             <plugin>
@@ -101,25 +91,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -170,29 +144,6 @@
                     </formats>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.2.0</version>
-                <configuration>
-                    <!--suppress UnresolvedMavenProperty -->
-                    <repoToken>${env.COVERALLS_REPO_TOKEN}</repoToken>
-                    <serviceName>travis-pro</serviceName>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.7.201606060606</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -262,6 +213,16 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- For showing available updates using: mvn versions:display-dependency-updates -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.9.0</version>
+                <configuration>
+                    <generateBackupPoms>false</generateBackupPoms>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/com/bullhorn/dataloader/rest/RestApiExtension.java b/src/main/java/com/bullhorn/dataloader/rest/RestApiExtension.java
@@ -53,7 +53,7 @@ void checkForRestSdkErrorMessages(CrudResponse response) throws RestApiException
                 sb.append("\tError occurred on field ").append(message.getPropertyName())
                     .append(" due to the following: ").append(message.getDetailMessage()).append("\n");
             }
-            throw new RestApiException("Error occurred when making " + response.getChangeType() + " REST call:\n" + sb.toString());
+            throw new RestApiException("Error occurred when making " + response.getChangeType() + " REST call:\n" + sb);
         }
     }
 

diff --git a/src/test/java/com/bullhorn/dataloader/CommandLineInterfaceTest.java b/src/test/java/com/bullhorn/dataloader/CommandLineInterfaceTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;

diff --git a/src/test/java/com/bullhorn/dataloader/data/RowTest.java b/src/test/java/com/bullhorn/dataloader/data/RowTest.java
@@ -13,7 +13,7 @@ public class RowTest {
     public void testConstructor() {
         Row row = new Row("data/Candidate.csv", 1);
 
-        Assert.assertEquals(row.getNumber(), new Integer(1));
+        Assert.assertEquals(row.getNumber(), Integer.valueOf(1));
         Assert.assertEquals(row.getCells().size(), 0);
     }
 

diff --git a/src/test/java/com/bullhorn/dataloader/rest/CacheTest.java b/src/test/java/com/bullhorn/dataloader/rest/CacheTest.java
@@ -1,6 +1,6 @@
 package com.bullhorn.dataloader.rest;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/src/test/java/com/bullhorn/dataloader/rest/CompleteUtilTest.java b/src/test/java/com/bullhorn/dataloader/rest/CompleteUtilTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.rest;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.contains;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.contains;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

diff --git a/src/test/java/com/bullhorn/dataloader/rest/FieldTest.java b/src/test/java/com/bullhorn/dataloader/rest/FieldTest.java
@@ -308,9 +308,9 @@ public void testToManyIntegerField() throws Exception {
         field.populateAssociationOnEntity(note, candidate2);
         field.populateAssociationOnEntity(note, candidate3);
 
-        Assert.assertEquals(note.getCandidates().getData().get(0).getId(), new Integer(101));
-        Assert.assertEquals(note.getCandidates().getData().get(1).getId(), new Integer(101));
-        Assert.assertEquals(note.getCandidates().getData().get(2).getId(), new Integer(101));
+        Assert.assertEquals(note.getCandidates().getData().get(0).getId(), Integer.valueOf(101));
+        Assert.assertEquals(note.getCandidates().getData().get(1).getId(), Integer.valueOf(101));
+        Assert.assertEquals(note.getCandidates().getData().get(2).getId(), Integer.valueOf(101));
 
         // The single value in the field will be set for each populated To-Many object
         Assert.assertEquals(field.getStringValueFromEntity(note, ";"), "101;101;101");
@@ -423,7 +423,7 @@ public void testAddressFieldCountryId() throws Exception {
 
         field.populateFieldOnEntity(candidate);
 
-        Assert.assertEquals(candidate.getAddress().getCountryID(), new Integer(1234));
+        Assert.assertEquals(candidate.getAddress().getCountryID(), Integer.valueOf(1234));
     }
 
     @Test

diff --git a/src/test/java/com/bullhorn/dataloader/rest/PreloaderTest.java b/src/test/java/com/bullhorn/dataloader/rest/PreloaderTest.java
@@ -1,8 +1,8 @@
 package com.bullhorn.dataloader.rest;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

diff --git a/src/test/java/com/bullhorn/dataloader/rest/RecordTest.java b/src/test/java/com/bullhorn/dataloader/rest/RecordTest.java
@@ -43,7 +43,7 @@ public void testGetters() throws IOException {
         Set<String> expectedParameters = Sets.newHashSet("externalID", "firstName", "lastName", "name", "email", "primarySkills(id)");
 
         Assert.assertEquals(EntityInfo.CANDIDATE, record.getEntityInfo());
-        Assert.assertEquals(new Integer(1), record.getNumber());
+        Assert.assertEquals(Integer.valueOf(1), record.getNumber());
         Assert.assertEquals(6, record.getFields().size());
         Assert.assertEquals(1, record.getToManyFields().size());
         Assert.assertEquals(expectedParameters, record.getFieldsParameter());

diff --git a/src/test/java/com/bullhorn/dataloader/rest/RestApiExtensionTest.java b/src/test/java/com/bullhorn/dataloader/rest/RestApiExtensionTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.rest;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

diff --git a/src/test/java/com/bullhorn/dataloader/rest/RestApiTest.java b/src/test/java/com/bullhorn/dataloader/rest/RestApiTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.rest;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

diff --git a/src/test/java/com/bullhorn/dataloader/rest/RestSessionTest.java b/src/test/java/com/bullhorn/dataloader/rest/RestSessionTest.java
@@ -2,12 +2,12 @@
 
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.internal.util.reflection.Whitebox;
 
 import com.bullhorn.dataloader.util.PrintUtil;
 import com.bullhorn.dataloader.util.PropertyFileUtil;
@@ -45,12 +45,13 @@ public void testConnect_NoCredentials() {
     }
 
     @Test
-    public void testConnectExistingSession() {
-        RestSession restSessionPartialMock = mock(RestSession.class);
-        Whitebox.setInternalState(restSessionPartialMock, "restApi", restApiMock);
-        when(restSessionPartialMock.getRestApi()).thenCallRealMethod();
+    public void testConnectExistingSession() throws NoSuchFieldException, IllegalAccessException {
+        RestSession restSession = new RestSession(restApiExtensionMock, propertyFileUtilMock, printUtilMock);
+        Field privateField = restSession.getClass().getDeclaredField("restApi");
+        privateField.setAccessible(true);
+        privateField.set(restSession, restApiMock);
 
-        RestApi restApi = restSessionPartialMock.getRestApi();
+        RestApi restApi = restSession.getRestApi();
 
         Assert.assertEquals(restApi, restApiMock);
     }

diff --git a/src/test/java/com/bullhorn/dataloader/service/ConvertAttachmentsServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/ConvertAttachmentsServiceTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

diff --git a/src/test/java/com/bullhorn/dataloader/service/DeleteAttachmentsServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/DeleteAttachmentsServiceTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

diff --git a/src/test/java/com/bullhorn/dataloader/service/DeleteServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/DeleteServiceTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

diff --git a/src/test/java/com/bullhorn/dataloader/service/ExportServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/ExportServiceTest.java
@@ -1,8 +1,8 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

diff --git a/src/test/java/com/bullhorn/dataloader/service/LoadAttachmentsServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/LoadAttachmentsServiceTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

diff --git a/src/test/java/com/bullhorn/dataloader/service/LoadServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/LoadServiceTest.java
@@ -1,9 +1,9 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

diff --git a/src/test/java/com/bullhorn/dataloader/service/#ServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/#ServiceTest.java
@@ -1,6 +1,6 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

diff --git a/src/test/java/com/bullhorn/dataloader/service/MetaServiceTest.java b/src/test/java/com/bullhorn/dataloader/service/MetaServiceTest.java
@@ -1,7 +1,7 @@
 package com.bullhorn.dataloader.service;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;