diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/KeyValuePair.java b/spring-cloud-core/src/main/java/org/springframework/cloud/KeyValuePair.java deleted file mode 100644 index 9a7a9c1..0000000 --- a/spring-cloud-core/src/main/java/org/springframework/cloud/KeyValuePair.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springframework.cloud; - -public class KeyValuePair { - private final String key; - private final String value; - - public KeyValuePair(String key, String value) { - this.key = key; - this.value = value; - } - - public String getKey() { - return key; - } - - public String getValue() { - return value; - } -} \ No newline at end of file diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java index 11dc842..e819b76 100644 --- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java +++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java @@ -1,11 +1,10 @@ package org.springframework.cloud.service; import org.springframework.cloud.FallbackServiceInfoCreator; -import org.springframework.cloud.KeyValuePair; -public class FallbackBaseServiceInfoCreator extends FallbackServiceInfoCreator { +public class FallbackBaseServiceInfoCreator extends FallbackServiceInfoCreator { @Override - public BaseServiceInfo createServiceInfo(KeyValuePair serviceData) { + public BaseServiceInfo createServiceInfo(UriBasedServiceData serviceData) { return new BaseServiceInfo(serviceData.getKey()); } } diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceData.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceData.java new file mode 100644 index 0000000..67d02a2 --- /dev/null +++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceData.java @@ -0,0 +1,19 @@ +package org.springframework.cloud.service; + +public class UriBasedServiceData { + private final String key; + private final String uri; + + public UriBasedServiceData(String key, String uri) { + this.key = key; + this.uri = uri; + } + + public String getKey() { + return key; + } + + public String getUri() { + return uri; + } +} \ No newline at end of file diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfoCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfoCreator.java index ee011d7..a76ab3b 100644 --- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfoCreator.java +++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfoCreator.java @@ -1,10 +1,9 @@ package org.springframework.cloud.service; -import org.springframework.cloud.KeyValuePair; import org.springframework.cloud.ServiceInfoCreator; public abstract class UriBasedServiceInfoCreator implements - ServiceInfoCreator { + ServiceInfoCreator { private final String uriScheme; @@ -13,14 +12,14 @@ public abstract class UriBasedServiceInfoCreator impleme } @Override - public boolean accept(KeyValuePair serviceData) { - return serviceData.getValue().toString().startsWith(uriScheme + "://"); + public boolean accept(UriBasedServiceData serviceData) { + return serviceData.getUri().toString().startsWith(uriScheme + "://"); } public abstract SI createServiceInfo(String id, String uri); @Override - public SI createServiceInfo(KeyValuePair serviceData) { - return createServiceInfo(serviceData.getKey(), serviceData.getValue()); + public SI createServiceInfo(UriBasedServiceData serviceData) { + return createServiceInfo(serviceData.getKey(), serviceData.getUri()); } } diff --git a/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java index ee74fe6..55d1cba 100644 --- a/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java +++ b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java @@ -8,12 +8,12 @@ import java.util.Map; import org.springframework.cloud.AbstractCloudConnector; import org.springframework.cloud.CloudException; import org.springframework.cloud.FallbackServiceInfoCreator; -import org.springframework.cloud.KeyValuePair; import org.springframework.cloud.ServiceInfoCreator; import org.springframework.cloud.app.ApplicationInstanceInfo; import org.springframework.cloud.service.BaseServiceInfo; import org.springframework.cloud.service.FallbackBaseServiceInfoCreator; import org.springframework.cloud.service.ServiceInfo; +import org.springframework.cloud.service.UriBasedServiceData; import org.springframework.cloud.util.EnvironmentAccessor; /** @@ -25,7 +25,7 @@ import org.springframework.cloud.util.EnvironmentAccessor; * @author Ramnivas Laddad * */ -public class HerokuConnector extends AbstractCloudConnector { +public class HerokuConnector extends AbstractCloudConnector { private EnvironmentAccessor environment = new EnvironmentAccessor(); private ApplicationInstanceInfoCreator applicationInstanceInfoCreator @@ -59,7 +59,7 @@ public class HerokuConnector extends AbstractCloudConnector { } @Override - protected void registerServiceInfoCreator(ServiceInfoCreator serviceInfoCreator) { + protected void registerServiceInfoCreator(ServiceInfoCreator serviceInfoCreator) { super.registerServiceInfoCreator(serviceInfoCreator); HerokuServiceInfoCreator herokuServiceInfoCreator = (HerokuServiceInfoCreator)serviceInfoCreator; String[] envPrefixes = herokuServiceInfoCreator.getEnvPrefixes(); @@ -78,15 +78,15 @@ public class HerokuConnector extends AbstractCloudConnector { *

* @return information about services bound to the app */ - protected List getServicesData() { - List serviceData = new ArrayList(); + protected List getServicesData() { + List serviceData = new ArrayList(); Map env = environment.getEnv(); for (Map.Entry envEntry : env.entrySet()) { for (String envPrefix : serviceEnvPrefixes) { if (envEntry.getKey().startsWith(envPrefix)) { - serviceData.add(new KeyValuePair(envEntry.getKey(), envEntry.getValue())); + serviceData.add(new UriBasedServiceData(envEntry.getKey(), envEntry.getValue())); } } } @@ -95,7 +95,7 @@ public class HerokuConnector extends AbstractCloudConnector { } @Override - protected FallbackServiceInfoCreator getFallbackServiceInfoCreator() { + protected FallbackServiceInfoCreator getFallbackServiceInfoCreator() { return new FallbackBaseServiceInfoCreator(); } } \ No newline at end of file diff --git a/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigConnector.java b/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigConnector.java index 9634ab4..3a8251a 100644 --- a/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigConnector.java +++ b/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigConnector.java @@ -15,18 +15,18 @@ import java.util.regex.Pattern; import org.springframework.cloud.AbstractCloudConnector; import org.springframework.cloud.FallbackServiceInfoCreator; -import org.springframework.cloud.KeyValuePair; import org.springframework.cloud.app.ApplicationInstanceInfo; import org.springframework.cloud.app.BasicApplicationInstanceInfo; import org.springframework.cloud.service.BaseServiceInfo; import org.springframework.cloud.service.FallbackBaseServiceInfoCreator; +import org.springframework.cloud.service.UriBasedServiceData; /** * * @author Christopher Smith * */ -public class LocalConfigConnector extends AbstractCloudConnector { +public class LocalConfigConnector extends AbstractCloudConnector { private static final Logger logger = Logger.getLogger(LocalConfigConnector.class.getName()); @@ -78,7 +78,7 @@ public class LocalConfigConnector extends AbstractCloudConnector { } @Override - protected List getServicesData() { + protected List getServicesData() { if(fileProperties == null) throw new IllegalStateException("isInMatchingCloud() must be called first to initialize connector"); @@ -97,7 +97,7 @@ public class LocalConfigConnector extends AbstractCloudConnector { } @Override - protected FallbackServiceInfoCreator getFallbackServiceInfoCreator() { + protected FallbackServiceInfoCreator getFallbackServiceInfoCreator() { return new FallbackBaseServiceInfoCreator(); } diff --git a/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigUtil.java b/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigUtil.java index 7951212..3dbc38f 100644 --- a/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigUtil.java +++ b/spring-cloud-localconfig-connector/src/main/java/org/springframework/cloud/localconfig/LocalConfigUtil.java @@ -9,7 +9,7 @@ import java.util.Properties; import java.util.logging.Logger; import java.util.regex.Matcher; -import org.springframework.cloud.KeyValuePair; +import org.springframework.cloud.service.UriBasedServiceData; public final class LocalConfigUtil { private static final Logger logger = Logger.getLogger(LocalConfigConnector.class.getName()); @@ -17,7 +17,7 @@ public final class LocalConfigUtil { private LocalConfigUtil() { } - static List readServicesData(LinkedHashMap propertySources) { + static List readServicesData(LinkedHashMap propertySources) { // we'll turn this into KVPs to return but need to eliminate duplicates first Map collectedServices = new HashMap(); @@ -41,9 +41,9 @@ public final class LocalConfigUtil { } // now we have a collated set of service IDs and URIs - List serviceData = new ArrayList(collectedServices.size()); + List serviceData = new ArrayList(collectedServices.size()); for (Map.Entry serviceInfo : collectedServices.entrySet()) { - serviceData.add(new KeyValuePair(serviceInfo.getKey(), serviceInfo.getValue())); + serviceData.add(new UriBasedServiceData(serviceInfo.getKey(), serviceInfo.getValue())); } return serviceData; diff --git a/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigConnectorTest.java b/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigConnectorTest.java index 6512695..9bf3f1d 100644 --- a/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigConnectorTest.java +++ b/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigConnectorTest.java @@ -17,7 +17,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.ClearSystemProperties; import org.junit.contrib.java.lang.system.ProvideSystemProperty; -import org.springframework.cloud.KeyValuePair; +import org.springframework.cloud.service.UriBasedServiceData; public class LocalConfigConnectorTest { @@ -119,11 +119,11 @@ public class LocalConfigConnectorTest { assertTrue(connector.isInMatchingCloud()); assertEquals("testApp", connector.getApplicationInstanceInfo().getAppId()); - List services = connector.getServicesData(); + List services = connector.getServicesData(); assertEquals(2, services.size()); - for (KeyValuePair service : services) + for (UriBasedServiceData service : services) if ("foo".equals(service.getKey())) - assertEquals("bar", service.getValue()); + assertEquals("bar", service.getUri()); } @Rule @@ -136,10 +136,10 @@ public class LocalConfigConnectorTest { assertTrue(connector.isInMatchingCloud()); assertEquals("testApp", connector.getApplicationInstanceInfo().getAppId()); - List services = connector.getServicesData(); + List services = connector.getServicesData(); assertEquals(2, services.size()); - for(KeyValuePair service: services) + for(UriBasedServiceData service: services) if("baz".equals(service.getKey())) - assertEquals("inline!", service.getValue()); + assertEquals("inline!", service.getUri()); } } diff --git a/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigUtilTest.java b/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigUtilTest.java index 82e39e1..306e5db 100644 --- a/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigUtilTest.java +++ b/spring-cloud-localconfig-connector/src/test/java/org/springframework/cloud/localconfig/LocalConfigUtilTest.java @@ -9,7 +9,7 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.KeyValuePair; +import org.springframework.cloud.service.UriBasedServiceData; public class LocalConfigUtilTest { @@ -46,13 +46,13 @@ public class LocalConfigUtilTest { first.setProperty("spring.cloud.first", "firstUri"); second.setProperty("spring.cloud.second", "secondUri"); - List serviceData = LocalConfigUtil.readServicesData(propertySources); + List serviceData = LocalConfigUtil.readServicesData(propertySources); assertEquals(2, serviceData.size()); boolean foundFirst = false; - for(KeyValuePair kvp : serviceData) { + for(UriBasedServiceData kvp : serviceData) { if(kvp.getKey().equals("first")) { - assertEquals("firstUri", kvp.getValue()); + assertEquals("firstUri", kvp.getUri()); foundFirst = true; } } @@ -65,10 +65,10 @@ public class LocalConfigUtilTest { first.setProperty("spring.cloud.duplicate", "firstUri"); second.setProperty("spring.cloud.duplicate", "secondUri"); - List serviceData = LocalConfigUtil.readServicesData(propertySources); + List serviceData = LocalConfigUtil.readServicesData(propertySources); assertEquals(1, serviceData.size()); - KeyValuePair kvp = serviceData.get(0); + UriBasedServiceData kvp = serviceData.get(0); assertEquals("duplicate", kvp.getKey()); - assertEquals("secondUri", kvp.getValue()); + assertEquals("secondUri", kvp.getUri()); } }