Cleanup

README.md

@@ -44,7 +44,7 @@ ScaleCube Services Features:
 * pluggable api-gateway providers (http / websocket / rsocket)
 * pluggable service transports (tcp / aeron / rsocket)
 * pluggable encoders (json, SBE, Google protocol buffers)
-* pluggable service security authentication and authorization providers. 
+* pluggable service security authentication and authorization providers.
 
 User Guide:
 
@@ -103,7 +103,7 @@ seed.call().api(GreetingsService.class)
   });
 
 // await all instances to shutdown.
-Mono.whenDelayError(seed.shutdown(), serviceNode.shutdown()).block(); 
+Mono.whenDelayError(seed.shutdown(), serviceNode.shutdown()).block();
 ```
 
 Basic Service Example:
@@ -141,7 +141,7 @@ Basic API-Gateway example:
 ```java
 
     Microservices.builder()
-        .discovery(options -> options.seeds(seed.discovery().address()))
+        .discovery(options -> options.seeds(seed.discoveryAddress()))
         .services(...) // OPTIONAL: services (if any) as part of this node.
 
         // configure list of gateways plugins exposing the apis
@@ -227,7 +227,7 @@ To add a dependency on ScaleCube Services using Maven, use the following:
 
 ----
 
-## Sponsored by: 
+## Sponsored by:
 * [OM2](https://www.om2.com/)
 * [exberry.io](https://exberry.io/)
 

pom.xml

@@ -77,6 +77,7 @@
 
     <distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-services
     </distributionManagement.url>
+    <checkstyle.skip>true</checkstyle.skip>
   </properties>
 
   <modules>

services-api/src/main/java/io/scalecube/services/ServiceCall.java

@@ -372,7 +372,7 @@ private ServiceMessage toServiceMessage(MethodInfo methodInfo, Object request) {
 
   private ServiceUnavailableException noReachableMemberException(ServiceMessage request) {
     LOGGER.error(
-        "Failed  to invoke service, "
+        "Failed to invoke service, "
             + "No reachable member with such service definition [{}], args [{}]",
         request.qualifier(),
         request);

services-api/src/main/java/io/scalecube/services/auth/Authenticator.java

@@ -18,4 +18,9 @@ public interface Authenticator<R> extends Function<Map<String, String>, Mono<R>>
   Object NULL_AUTH_CONTEXT = new Object();
 
   String AUTH_CONTEXT_KEY = "auth.context";
+
+  static <T> Mono<T> deferSecured(Class<T> authDataType) {
+    return Mono.deferContextual(context -> Mono.just(context.get(AUTH_CONTEXT_KEY)))
+        .cast(authDataType);
+  }
 }

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

@@ -1,28 +1,30 @@
 package io.scalecube.services.discovery.api;
 
+import io.scalecube.net.Address;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 public interface ServiceDiscovery {
 
   /**
-   * Function to subscribe and listen on stream of {@code ServiceDiscoveryEvent}\s.
+   * Return listening address.
    *
-   * @return stream of {@code ServiceDiscoveryEvent}\s
+   * @return listening address, or null if {@link #start()} was not called.
    */
-  Flux<ServiceDiscoveryEvent> listen();
+  Address address();
 
   /**
-   * Starting this {@code ServiceDiscovery} instance.
+   * Function to subscribe and listen on stream of {@code ServiceDiscoveryEvent}\s.
    *
-   * @return started {@code ServiceDiscovery} instance
+   * @return stream of {@code ServiceDiscoveryEvent}\s
    */
-  Mono<Void> start();
+  Flux<ServiceDiscoveryEvent> listen();
 
   /**
-   * Shutting down this {@code ServiceDiscovery} instance.
-   *
-   * @return async signal of the result
+   * Starts this {@link ServiceDiscovery} instance. After started - subscribers begin to receive
+   * {@code ServiceDiscoveryEvent}\s on {@link #listen()}.
    */
-  Mono<Void> shutdown();
+  void start();
+
+  /** Stops this {@link ServiceDiscovery} instance and release occupied resources. */
+  void shutdown();
 }

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

@@ -2,62 +2,46 @@
 
 import io.scalecube.services.ServiceEndpoint;
 import java.util.StringJoiner;
-import java.util.UUID;
-import java.util.function.Consumer;
 
-public final class ServiceDiscoveryOptions {
+public final class ServiceDiscoveryOptions implements Cloneable {
 
-  private String id = UUID.randomUUID().toString();
   private ServiceEndpoint serviceEndpoint;
   private ServiceDiscoveryFactory discoveryFactory;
 
   public ServiceDiscoveryOptions() {}
 
-  /**
-   * ServiceDiscoveryOptions copy constructor.
-   *
-   * @param other ServiceDiscoveryOptions to copy
-   */
-  public ServiceDiscoveryOptions(ServiceDiscoveryOptions other) {
-    this.id = other.id;
-    this.serviceEndpoint = other.serviceEndpoint;
-    this.discoveryFactory = other.discoveryFactory;
-  }
-
-  private ServiceDiscoveryOptions set(Consumer<ServiceDiscoveryOptions> c) {
-    ServiceDiscoveryOptions s = new ServiceDiscoveryOptions(this);
-    c.accept(s);
-    return s;
-  }
-
-  public ServiceDiscoveryOptions id(String id) {
-    return set(o -> o.id = id);
-  }
-
-  public String id() {
-    return id;
+  public ServiceEndpoint serviceEndpoint() {
+    return serviceEndpoint;
   }
 
   public ServiceDiscoveryOptions serviceEndpoint(ServiceEndpoint serviceEndpoint) {
-    return set(o -> o.serviceEndpoint = serviceEndpoint);
+    final ServiceDiscoveryOptions c = clone();
+    c.serviceEndpoint = serviceEndpoint;
+    return c;
   }
 
-  public ServiceEndpoint serviceEndpoint() {
-    return serviceEndpoint;
+  public ServiceDiscoveryFactory discoveryFactory() {
+    return discoveryFactory;
   }
 
   public ServiceDiscoveryOptions discoveryFactory(ServiceDiscoveryFactory discoveryFactory) {
-    return set(o -> o.discoveryFactory = discoveryFactory);
+    final ServiceDiscoveryOptions c = clone();
+    c.discoveryFactory = discoveryFactory;
+    return c;
   }
 
-  public ServiceDiscoveryFactory discoveryFactory() {
-    return discoveryFactory;
+  @Override
+  public ServiceDiscoveryOptions clone() {
+    try {
+      return (ServiceDiscoveryOptions) super.clone();
+    } catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   @Override
   public String toString() {
     return new StringJoiner(", ", ServiceDiscoveryOptions.class.getSimpleName() + "[", "]")
-        .add("id='" + id + "'")
         .add("serviceEndpoint=" + serviceEndpoint)
         .add("discoveryFactory=" + discoveryFactory)
         .toString();