>() {};
}
/**
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/VcapServicesData.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/VcapServicesData.java
new file mode 100644
index 0000000..7583ef2
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/VcapServicesData.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2016-2017 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
+ *
+ * http://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 org.springframework.credhub.support;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service data parsed from the {@literal VCAP_SERVICES} environment variable provided to applications
+ * running on Cloud Foundry.
+ *
+ * If the {@literal VCAP_SERVICES} environment variable for an application contains the following:
+ *
+ *
+ * {@code
+ * "VCAP_SERVICES": {
+ * "mysql": [
+ * {
+ * "label": "mysql",
+ * "name": "mysql-db",
+ * "plan": "100mb",
+ * "tags": [ "mysql", "relational" ],
+ * "credentials": {
+ * "jdbcUrl": "jdbc:mysql://mysql-broker:3306/db?user=username\u0026password=password",
+ * "uri": "mysql://username:password@mysql-broker:3306/db?reconnect=true",
+ * }
+ * }
+ * ],
+ * "rabbitmq": [
+ * {
+ * "label": "rabbitmq",
+ * "name": "rabbit-queue",
+ * "plan": "standard",
+ * "tags": [ "rabbitmq", "messaging" ],
+ * "credentials": {
+ * "http_api_uri": "http://username:password@rabbitmq-broker:12345/api",
+ * "uri": "amqp://username:password@rabbitmq-broker/vhost",
+ * }
+ * }
+ * ]
+ * }
+ * }
+ *
+ *
+ * Then the {@link VcapServicesData} data structure would expect to the equivalent of this JSON document:
+ *
+ *
+ * {@code
+ * {
+ * "mysql": [
+ * {
+ * "label": "mysql",
+ * "name": "mysql-db",
+ * "plan": "100mb",
+ * "tags": [ "mysql", "relational" ],
+ * "credentials": {
+ * "jdbcUrl": "jdbc:mysql://mysql-broker:3306/db?user=username\u0026password=password",
+ * "uri": "mysql://username:password@mysql-broker:3306/db?reconnect=true",
+ * }
+ * }
+ * ]
+ * "rabbitmq": [
+ * {
+ * "label": "rabbitmq",
+ * "name": "rabbit-queue",
+ * "plan": "standard",
+ * "tags": [ "rabbitmq", "messaging" ],
+ * "credentials": {
+ * "http_api_uri": "http://username:password@rabbitmq-broker:12345/api",
+ * "uri": "amqp://username:password@rabbitmq-broker/vhost",
+ * }
+ * }
+ * ]
+ * }
+ * }
+ *
+ *
+ */
+public class VcapServicesData extends HashMap>> {
+ public VcapServicesData() {
+ }
+
+ /**
+ * Initialize with the provided {@link HashMap}.
+ *
+ * @param vcapServices a {@literal HashMap} to initialize this data structure from
+ */
+ public VcapServicesData(HashMap>> vcapServices) {
+ super(vcapServices);
+ }
+}
diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateUnitTests.java
index b4fd07a..2cfdbf3 100644
--- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateUnitTests.java
+++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateUnitTests.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,6 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.credhub.support.ServiceInstanceCredentialName;
+import org.springframework.credhub.support.VcapServicesData;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
@@ -59,24 +59,24 @@ public class CredHubTemplateUnitTests extends CredHubTemplateUnitTestsBase {
.credentialName("credential_json")
.build();
- Map request = buildVcap(credentialName.getName());
- Map> wrappedRequest = wrapVcap(request);
+ VcapServicesData vcapServices = buildVcapServices(credentialName.getName());
+ Map wrappedVcapServices = wrapVcapServices(vcapServices);
- Map> expectedResponse = new HashMap>();
+ Map expectedResponse = new HashMap();
- ParameterizedTypeReference>> type =
- new ParameterizedTypeReference>>() {};
+ ParameterizedTypeReference> type =
+ new ParameterizedTypeReference>() {};
when(restTemplate.exchange(INTERPOLATE_URL_PATH, HttpMethod.POST,
- new HttpEntity>>(wrappedRequest), type))
- .thenReturn(new ResponseEntity>>(expectedResponse, OK));
+ new HttpEntity>(wrappedVcapServices), type))
+ .thenReturn(new ResponseEntity>(expectedResponse, OK));
- Map response = credHubTemplate.interpolateServiceData(request);
+ VcapServicesData response = credHubTemplate.interpolateServiceData(vcapServices);
assertThat(response, equalTo(expectedResponse.get(VCAP_SERVICES_KEY)));
}
- private Map buildVcap(String credHubReferenceName) throws IOException {
+ private VcapServicesData buildVcapServices(String credHubReferenceName) throws IOException {
String vcapServices = "{" +
" \"service-offering\": [" +
" {" +
@@ -95,11 +95,11 @@ public class CredHubTemplateUnitTests extends CredHubTemplateUnitTestsBase {
"}";
ObjectMapper mapper = new ObjectMapper();
- return mapper.readValue(vcapServices, new TypeReference>() {});
+ return mapper.readValue(vcapServices, VcapServicesData.class);
}
- private Map> wrapVcap(final Map serviceData) {
- return new HashMap>() {{
+ private HashMap wrapVcapServices(final VcapServicesData serviceData) {
+ return new HashMap() {{
put(VCAP_SERVICES_KEY, serviceData);
}};
}
diff --git a/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java b/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java
index c66bc4a..63c1003 100644
--- a/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java
+++ b/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.credhub.core.CredHubTemplate;
@@ -31,6 +30,7 @@ import org.springframework.credhub.support.CredentialDetails;
import org.springframework.credhub.support.CredentialName;
import org.springframework.credhub.support.CredentialSummary;
import org.springframework.credhub.support.SimpleCredentialName;
+import org.springframework.credhub.support.VcapServicesData;
import org.springframework.credhub.support.WriteRequest;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -136,8 +136,8 @@ public class CredHubDemoController {
private void interpolateServiceData(CredentialName name, Results results) {
try {
- Map request = buildVcapServicesData(name.getName());
- Map interpolatedServiceData = credHubTemplate.interpolateServiceData(request);
+ VcapServicesData request = buildVcapServicesData(name.getName());
+ VcapServicesData interpolatedServiceData = credHubTemplate.interpolateServiceData(request);
saveResults(results, "Successfully interpolated service data: ", interpolatedServiceData);
} catch (Exception e) {
saveResults(results, "Error interpolating service data: ", e.getMessage());
@@ -153,7 +153,7 @@ public class CredHubDemoController {
}
}
- private Map buildVcapServicesData(String credHubReferenceName) throws IOException {
+ private VcapServicesData buildVcapServicesData(String credHubReferenceName) throws IOException {
String vcapServices = "{" +
" \"service-offering\": [" +
" {" +
@@ -172,7 +172,7 @@ public class CredHubDemoController {
"}";
ObjectMapper mapper = new ObjectMapper();
- return mapper.readValue(vcapServices, new TypeReference>() {});
+ return mapper.readValue(vcapServices, VcapServicesData.class);
}
private void saveResults(Results results, String message) {