Registration now extends ServiceInstance

This allows for a true replacement of DiscoveryClient.getLocalServiceInstance().

fixes gh-265

spring-cloud-commons/src/main/java/org/springframework/cloud/client/ServiceInstance.java

@@ -26,7 +26,7 @@ import java.util.Map;
 public interface ServiceInstance {
 
 	/**
-	 * @return the service id as register by the DiscoveryClient
+	 * @return the service id as registered.
 	 */
 	String getServiceId();
 

spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/Registration.java

@@ -1,15 +1,12 @@
 package org.springframework.cloud.client.serviceregistry;
 
+import org.springframework.cloud.client.ServiceInstance;
+
 /**
  * A marker interface used by a {@link ServiceRegistry}.
  *
  * @author Spencer Gibb
  * @since 1.2.0
  */
-public interface Registration {
-
-	/**
-	 * @return the serviceId associated with this registration
-	 */
-	String getServiceId();
+public interface Registration extends ServiceInstance {
 }

spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java

@@ -1,5 +1,7 @@
 package org.springframework.cloud.client.serviceregistry;
 
+import java.net.URI;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
@@ -64,6 +66,31 @@ public class AbstractAutoServiceRegistrationTests {
 		public String getServiceId() {
 			return "testRegistration2";
 		}
+
+		@Override
+		public String getHost() {
+			return null;
+		}
+
+		@Override
+		public int getPort() {
+			return 0;
+		}
+
+		@Override
+		public boolean isSecure() {
+			return false;
+		}
+
+		@Override
+		public URI getUri() {
+			return null;
+		}
+
+		@Override
+		public Map<String, String> getMetadata() {
+			return null;
+		}
 	}
 
 	public static class TestMgmtRegistration extends TestRegistration {

spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java

@@ -20,6 +20,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import java.net.URI;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.hamcrest.Matchers.containsString;
@@ -76,6 +78,31 @@ public class ServiceRegistryEndpointTests {
 				public String getServiceId() {
 					return "testRegistration1";
 				}
+
+				@Override
+				public String getHost() {
+					return null;
+				}
+
+				@Override
+				public int getPort() {
+					return 0;
+				}
+
+				@Override
+				public boolean isSecure() {
+					return false;
+				}
+
+				@Override
+				public URI getUri() {
+					return null;
+				}
+
+				@Override
+				public Map<String, String> getMetadata() {
+					return null;
+				}
 			};
 		}