Extract DI to separate module

README.md

@@ -64,15 +64,18 @@ The example provisions 2 cluster nodes and making a remote interaction.
     //1. ScaleCube Node node with no members
     Microservices seed = Microservices.builder().startAwait();
 
-    //2. Construct a ScaleCube node which joins the cluster hosting the Greeting Service
+    //2. Create ServiceFactory 
+    ServiceFactory serviceFactory = ScalecubeServiceFactory.fromInstances(new GreetingServiceImpl());
+
+    //3. Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices microservices =
         Microservices.builder()
             .discovery(
                 self ->
                     new ScalecubeServiceDiscovery(self)
                         .options(opts -> opts.seedMembers(toAddress(seed.discovery().address()))))
             .transport(ServiceTransports::rsocketServiceTransport)
-            .services(new GreetingServiceImpl())
+            .serviceFactory(serviceFactory)
             .startAwait();
 
     //3. Create service proxy

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

@@ -0,0 +1,43 @@
+package io.scalecube.services;
+
+import io.scalecube.net.Address;
+import io.scalecube.services.discovery.api.ServiceDiscovery;
+
+/**
+ * Context of Scalecube node. Used in {@link ServiceFactory}.
+ *
+ * @see ServiceFactory
+ */
+public interface MicroservicesContext {
+
+  /**
+   * Id of Scalecube node.
+   *
+   * @return id
+   */
+  String id();
+
+  /**
+   * Used for remote service call.
+   *
+   * @return service call
+   * @see ServiceCall
+   */
+  ServiceCall serviceCall();
+
+  /**
+   * Network address of Scalecube node.
+   *
+   * @return address of node
+   * @see Address
+   */
+  Address serviceAddress();
+
+  /**
+   * Service discovery for services localed in other nodes.
+   *
+   * @return service discovery
+   * @see ServiceDiscovery
+   */
+  ServiceDiscovery serviceDiscovery();
+}

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

@@ -18,11 +18,11 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -243,14 +243,26 @@ public static Map<String, Method> serviceMethods(Class<?> serviceInterface) {
   /**
    * Util function to get service interfaces collections from service instance.
    *
-   * @param serviceObject with extends service interface with @Service annotation.
+   * @param serviceObject object with extends service interface with @Service annotation.
    * @return service interface class.
    */
-  public static Collection<Class<?>> serviceInterfaces(Object serviceObject) {
-    Class<?>[] interfaces = serviceObject.getClass().getInterfaces();
+  public static Stream<Class<?>> serviceInterfaces(Object serviceObject) {
+    return serviceInterfaces(serviceObject.getClass());
+  }
+
+  /**
+   * Util function to get service interfaces collections from service instance.
+   *
+   * @param serviceType with extends service interface with @Service annotation.
+   * @return service interface class.
+   */
+  public static Stream<Class<?>> serviceInterfaces(Class<?> serviceType) {
+    if (serviceType.isInterface() && serviceType.isAnnotationPresent(Service.class)) {
+      return Stream.of(serviceType);
+    }
+    Class<?>[] interfaces = serviceType.getInterfaces();
     return Arrays.stream(interfaces)
-        .filter(interfaceClass -> interfaceClass.isAnnotationPresent(Service.class))
-        .collect(Collectors.toList());
+        .filter(interfaceClass -> interfaceClass.isAnnotationPresent(Service.class));
   }
 
   public static String methodName(Method method) {

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

@@ -367,7 +367,7 @@ public <T> T api(Class<T> serviceInterface) {
     return (T)
         Proxy.newProxyInstance(
             getClass().getClassLoader(),
-            new Class[] {serviceInterface},
+            new Class[]{serviceInterface},
             new InvocationHandler() {
               @Override
               public Object invoke(Object proxy, Method method, Object[] params) {

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

@@ -0,0 +1,28 @@
+package io.scalecube.services;
+
+import java.util.Collections;
+import java.util.Map;
+
+/** Definition of service - type and tags. */
+public class ServiceDefinition {
+
+  private final Class<?> serviceType;
+  private final Map<String, String> tags;
+
+  public ServiceDefinition(Class<?> serviceType, Map<String, String> tags) {
+    this.serviceType = serviceType;
+    this.tags = tags;
+  }
+
+  public ServiceDefinition(Class<?> serviceType) {
+    this(serviceType, Collections.emptyMap());
+  }
+
+  public Class<?> type() {
+    return serviceType;
+  }
+
+  public Map<String, String> tags() {
+    return tags;
+  }
+}

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

@@ -0,0 +1,35 @@
+package io.scalecube.services;
+
+import java.util.Collection;
+import reactor.core.publisher.Mono;
+
+/** Manages the life cycle of all services registered with Scalecube Services. */
+public interface ServiceFactory {
+
+  /**
+   * Provide service definitions.
+   *
+   * @return collection of service definitions - service type and tags.
+   * @see ServiceDefinition
+   */
+  Collection<ServiceDefinition> getServiceDefinitions();
+
+  /**
+   * Initialize instances of services.
+   *
+   * @param microservices microservices context
+   * @return Completed Mono if initialization was successful for all services.
+   */
+  Mono<? extends Collection<ServiceInfo>> initializeServices(
+      MicroservicesContext microservices);
+
+  /**
+   * Finalization of service instances.
+   *
+   * @param microservices microservices context
+   * @return completed Mono if finalization was successful for all services.
+   */
+  default Mono<Void> shutdownServices(MicroservicesContext microservices) {
+    return Mono.defer(Mono::empty);
+  }
+}

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

@@ -74,7 +74,7 @@ public String toString() {
 
   public static class Builder {
 
-    private Object serviceInstance;
+    private final Object serviceInstance;
     private Map<String, String> tags = new HashMap<>();
     private ServiceProviderErrorMapper errorMapper;
     private ServiceMessageDataDecoder dataDecoder;
@@ -161,6 +161,12 @@ public <A, T> Builder principalMapper(
       return this;
     }
 
+    /**
+     * Set up {@link ServiceProviderErrorMapper} if it hasn't been set up before.
+     *
+     * @param errorMapper error mapper.
+     * @return current builder's state.
+     */
     Builder errorMapperIfAbsent(ServiceProviderErrorMapper errorMapper) {
       if (this.errorMapper == null) {
         this.errorMapper = errorMapper;
@@ -175,6 +181,12 @@ Builder dataDecoderIfAbsent(ServiceMessageDataDecoder dataDecoder) {
       return this;
     }
 
+    /**
+     * Set up {@link Authenticator} if it hasn't been set up before.
+     *
+     * @param authenticator authenticator.
+     * @return current builder's state.
+     */
     Builder authenticatorIfAbsent(Authenticator<Object> authenticator) {
       if (this.authenticator == null) {
         this.authenticator = authenticator;
@@ -189,6 +201,11 @@ Builder principalMapperIfAbsent(PrincipalMapper<Object, Object> principalMapper)
       return this;
     }
 
+    /**
+     * Build service info.
+     *
+     * @return service info.
+     */
     public ServiceInfo build() {
       return new ServiceInfo(this);
     }

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

@@ -2,7 +2,13 @@
 
 import java.util.Collection;
 
+/**
+ * Provide service instances.
+ *
+ * @deprecated use {@link ServiceFactory}
+ */
 @FunctionalInterface
+@Deprecated
 public interface ServiceProvider {
 
   Collection<ServiceInfo> provide(ServiceCall call);

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

@@ -1,6 +1,5 @@
 package io.scalecube.services;
 
-import io.scalecube.services.annotations.Service;
 import io.scalecube.services.annotations.ServiceMethod;
 import java.util.Arrays;
 import java.util.Collections;
@@ -18,15 +17,15 @@ private ServiceScanner() {
   /**
    * Scans {@code ServiceInfo} and builds list of {@code ServiceRegistration}-s.
    *
-   * @param serviceInfo service info instance
+   * @param serviceDefinition service info instance
    * @return list of {@code ServiceRegistration}-s
    */
-  public static List<ServiceRegistration> scanServiceInfo(ServiceInfo serviceInfo) {
-    return Arrays.stream(serviceInfo.serviceInstance().getClass().getInterfaces())
-        .filter(serviceInterface -> serviceInterface.isAnnotationPresent(Service.class))
+  public static List<ServiceRegistration> scanServiceDefinition(
+      ServiceDefinition serviceDefinition) {
+    return Reflect.serviceInterfaces(serviceDefinition.type())
         .map(
             serviceInterface -> {
-              Map<String, String> serviceInfoTags = serviceInfo.tags();
+              Map<String, String> serviceInfoTags = serviceDefinition.tags();
               Map<String, String> apiTags = Reflect.serviceTags(serviceInterface);
               Map<String, String> buffer = new HashMap<>(apiTags);
               // service tags override tags from @Service

services-api/src/main/java/io/scalecube/services/annotations/BeforeDestroy.java

@@ -8,8 +8,7 @@
 import java.lang.annotation.Target;
 
 /**
- * This annotation is used to mark the method which will be executed before shutdown of service
- *  <br>
+ * This annotation is used to mark the method which will be executed before shutdown of service <br>
  * Scalecube services doesn't support {@link javax.annotation.PreDestroy} since Java API *
  * Specification for it has strict limitation for annotated method.
  */

services-benchmarks/src/main/java/io/scalecube/services/benchmarks/transport/BenchmarkServiceState.java

@@ -4,7 +4,9 @@
 import io.scalecube.benchmarks.BenchmarkState;
 import io.scalecube.net.Address;
 import io.scalecube.services.Microservices;
+import io.scalecube.services.ScalecubeServiceFactory;
 import io.scalecube.services.ServiceCall;
+import io.scalecube.services.ServiceFactory;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import java.time.Duration;
@@ -38,14 +40,16 @@ public void beforeAll() {
 
     final Address seedAddress = seed.discovery().address();
 
+    ServiceFactory serviceFactory = ScalecubeServiceFactory.fromInstances(services);
+
     node =
         Microservices.builder()
             .discovery(
                 endpoint ->
                     new ScalecubeServiceDiscovery(endpoint)
                         .membership(cfg -> cfg.seedMembers(seedAddress)))
             .transport(RSocketServiceTransport::new)
-            .services(services)
+            .serviceFactory(serviceFactory)
             .startAwait();
 
     LOGGER.info(

services-examples-parent/services-examples-runner/pom.xml

@@ -10,6 +10,7 @@
   <artifactId>scalecube-services-examples-runner</artifactId>
 
   <properties>
+    <!--suppress UnresolvedMavenProperty -->
     <extratags>${env.TRAVIS_COMMIT}</extratags>
     <mainClass>io.scalecube.services.examples.ExamplesRunner</mainClass>
   </properties>

services-examples-parent/services-examples-runner/src/main/java/io/scalecube/services/examples/ExamplesRunner.java

@@ -9,7 +9,9 @@
 import io.scalecube.net.Address;
 import io.scalecube.runners.Runners;
 import io.scalecube.services.Microservices;
+import io.scalecube.services.ScalecubeServiceFactory;
 import io.scalecube.services.ServiceEndpoint;
+import io.scalecube.services.ServiceFactory;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.discovery.api.ServiceDiscovery;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
@@ -52,6 +54,9 @@ public static void main(String[] args) {
             .orElse(Runtime.getRuntime().availableProcessors());
     LOGGER.info("Number of worker threads: " + numOfThreads);
 
+    ServiceFactory serviceFactory =
+        ScalecubeServiceFactory.fromInstances(
+            new BenchmarkServiceImpl(), new GreetingServiceImpl());
     Microservices microservices =
         Microservices.builder()
             .discovery(endpoint -> serviceDiscovery(endpoint, config))
@@ -72,7 +77,7 @@ public static void main(String[] args) {
                                     .port(config.servicePort())
                                     .runOn(loopResources)
                                     .noSSL()))
-            .services(new BenchmarkServiceImpl(), new GreetingServiceImpl())
+            .serviceFactory(serviceFactory)
             .startAwait();
 
     Runners.onShutdown(() -> microservices.shutdown().subscribe());

services-examples-parent/services-examples/pom.xml

@@ -57,6 +57,21 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>5.2.6.RELEASE</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>5.2.6.RELEASE</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>4.1.0</version>
+    </dependency>
   </dependencies>
 
 </project>

services-examples-parent/services-examples/src/main/java/io/scalecube/services/examples/codecs/Example1.java

@@ -2,6 +2,8 @@
 
 import io.scalecube.net.Address;
 import io.scalecube.services.Microservices;
+import io.scalecube.services.ScalecubeServiceFactory;
+import io.scalecube.services.ServiceFactory;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.examples.helloworld.service.GreetingServiceImpl;
 import io.scalecube.services.examples.helloworld.service.api.GreetingsService;
@@ -29,6 +31,10 @@ public static void main(String[] args) {
 
     final Address seedAddress = seed.discovery().address();
 
+    // Create service factory for GreetingService
+    ServiceFactory serviceFactory =
+        ScalecubeServiceFactory.fromInstances(new GreetingServiceImpl());
+
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices ms =
         Microservices.builder()
@@ -37,7 +43,7 @@ public static void main(String[] args) {
                     new ScalecubeServiceDiscovery(endpoint)
                         .membership(cfg -> cfg.seedMembers(seedAddress)))
             .transport(RSocketServiceTransport::new)
-            .services(new GreetingServiceImpl())
+            .serviceFactory(serviceFactory)
             .startAwait();
 
     seed.call()