From 73d486636299b8567eed1c3277ac29f7a5c17270 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 28 Aug 2014 07:58:01 +0100 Subject: [PATCH] Separate resource id from client id --- .../resource/CloudfoundryResourceConfiguration.java | 2 +- .../resource/CloudfoundryResourceProperties.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceConfiguration.java b/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceConfiguration.java index 0d6b1e7..d6264a5 100644 --- a/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceConfiguration.java +++ b/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceConfiguration.java @@ -82,7 +82,7 @@ public class CloudfoundryResourceConfiguration { @Override public void configure(ResourceServerSecurityConfigurer resources) throws Exception { - resources.resourceId(resource.getClientId()); + resources.resourceId(resource.getResourceId()); } @Override diff --git a/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceProperties.java b/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceProperties.java index 8d27781..c866023 100644 --- a/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceProperties.java +++ b/src/main/java/org/springframework/platform/cloudfoundry/resource/CloudfoundryResourceProperties.java @@ -33,6 +33,8 @@ public class CloudfoundryResourceProperties implements Validator { private String serviceId = "resource"; + private String id; + @Value("${vcap.services.${cloudfoundry.resource.serviceId:resource}.credentials.clientId:}") private String clientId; @@ -60,4 +62,8 @@ public class CloudfoundryResourceProperties implements Validator { } } } + + public String getResourceId() { + return id==null ? clientId : id; + } }