Merge branch 'pivotal-cf:main' into main

daviddmd · web-flow · commit 5931d4a96325 · 2023-08-31T11:23:06.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         jmockitVersion = "1.49"
-        springBootVersion = "3.1.2"
+        springBootVersion = "3.1.3"
     }
 }
 
@@ -13,5 +13,5 @@ plugins {
 description = 'Java Library for Accessing Cloud Foundry Environment Variables'
 
 wrapper {
-    gradleVersion = "7.1.1"
+    gradleVersion = "8.3"
 }
diff --git a/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle b/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 ext {
-    springFrameworkVersion = "6.0.9"
+    springFrameworkVersion = "6.0.11"
     javaApi = "https://docs.oracle.com/javase/17/docs/api/"
     javadocLinks = [
             javaApi,
@@ -138,6 +138,15 @@ publishing {
                             name = "Roy Clarkson"
                             email = "rclarkson@pivotal.io"
                         }
+                        developer {
+                            id = "anthonydahanne"
+                            name = "Anthony Dahanne"
+                            email = "anthonyd2@vmware.com"
+                        }
+                        developer {
+                            id = "pivotal-david-osullivan"
+                            name = "David O'Sullivan"
+                        }
                     }
                     issueManagement {
                         system = "GitHub"
diff --git a/ci/images/java-cfenv-ci/Dockerfile b/ci/images/java-cfenv-ci/Dockerfile
@@ -7,8 +7,7 @@ ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 RUN mkdir -p /opt/openjdk && \
     cd /opt/openjdk && \
-    curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz | tar xz --strip-components=1
+    curl -L https://github.com/bell-sw/Liberica/releases/download/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz | tar xz --strip-components=1
 
 ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh /opt/
-ADD https://repo.spring.io/libs-release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.3/concourse-release-scripts-0.3.3.jar /opt/
 
diff --git a/ci/scripts/promote.sh b/ci/scripts/promote.sh
@@ -7,7 +7,7 @@ source $(dirname $0)/common.sh
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
 
-java -jar /opt/concourse-release-scripts*.jar promote $RELEASE_TYPE $BUILD_INFO_LOCATION
+java -jar /concourse-release-scripts*.jar promote $RELEASE_TYPE $BUILD_INFO_LOCATION
 
 echo "Promotion complete"
 echo $version > version/version
diff --git a/ci/scripts/sync-to-maven-central.sh b/ci/scripts/sync-to-maven-central.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 readonly BUILD_INFO_LOCATION="$(pwd)/artifactory-repo/build-info.json"
 readonly CONFIG_DIR="$(pwd)/git-repo/ci/config"
 
-java -jar /opt/concourse-release-scripts*.jar \
+java -jar /concourse-release-scripts*.jar \
   --spring.config.location="${CONFIG_DIR}/release-scripts.yml" \
   publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" "artifactory-repo"
 
diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml
@@ -1,12 +1,10 @@
 ---
 platform: linux
 image_resource:
-  type: registry-image
+  type: dockerhub-image
   source:
-    repository: ((corporate-harbor-registry))/((docker-hub-organization))/java-cfenv-ci
-    username: ((corporate-harbor-robot-account.username))
-    password: ((corporate-harbor-robot-account.password))
-    tag: latest
+    repository: springio/concourse-release-scripts
+    tag: 0.3.4
 inputs:
   - name: git-repo
   - name: artifactory-repo
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.parallel=true
 
 group=io.pivotal.cfenv
-version=3.0.1-SNAPSHOT
+version=3.1.0-SNAPSHOT
 onlyShowStandardStreamsOnTestFailure=false
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java-cfenv-all/build.gradle b/java-cfenv-all/build.gradle
@@ -0,0 +1,54 @@
+buildscript {
+    repositories {
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'com.github.johnrengelman:shadow:8.1.1'
+    }
+}
+
+apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
+
+description = 'Java CF Env Boot All, contains all java-cfenv modules in a convenient uberjar'
+
+dependencies {
+    api project(':java-cfenv-boot-pivotal-scs')
+    api project(':java-cfenv-boot-pivotal-sso')
+}
+
+import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
+
+shadowJar {
+    archiveClassifier.set('')
+    mergeServiceFiles()
+    transform(PropertiesFileTransformer) {
+        paths = ['META-INF/spring.factories']
+        mergeStrategy = "append"
+    }
+    dependencies {
+        exclude(dependency('org.springframework.boot::'))
+        exclude(dependency('org.springframework::'))
+    }
+    relocate 'com.cedarsoftware.util.io', 'io.pivotal.cfenv.shaded.com.cedarsoftware.util.io'
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+        }
+    }
+
+    repositories {
+        maven {
+            url = project.properties.getOrDefault('publicationRepository', "${System.getenv('HOME')}/.m2/repository")
+        }
+    }
+
+}
+
+assemble.dependsOn shadowJar
+build.dependsOn shadowJar
+publishShadowPublicationToMavenRepository.dependsOn jar
diff --git a/java-cfenv-test-support/build.gradle b/java-cfenv-test-support/build.gradle
@@ -10,6 +10,8 @@ dependencies {
     api testFixtures(project(':java-cfenv'))
     api 'org.springframework.boot:spring-boot-starter-test'
     api "junit:junit"
+    api 'com.fasterxml.jackson.core:jackson-core'
+    api 'com.fasterxml.jackson.core:jackson-databind'
 }
 
 tasks.named('jar') {
diff --git a/java-cfenv/build.gradle b/java-cfenv/build.gradle
@@ -6,9 +6,7 @@ plugins {
 description = 'Java CF Env Core Library'
 
 dependencies {
-    api platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
-    api 'com.fasterxml.jackson.core:jackson-core'
-    api 'com.fasterxml.jackson.core:jackson-databind'
+    api 'com.cedarsoftware:json-io:4.14.0'
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "junit:junit"
@@ -32,4 +30,3 @@ tasks.named('jar') {
         attributes 'Automatic-Module-Name': 'io.pivotal.cfenv.core'
     }
 }
-
diff --git a/java-cfenv/src/main/java/io/pivotal/cfenv/core/CfEnv.java b/java-cfenv/src/main/java/io/pivotal/cfenv/core/CfEnv.java
@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * Provides access to Cloud Foundry environment variables.
  *
@@ -43,27 +41,25 @@ public CfEnv() {
 	}
 
 	public CfEnv(String vcapApplicationJson, String vcapServicesJson) {
-		/* TODO pick small json parser and package as a shadowed jar */
-		ObjectMapper objectMapper = new ObjectMapper();
-		parseVcapServices(objectMapper, vcapServicesJson);
-		parseVcapApplication(objectMapper, vcapApplicationJson);
+		parseVcapServices(vcapServicesJson);
+		parseVcapApplication(vcapApplicationJson);
 	}
 
-	private void parseVcapApplication(ObjectMapper objectMapper, String vcapApplicationJson) {
+	private void parseVcapApplication(String vcapApplicationJson) {
 		try {
 			if (vcapApplicationJson != null && vcapApplicationJson.length() > 0) {
-				Map<String, Object> applicationData = objectMapper.readValue(vcapApplicationJson, Map.class);
+				Map<String, Object> applicationData = JsonIoConverter.jsonToJavaWithListsAndInts(vcapApplicationJson);
 				this.cfApplication = new CfApplication(applicationData);
 			}
 		} catch (Exception e) {
 			 throw new IllegalStateException("Could not parse " + VCAP_APPLICATION + "environment variable.", e);
 		}
 	}
 
-	private void parseVcapServices(ObjectMapper objectMapper, String vcapServicesJson) {
+	private void parseVcapServices(String vcapServicesJson) {
 		try {
 			if (vcapServicesJson != null && vcapServicesJson.length() > 0) {
-				Map<String, List<Map<String, Object>>> rawServicesMap = objectMapper.readValue(vcapServicesJson, Map.class);
+				Map<String, List<Map<String, Object>>> rawServicesMap = JsonIoConverter.jsonToJavaWithListsAndInts(vcapServicesJson);
 				rawServicesMap.values().stream()
 						.flatMap(Collection::stream)
 						.forEach(serviceData -> cfServices.add(new CfService(serviceData)));
diff --git a/java-cfenv/src/main/java/io/pivotal/cfenv/core/JsonIoConverter.java b/java-cfenv/src/main/java/io/pivotal/cfenv/core/JsonIoConverter.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.pivotal.cfenv.core;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.cedarsoftware.util.io.JsonObject;
+import com.cedarsoftware.util.io.JsonReader;
+
+public class JsonIoConverter {
+
+	/**
+	 * Conveniently takes a Json String as input and uses json-io to unserialize it.
+	 * Then, converts all the Object[] into List; and all the longs that could have just been ints into ints
+	 *
+	 * @param jsonInput the string with the Json content
+	 * @return a serialized version of the input in a Map
+	 */
+	public static Map jsonToJavaWithListsAndInts(String jsonInput) {
+		Map args = new HashMap();
+		args.put(JsonReader.USE_MAPS, true);
+		JsonObject rawServicesMap = (JsonObject) JsonReader.jsonToJava(jsonInput, args);
+		return convertArraysAndLongs(rawServicesMap);
+	}
+
+	private static Map convertArraysAndLongs(Map input) {
+		Map resultMap = new LinkedHashMap();
+		for (Object entry : input.entrySet()) {
+			Map.Entry castedEntry = (Map.Entry) entry;
+			Object entryValue = castedEntry.getValue();
+			Object entryKey = castedEntry.getKey();
+			if (entryValue instanceof Object[] objectArray) {
+				resultMap.put(entryKey, convertArray(objectArray));
+			} else if (entryValue instanceof JsonObject jsonObject) {
+				resultMap.put(entryKey, convertArraysAndLongs(jsonObject));
+			} else if(entryValue instanceof Long longValue) {
+				resultMap.put(entryKey, tryAndConvertToInt(longValue));
+			} else {
+				resultMap.put(entryKey, entryValue);
+			}
+		}
+		return resultMap;
+	}
+
+	static Number tryAndConvertToInt(Long longValue) {
+		int potentialInteger;
+		if (longValue.toString().length() <= 9) {
+			potentialInteger = longValue.intValue();
+			return potentialInteger;
+		} else {
+			return longValue;
+		}
+	}
+
+	private static List convertArray(Object[] array) {
+		List resultList = new ArrayList();
+		for (Object element: array) {
+			if (element instanceof JsonObject jsonObject) {
+				resultList.add(convertArraysAndLongs(jsonObject));
+			} else if (element instanceof Object[] objectArray) {
+				resultList.add(convertArray(objectArray));
+			} else if(element instanceof Long longValue) {
+				resultList.add(tryAndConvertToInt(longValue));
+			} else {
+				resultList.add(element);
+			}
+		}
+		return resultList;
+	}
+
+}
diff --git a/java-cfenv/src/test/java/io/pivotal/cfenv/core/CfEnvTests.java b/java-cfenv/src/test/java/io/pivotal/cfenv/core/CfEnvTests.java
@@ -179,8 +179,6 @@ private void assertMySqlCredentials(CfCredentials cfCredentials) {
 		assertUriInfo(uriInfo);
 		uriInfo = cfCredentials.getUriInfo();
 		assertUriInfo(uriInfo);
-		// assertThat(cfCredentials.findJdbcUrl()).isEqualTo(
-		// "jdbc:mysql://10.0.4.35:3306/cf_2e23d10a_8738_8c3c_66cf_13e44422698c?user=mysql_username&password=mysql_password");
 
 	}
 
diff --git a/java-cfenv/src/test/java/io/pivotal/cfenv/core/JsonIoConverterTest.java b/java-cfenv/src/test/java/io/pivotal/cfenv/core/JsonIoConverterTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.pivotal.cfenv.core;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+class JsonIoConverterTest {
+
+	@Test
+	void jsonToJavaWithListsAndInts_Application_Test() throws IOException {
+		var vcapApplication = new Scanner(new ClassPathResource("test/vcap-application.json").getInputStream()).useDelimiter("\\A").next();
+		var vcapApplicationAsMap = JsonIoConverter.jsonToJavaWithListsAndInts(vcapApplication);
+		var applicationUris = vcapApplicationAsMap.get("application_uris");
+		Assertions.assertInstanceOf(List.class, applicationUris);
+		Assertions.assertEquals(1, ((List)applicationUris).size());
+		Assertions.assertEquals("my-app.example.com", ((List)applicationUris).get(0));
+		Assertions.assertEquals(61857, vcapApplicationAsMap.get("port"));
+		Assertions.assertEquals(1376265929L, vcapApplicationAsMap.get("state_timestamp"));
+	}
+
+	@Test
+	void jsonToJavaWithListsAndInts_Services_Test() throws IOException {
+		var vcapServices = new Scanner(new ClassPathResource("vcap-services.json").getInputStream()).useDelimiter("\\A").next();
+		var vcapServicesAsMap = JsonIoConverter.jsonToJavaWithListsAndInts(vcapServices);
+		var tags =((List<Map>) vcapServicesAsMap.get("p-mysql")).get(0).get("tags");
+		Assertions.assertInstanceOf(List.class, tags);
+		Assertions.assertEquals(2, ((List)tags).size());
+		Assertions.assertEquals("mysql", ((List)tags).get(0));
+		Assertions.assertEquals("relational", ((List)tags).get(1));
+		Assertions.assertEquals(45470, ((List<Map<String,Map<String, Object>>>) vcapServicesAsMap.get("p-redis")).get(0).get("credentials").get("port"));
+	}
+
+	@Test
+	void tryAndConvertToIntTest() {
+		Long smallValue = 61857L;
+		Number actual = JsonIoConverter.tryAndConvertToInt(smallValue);
+		Assertions.assertEquals(61857, actual);
+
+		Long bigValue = 1376265929L;
+		Assertions.assertEquals(1376265929L, JsonIoConverter.tryAndConvertToInt(bigValue));
+	}
+}
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`	`3`	`jmockitVersion = "1.49"`
`4`		`- springBootVersion = "3.1.2"`
	`4`	`+ springBootVersion = "3.1.3"`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`
`@@ -13,5 +13,5 @@ plugins {`
`13`	`13`	`description = 'Java Library for Accessing Cloud Foundry Environment Variables'`
`14`	`14`
`15`	`15`	`wrapper {`
`16`		`- gradleVersion = "7.1.1"`
	`16`	`+ gradleVersion = "8.3"`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ dependencies {`
`10`	`10`	`api testFixtures(project(':java-cfenv'))`
`11`	`11`	`api 'org.springframework.boot:spring-boot-starter-test'`
`12`	`12`	`api "junit:junit"`
	`13`	`+ api 'com.fasterxml.jackson.core:jackson-core'`
	`14`	`+ api 'com.fasterxml.jackson.core:jackson-databind'`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`tasks.named('jar') {`