Simplified service discovery and refactoring of registry events

benchmarks/src/main/java/io/scalecube/services/benchmarks/services/ServicesBenchmarksState.java

@@ -32,13 +32,13 @@ public void beforeAll() {
     node =
         Microservices.builder()
             .metrics(registry())
-            .seeds(seed.discovery().address())
+            .seeds(seed.address())
             .services(services)
             .startAwait();
 
     LOGGER.info(
         "Seed address: "
-            + seed.discovery().address()
+            + seed.address()
             + ", services address: "
             + node.serviceAddress()
             + ", seed serviceRegistry: "

examples/src/main/java/io/scalecube/examples/BootstrapExample.java

@@ -44,7 +44,7 @@ public static void main(String[] args) throws Exception {
     System.out.println("Start HelloWorldService with BusinessLogicFacade");
     final Microservices node1 =
         Microservices.builder()
-            .seeds(gateway.discovery().address())
+            .seeds(gateway.address())
             .services(
                 call ->
                     Collections.singletonList(
@@ -57,14 +57,14 @@ public static void main(String[] args) throws Exception {
     System.out.println("Start ServiceHello");
     final Microservices node2 =
         Microservices.builder()
-            .seeds(gateway.discovery().address())
+            .seeds(gateway.address())
             .services(new ServiceHelloImpl())
             .startAwait();
 
     System.out.println("Start ServiceWorld");
     final Microservices node3 =
         Microservices.builder()
-            .seeds(gateway.discovery().address())
+            .seeds(gateway.address())
             .services(new ServiceWorldImpl())
             .startAwait();
 

examples/src/main/java/io/scalecube/examples/helloworld/Example1.java

@@ -26,7 +26,7 @@ public static void main(String[] args) {
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices microservices =
         Microservices.builder()
-            .seeds(seed.discovery().address())
+            .seeds(seed.address())
             .services(new GreetingServiceImpl())
             .startAwait();
 

examples/src/main/java/io/scalecube/examples/helloworld/Example2.java

@@ -34,7 +34,7 @@ public static void main(String[] args) {
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices microservices =
         Microservices.builder()
-            .seeds(seed.discovery().address())
+            .seeds(seed.address())
             .services(new GreetingServiceImpl())
             .startAwait();
 

examples/src/main/java/io/scalecube/examples/orderbook/Example1.java

@@ -33,7 +33,7 @@ public static void main(String[] args) throws InterruptedException {
 
     Microservices ms =
         Microservices.builder()
-            .seeds(gateway.discovery().address())
+            .seeds(gateway.address())
             .services(new DefaultMarketDataService())
             .startAwait();
 

services-api/src/main/java/io/scalecube/services/discovery/api/ServiceDiscovery.java

@@ -4,7 +4,6 @@
 import io.scalecube.services.ServiceLoaderUtil;
 import io.scalecube.transport.Address;
 import java.util.ServiceLoader;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public interface ServiceDiscovery {
@@ -26,6 +25,4 @@ static ServiceDiscovery getDiscovery() {
   Mono<ServiceDiscovery> start(DiscoveryConfig discoveryConfig);
 
   Mono<Void> shutdown();
-
-  Flux<DiscoveryEvent> listen();
 }

services-api/src/main/java/io/scalecube/services/registry/api/EndpointRegistryEvent.java

@@ -0,0 +1,48 @@
+package io.scalecube.services.registry.api;
+
+import io.scalecube.services.ServiceEndpoint;
+import io.scalecube.transport.Address;
+
+public class EndpointRegistryEvent {
+
+  private ServiceEndpoint serviceEndpoint;
+  private RegistryEventType type;
+
+  public static EndpointRegistryEvent createAdded(ServiceEndpoint serviceEndpoint) {
+    return new EndpointRegistryEvent(RegistryEventType.ADDED, serviceEndpoint);
+  }
+
+  public static EndpointRegistryEvent createRemoved(ServiceEndpoint serviceEndpoint) {
+    return new EndpointRegistryEvent(RegistryEventType.REMOVED, serviceEndpoint);
+  }
+
+  private EndpointRegistryEvent(RegistryEventType type, ServiceEndpoint serviceEndpoint) {
+    this.serviceEndpoint = serviceEndpoint;
+    this.type = type;
+  }
+
+  private EndpointRegistryEvent(EndpointRegistryEvent e) {
+    this.serviceEndpoint = e.serviceEndpoint;
+    this.type = e.type;
+  }
+
+  public ServiceEndpoint serviceEndpoint() {
+    return this.serviceEndpoint;
+  }
+
+  public boolean isAdded() {
+    return RegistryEventType.ADDED.equals(type);
+  }
+
+  public boolean isRemoved() {
+    return RegistryEventType.REMOVED.equals(type);
+  }
+
+  public RegistryEventType type() {
+    return this.type;
+  }
+
+  public Address address() {
+    return Address.create(this.serviceEndpoint.host(), this.serviceEndpoint.port());
+  }
+}

services-api/src/main/java/io/scalecube/services/registry/api/ReferenceRegistryEvent.java

@@ -0,0 +1,48 @@
+package io.scalecube.services.registry.api;
+
+import io.scalecube.services.ServiceReference;
+import io.scalecube.transport.Address;
+
+public class ReferenceRegistryEvent {
+
+  private ServiceReference serviceReference;
+  private RegistryEventType type;
+
+  public static ReferenceRegistryEvent createAdded(ServiceReference serviceReference) {
+    return new ReferenceRegistryEvent(RegistryEventType.ADDED, serviceReference);
+  }
+
+  public static ReferenceRegistryEvent createRemoved(ServiceReference serviceReference) {
+    return new ReferenceRegistryEvent(RegistryEventType.REMOVED, serviceReference);
+  }
+
+  private ReferenceRegistryEvent(RegistryEventType type, ServiceReference serviceReference) {
+    this.serviceReference = serviceReference;
+    this.type = type;
+  }
+
+  private ReferenceRegistryEvent(ReferenceRegistryEvent e) {
+    this.serviceReference = e.serviceReference;
+    this.type = e.type;
+  }
+
+  public ServiceReference serviceReference() {
+    return this.serviceReference;
+  }
+
+  public boolean isAdded() {
+    return RegistryEventType.ADDED.equals(type);
+  }
+
+  public boolean isRemoved() {
+    return RegistryEventType.REMOVED.equals(type);
+  }
+
+  public RegistryEventType type() {
+    return this.type;
+  }
+
+  public Address address() {
+    return Address.create(this.serviceReference.host(), this.serviceReference.port());
+  }
+}

services-api/src/main/java/io/scalecube/services/registry/api/RegistryEventType.java

@@ -0,0 +1,6 @@
+package io.scalecube.services.registry.api;
+
+public enum RegistryEventType {
+  ADDED,
+  REMOVED;
+}

services-api/src/main/java/io/scalecube/services/registry/api/ServiceRegistry.java

@@ -23,7 +23,9 @@ public interface ServiceRegistry {
 
   ServiceEndpoint unregisterService(String endpointId);
 
-  Flux<RegistryEvent> listen();
+  Flux<ReferenceRegistryEvent> listenReferenceEvents();
+
+  Flux<EndpointRegistryEvent> listenEndpointEvents();
 
   Mono<Void> close();
 }