Change version used for building in GitHub

BernhardWebstudio · Dec 23, 2023 · 41d4db7 · 41d4db7
1 parent e739816
commit 41d4db7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/maven-prerelease.yml b/.github/workflows/maven-prerelease.yml
@@ -19,11 +19,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 12
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 12
+        java-version: '21'
+        distribution: 'temurin'
+        cache: 'maven'
     - name: Build with Maven
       # without -DskipTests, we also run tests, which should prevent 
       # the package from being packaged if tests fail

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/ImageCaptureProperties.java b/src/main/java/edu/harvard/mcz/imagecapture/ImageCaptureProperties.java
@@ -477,7 +477,7 @@ public static String assemblePathWithBase(String aDirectoryPath,
         } else {
             result = base + path + fileSeparator + aFileName;
         }
-        log.debug("Debug {}", result);
+        log.debug("Assembled path with base: {}", result);
         return result;
     }
 

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java b/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java
@@ -151,7 +151,9 @@ public ArrayList<JSONObject> uploadImagesForSpecimen(Specimen specimen) throws I
             );
 
             MultipartBodyPublisher multipartBody = MultipartBodyPublisher.newBuilder().filePart("image", Path.of(imagePath), MediaType.IMAGE_ANY).build();
+            log.debug("Built multipart body...");
             MutableRequest request = MutableRequest.POST(queryUrl, multipartBody).header("Content-Disposition", "attachment; filename=\"" + image.getFilename() + "\"");
+            log.debug("Built request to uplaod...");
             HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
 
             log.debug("Response from uploading image: " + response.body());

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/serializer/nahima/Specimen2JSONSerializer.java b/src/main/java/edu/harvard/mcz/imagecapture/serializer/nahima/Specimen2JSONSerializer.java
@@ -334,6 +334,7 @@ protected JSONObject dateRangeToNahima(String from, String to, boolean allowInva
         JSONObject parsedDateFrom = this.dateToNahima(from, allowInvalid);
         JSONObject parsedDateTo = this.dateToNahima(to, allowInvalid);
         JSONObject returnValue = new JSONObject();
+
         returnValue.put("from", parsedDateFrom.getString("value"));
         returnValue.put("to", parsedDateTo.getString("value"));
         return returnValue;