Feature/ab2d 4120 Java 17 (#832)

* Add java 11

* Update docker-compose.yml

Add java 17

* Update Jenkinsfile

Increase Jenkins version

* Fix Nano tests

* Update BFDSearchImpl.java

Remove method for testing in new relic

* Change some docs to support Java 17

Co-authored-by: sb-wnyffenegger <[email protected]>

Author: sb-dkniesteadt

.github/workflows/codeql-analysis.yml

@@ -40,10 +40,10 @@ jobs:
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
 
-    - name: AB2d needs Java 13 to run..
+    - name: AB2d needs Java 17 to run..
       uses: actions/setup-java@v1
       with:
-        java-version: '13' # The JDK version to make available on the path. 
+        java-version: '17' # The JDK version to make available on the path.
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

JENKINS.md

@@ -12,7 +12,7 @@ volume to give it at least that much space.
 
 ## Tools Configuration
 
-Install Java 13 and Maven 3.6.3 on the jenkins agent.
+Install Java 17 and Maven 3.6.3 on the jenkins agent.
 
 Go to the `<jenkins_ip>:8080/configureTools` url. Add a JDK and Maven installation
 but do not allow Jenkins to install it automatically. For each installation set it to the home of the

Jenkinsfile

@@ -27,7 +27,7 @@ pipeline {
 
     tools {
         maven 'maven-3.6.3'
-        jdk 'adoptjdk13'
+        jdk 'openjdk17'
     }
 
     stages {

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:13
+FROM openjdk:17
 WORKDIR /usr/src/ab2d-api
 ADD target/api-*-SNAPSHOT.jar /usr/src/ab2d-api/api.jar
 ADD target/newrelic/newrelic.jar /usr/src/ab2d-api/newrelic/newrelic.jar

bfd/src/main/java/gov/cms/ab2d/bfd/client/BFDSearchImpl.java

@@ -72,6 +72,16 @@ public IBaseBundle searchEOB(long patientId, OffsetDateTime since, int pageSize,
         request.addHeader(BFDClient.BFD_HDR_BULK_CLIENTID, BFDClient.BFD_CLIENT_ID);
         request.addHeader(BFDClient.BFD_HDR_BULK_JOBID, bulkJobId);
 
+        byte[] responseBytes = getEOBSFromBFD(patientId, request);
+
+        return parseBundle(version, responseBytes);
+    }
+
+    /**
+        Method exists to track connection to BFD for New Relic
+     */
+    @Trace
+    private byte[] getEOBSFromBFD(long patientId, HttpGet request) throws IOException {
         byte[] responseBytes;
         try (CloseableHttpResponse response = (CloseableHttpResponse) httpClient.execute(request)) {
             int status = response.getStatusLine().getStatusCode();
@@ -87,8 +97,7 @@ public IBaseBundle searchEOB(long patientId, OffsetDateTime since, int pageSize,
                 throw new RuntimeException("Server error occurred");
             }
         }
-
-        return parseBundle(version, responseBytes);
+        return responseBytes;
     }
 
     @Trace

docker-compose.yml

@@ -19,7 +19,7 @@ services:
       timeout: 5s
       retries: 5
   build:
-    image: maven:3-jdk-13
+    image: maven:3-openjdk-17
     working_dir: /usr/src/mymaven
     # Not necessary to run mvn package since we anticipate that project
     # has already built so we don't need to run this command

eventlogger/src/test/java/gov/cms/ab2d/eventlogger/eventloggers/sql/AllMapperEventTest.java

@@ -40,6 +40,8 @@
 @SpringBootTest(classes = SpringBootApp.class)
 @Testcontainers
 public class AllMapperEventTest {
+    public static final int ONE_MillSEC_IN_NANO = 1000000;
+
     @Container
     private static final PostgreSQLContainer postgreSQLContainer = new AB2DPostgresqlContainer();
 
@@ -112,7 +114,7 @@ void logApiRequest() {
         assertEquals(event.getId(), jsce.getId());
         assertEquals("laila", event.getOrganization());
         assertEquals("job123", event.getJobId());
-        assertEquals(val.getNano(), event.getTimeOfEvent().getNano());
+        assertTrue(Math.abs(val.getNano() - event.getTimeOfEvent().getNano()) < ONE_MillSEC_IN_NANO);
         assertEquals("http://localhost", event.getUrl());
         assertEquals("127.0.0.1", event.getIpAddress());
         assertEquals(hashIt("token"), event.getTokenHash());
@@ -197,7 +199,7 @@ void logContractSearch() {
         assertEquals(1, event.getEobFiles());
 
 
-        assertEquals(val.getNano(), event.getTimeOfEvent().getNano());
+        assertTrue(Math.abs(val.getNano() - event.getTimeOfEvent().getNano()) < ONE_MillSEC_IN_NANO);
         loggerEventRepository.delete(ContractSearchEvent.class);
         events = loggerEventRepository.load(ContractSearchEvent.class);
         assertEquals(0, events.size());
@@ -249,7 +251,7 @@ void logErrorEvent() {
         assertEquals(event.getId(), jsce.getId());
         assertEquals("laila", event.getOrganization());
         assertEquals("job123", event.getJobId());
-        assertEquals(val.getNano(), event.getTimeOfEvent().getNano());
+        assertTrue(Math.abs(val.getNano() - event.getTimeOfEvent().getNano()) < ONE_MillSEC_IN_NANO);
         assertEquals(ErrorEvent.ErrorType.CONTRACT_NOT_FOUND, event.getErrorType());
         assertEquals("Description", event.getDescription());
         loggerEventRepository.delete(ErrorEvent.class);
@@ -286,7 +288,7 @@ void logFileEvent() throws IOException {
         assertEquals(event.getId(), jsce.getId());
         assertEquals("laila", event.getOrganization());
         assertEquals("job123", event.getJobId());
-        assertEquals(val.getNano(), event.getTimeOfEvent().getNano());
+        assertTrue(Math.abs(val.getNano() - event.getTimeOfEvent().getNano()) < ONE_MillSEC_IN_NANO);
         assertEquals(hash, event.getFileHash());
         assertFalse(hash.isEmpty());
         assertEquals(tmpDir.toString() + "/testFile", event.getFileName());
@@ -323,7 +325,7 @@ void logJobStatus() {
         assertEquals(event.getId(), jsce.getId());
         assertEquals("laila", event.getOrganization());
         assertEquals("job123", event.getJobId());
-        assertEquals(val.getNano(), event.getTimeOfEvent().getNano());
+        assertTrue(Math.abs(val.getNano() - event.getTimeOfEvent().getNano()) < ONE_MillSEC_IN_NANO);
         assertEquals("FAILED", event.getNewStatus());
         assertEquals("IN_PROGRESS", event.getOldStatus());
         assertEquals("Description", event.getDescription());
@@ -360,7 +362,7 @@ void logReload() {
         assertEquals("filename", event.getFileName());
         assertEquals(10, event.getNumberLoaded());
         assertEquals(ReloadEvent.FileType.CONTRACT_MAPPING, event.getFileType());
-        assertEquals(val.getNano(), event.getTimeOfEvent().getNano());
+        assertTrue(Math.abs(val.getNano() - event.getTimeOfEvent().getNano()) < ONE_MillSEC_IN_NANO);
         loggerEventRepository.delete(ReloadEvent.class);
         events = loggerEventRepository.load(ReloadEvent.class);
         assertEquals(0, events.size());

eventlogger/src/test/java/gov/cms/ab2d/eventlogger/reports/sql/LoggerEventSummaryTest.java

@@ -5,6 +5,10 @@
 import gov.cms.ab2d.eventlogger.SpringBootApp;
 import gov.cms.ab2d.eventlogger.eventloggers.sql.SqlEventLogger;
 import gov.cms.ab2d.eventlogger.events.*;
+import java.io.File;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -13,16 +17,14 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import java.io.File;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 @SpringBootTest(classes = SpringBootApp.class)
 @Testcontainers
 class LoggerEventSummaryTest {
+    public static final int ONE_MillSEC_IN_NANO = 1000000;
+
     @Autowired
     private LoggerEventSummary loggerEventSummary;
 
@@ -73,9 +75,10 @@ void getSummaryBasic() {
         JobSummaryEvent summary = loggerEventSummary.getSummary(jobId);
         assertEquals(jobId, summary.getJobId());
         assertEquals(usr, summary.getOrganization());
-        assertEquals(firstTime.getNano(), summary.getSubmittedTime().getNano());
-        assertEquals(firstTime.plusDays(1).getNano(), summary.getInProgressTime().getNano());
-        assertEquals(firstTime.plusDays(7).getNano(), summary.getSuccessfulTime().getNano());
+
+        assertTrue(Math.abs(firstTime.getNano() - summary.getSubmittedTime().getNano()) < ONE_MillSEC_IN_NANO);
+        assertTrue(Math.abs(firstTime.plusDays(1).getNano() - summary.getInProgressTime().getNano()) < ONE_MillSEC_IN_NANO);
+        assertTrue(Math.abs(firstTime.plusDays(7).getNano() - summary.getSuccessfulTime().getNano()) < ONE_MillSEC_IN_NANO);
         assertNull(summary.getCancelledTime());
         assertNull(summary.getFailedTime());
         assertEquals(1, summary.getNumFilesCreated());
@@ -90,15 +93,15 @@ void getSummaryBasic() {
     void getSummaryFailed() {
         OffsetDateTime firstTime = OffsetDateTime.now().minusDays(11);
         JobSummaryEvent summary = getSummaryError("JOBFAIL", "FAILED", firstTime);
-        assertEquals(firstTime.plusDays(7).getNano(), summary.getFailedTime().getNano());
+        assertTrue(Math.abs(firstTime.plusDays(7).getNano() - summary.getFailedTime().getNano()) < ONE_MillSEC_IN_NANO);
         assertNull(summary.getCancelledTime());
     }
 
     @Test
     void getSummaryCancelled() {
         OffsetDateTime firstTime = OffsetDateTime.now().minusDays(11);
         JobSummaryEvent summary = getSummaryError("JOBCANCEL", "CANCELLED", firstTime);
-        assertEquals(firstTime.plusDays(7).getNano(), summary.getCancelledTime().getNano());
+        assertTrue(Math.abs(firstTime.plusDays(7).getNano() - summary.getCancelledTime().getNano()) < ONE_MillSEC_IN_NANO);
         assertNull(summary.getFailedTime());
     }
 
@@ -131,8 +134,8 @@ JobSummaryEvent getSummaryError(String jobId, String state, OffsetDateTime first
         JobSummaryEvent summary = loggerEventSummary.getSummary(jobId);
         assertEquals(jobId, summary.getJobId());
         assertEquals(usr, summary.getOrganization());
-        assertEquals(firstTime.getNano(), summary.getSubmittedTime().getNano());
-        assertEquals(firstTime.plusDays(1).getNano(), summary.getInProgressTime().getNano());
+        assertTrue(Math.abs(firstTime.getNano() - summary.getSubmittedTime().getNano()) < ONE_MillSEC_IN_NANO);
+        assertTrue(Math.abs(firstTime.plusDays(1).getNano() - summary.getInProgressTime().getNano()) < ONE_MillSEC_IN_NANO);
         assertNull(summary.getSuccessfulTime());
         assertEquals(1, summary.getNumFilesCreated());
         assertEquals(1, summary.getNumFilesDeleted());

pom.xml

@@ -32,7 +32,7 @@
 
     <properties>
         <project.root>${basedir}</project.root>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <hapi.version>5.6.0</hapi.version>
         <!-- eventlogger is imported first by all other modules, if that changes then
          okhttp3 must be imported first anywhere the slack client is used-->

worker/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:13
+FROM openjdk:17
 WORKDIR /usr/src/ab2d-worker
 ADD target/worker-*-SNAPSHOT-exe.jar /usr/src/ab2d-worker/worker.jar
 ADD target/newrelic/newrelic.jar /usr/src/ab2d-worker/newrelic/newrelic.jar