Address issues #260 and #261: Upgrade java-cfenv to use json-io 4.24.0 and Spring Boot 3.2.5 (#263)

* Upgrade logic in JsonIoConverter.jsonToJavaWithListsAndInts method to be compatible with json-io 4.20.0 API

* Update to latest version of json-io

* Upgrade versions of Spring Boot and json-io to latest stable

Author: pacphi

.github/workflows/build.yml

@@ -14,14 +14,14 @@ jobs:
         java: [ '17' ]
     name: Java ${{ matrix.Java }} build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: adopt
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -30,7 +30,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
       - name: Build with Gradle
         run: ./gradlew build
       - name: Cleanup Gradle Cache

.gitignore

@@ -39,3 +39,4 @@ rebel.xml
 
 # VSCode artifacts
 .vscode/
+.history/

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         jmockitVersion = "1.49"
-        springBootVersion = "3.1.5"
+        springBootVersion = "3.2.5"
     }
 }
 
@@ -13,5 +13,5 @@ plugins {
 description = 'Java Library for Accessing Cloud Foundry Environment Variables'
 
 wrapper {
-    gradleVersion = "8.3"
+    gradleVersion = "8.7"
 }

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.parallel=true
 
 group=io.pivotal.cfenv
-version=3.1.5-SNAPSHOT
+version=3.1.6-SNAPSHOT
 onlyShowStandardStreamsOnTestFailure=false
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

java-cfenv-all/build.gradle

@@ -36,7 +36,7 @@ shadowJar {
         exclude(dependency('org.springframework.boot::'))
         exclude(dependency('org.springframework::'))
     }
-    relocate 'com.cedarsoftware.util.io', 'io.pivotal.cfenv.shaded.com.cedarsoftware.util.io'
+    relocate 'com.cedarsoftware.io', 'io.pivotal.cfenv.shaded.com.cedarsoftware.io'
 }
 
 publishing {

java-cfenv-docs/build.gradle

@@ -10,7 +10,7 @@ configurations {
 }
 
 dependencies {
-    docs "io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip"
+    docs "io.spring.docresources:spring-doc-resources:0.2.5@zip"
 }
 
 task prepareAsciidocBuild(type: Sync) {

java-cfenv/build.gradle

@@ -6,7 +6,7 @@ plugins {
 description = 'Java CF Env Core Library'
 
 dependencies {
-    api 'com.cedarsoftware:json-io:4.19.1'
+    api 'com.cedarsoftware:json-io:4.24.0'
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "junit:junit"

java-cfenv/src/main/java/io/pivotal/cfenv/core/JsonIoConverter.java

@@ -21,8 +21,9 @@
 import java.util.List;
 import java.util.Map;
 
-import com.cedarsoftware.util.io.JsonObject;
-import com.cedarsoftware.util.io.JsonReader;
+import com.cedarsoftware.io.JsonIo;
+import com.cedarsoftware.io.JsonObject;
+
 
 public class JsonIoConverter {
 
@@ -35,8 +36,8 @@ public class JsonIoConverter {
 	 */
 	public static Map jsonToJavaWithListsAndInts(String jsonInput) {
 		Map args = new HashMap();
-		args.put(JsonReader.USE_MAPS, true);
-		JsonObject rawServicesMap = (JsonObject) JsonReader.jsonToJava(jsonInput, args);
+		args.put(JsonIo.USE_MAPS, true);
+		JsonObject rawServicesMap = JsonIo.toObjects(jsonInput, JsonIo.getReadOptionsBuilder(args).build(), JsonObject.class);
 		return convertArraysAndLongs(rawServicesMap);
 	}
 

settings.gradle

@@ -1,8 +1,8 @@
 pluginManagement {
     plugins {
         id "io.spring.nohttp" version "0.0.11"
-        id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-        id 'org.asciidoctor.jvm.convert' version '3.3.2'
+        id 'org.asciidoctor.jvm.pdf' version '4.0.2'
+        id 'org.asciidoctor.jvm.convert' version '4.0.2'
     }
 }