Set back slf4j (#877)

Author: artem-v

pom.xml

@@ -59,20 +59,20 @@
   </scm>
 
   <properties>
-    <scalecube-cluster.version>2.6.18.RC11</scalecube-cluster.version>
-    <scalecube-security.version>1.0.33.RC2</scalecube-security.version>
+    <scalecube-cluster.version>2.6.18.RC12</scalecube-cluster.version>
+    <scalecube-security.version>1.0.33.RC3</scalecube-security.version>
 
     <reactor.version>2020.0.32</reactor.version>
     <jackson.version>2.18.2</jackson.version>
     <netty.version>4.1.117.Final</netty.version>
     <rsocket.version>1.1.4</rsocket.version>
     <jsr305.version>3.0.2</jsr305.version>
+    <slf4j.version>1.7.36</slf4j.version>
 
     <mockito-junit.version>4.6.1</mockito-junit.version>
     <junit-jupiter.version>5.8.2</junit-jupiter.version>
     <hamcrest.version>1.3</hamcrest.version>
     <log4j.version>2.17.2</log4j.version>
-    <slf4j.version>1.7.36</slf4j.version>
 
     <distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-services
     </distributionManagement.url>
@@ -87,6 +87,7 @@
     <module>services-discovery</module>
     <module>services-security</module>
     <module>services-examples</module>
+    <module>services-testlib</module>
   </modules>
 
   <dependencyManagement>

services-api/pom.xml

@@ -18,6 +18,10 @@
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -11,8 +11,6 @@
 import io.scalecube.services.routing.Router;
 import io.scalecube.services.routing.Routers;
 import io.scalecube.services.transport.api.ClientTransport;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.util.Collections;
@@ -22,6 +20,8 @@
 import java.util.Optional;
 import java.util.function.Function;
 import org.reactivestreams.Publisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -35,7 +35,6 @@ public class ServiceCall implements AutoCloseable {
   private Map<String, String> credentials = Collections.emptyMap();
   private String contentType = ServiceMessage.DEFAULT_DATA_FORMAT;
   private Logger logger;
-  private Level level;
 
   public ServiceCall() {}
 
@@ -47,7 +46,6 @@ private ServiceCall(ServiceCall other) {
     this.contentType = other.contentType;
     this.credentials = Collections.unmodifiableMap(new HashMap<>(other.credentials));
     this.logger = other.logger;
-    this.level = other.level;
   }
 
   /**
@@ -135,41 +133,53 @@ public ServiceCall contentType(String contentType) {
   }
 
   /**
-   * Setter for {@code logger}.
+   * Setter for {@link ServiceCall} {@code logger}.
    *
-   * @param name logger name.
-   * @param level logger level.
+   * @param name logger name (optional)
    * @return new {@link ServiceCall} instance.
    */
-  public ServiceCall logger(String name, Level level) {
+  public ServiceCall logger(String name) {
     ServiceCall target = new ServiceCall(this);
-    target.logger = System.getLogger(name);
-    target.level = level;
+    target.logger = name != null ? LoggerFactory.getLogger(name) : null;
     return target;
   }
 
   /**
-   * Setter for {@code logger}.
+   * Setter for {@link ServiceCall} {@code logger}.
    *
-   * @param name logger name.
+   * @param clazz logger name (optional)
    * @return new {@link ServiceCall} instance.
    */
-  public ServiceCall logger(String name) {
-    return logger(name, Level.DEBUG);
+  public ServiceCall logger(Class<?> clazz) {
+    ServiceCall target = new ServiceCall(this);
+    target.logger = clazz != null ? LoggerFactory.getLogger(clazz) : null;
+    return target;
+  }
+
+  /**
+   * Setter for {@link ServiceCall} {@code logger}.
+   *
+   * @param logger logger (optional)
+   * @return new {@link ServiceCall} instance.
+   */
+  public ServiceCall logger(Logger logger) {
+    ServiceCall target = new ServiceCall(this);
+    target.logger = logger;
+    return target;
   }
 
   /**
-   * Issues fire-and-forget request.
+   * Invokes fire-and-forget request.
    *
    * @param request request message to send.
    * @return mono publisher completing normally or with error.
    */
   public Mono<Void> oneWay(ServiceMessage request) {
-    return Mono.defer(() -> requestOne(request, Void.class).then());
+    return requestOne(request, Void.class).then();
   }
 
   /**
-   * Issues request-and-reply request.
+   * Invokes request-and-reply request.
    *
    * @param request request message to send.
    * @return mono publisher completing with single response message or with error.
@@ -179,7 +189,7 @@ public Mono<ServiceMessage> requestOne(ServiceMessage request) {
   }
 
   /**
-   * Issues request-and-reply request.
+   * Invokes request-and-reply request.
    *
    * @param request request message to send.
    * @param responseType type of response (optional).
@@ -207,17 +217,15 @@ public Mono<ServiceMessage> requestOne(ServiceMessage request, Type responseType
             })
         .doOnSuccess(
             response -> {
-              if (logger != null && logger.isLoggable(level)) {
-                logger.log(
-                    level,
-                    "[{0}] request: " + request + ", response: " + response,
-                    request.qualifier());
+              if (logger != null && logger.isDebugEnabled()) {
+                logger.debug(
+                    "[{}] request: {}, response: {}", request.qualifier(), request, response);
               }
             })
         .doOnError(
             ex -> {
               if (logger != null) {
-                logger.log(Level.ERROR, "[{0}] request: " + request, request.qualifier(), ex);
+                logger.error("[{}] request: {}", request.qualifier(), request, ex);
               }
             });
   }
@@ -261,14 +269,14 @@ public Flux<ServiceMessage> requestMany(ServiceMessage request, Type responseTyp
             })
         .doOnSubscribe(
             s -> {
-              if (logger != null && logger.isLoggable(level)) {
-                logger.log(level, "[{0}] request: " + request, request.qualifier());
+              if (logger != null && logger.isDebugEnabled()) {
+                logger.debug("[{}] request: {}", request.qualifier(), request);
               }
             })
         .doOnError(
             ex -> {
               if (logger != null) {
-                logger.log(Level.ERROR, "[{0}] request: " + request, request.qualifier(), ex);
+                logger.error("[{}] request: {}", request.qualifier(), request, ex);
               }
             });
   }

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

@@ -199,7 +199,7 @@ public Builder tags(Map<String, String> tags) {
      * Adds {@code serviceRegistrations} to collection of {@code serviceRegistrations}.
      *
      * @param serviceRegistrations serviceRegistrations
-     * @return this builder
+     * @return this
      */
     public Builder appendServiceRegistrations(
         Collection<ServiceRegistration> serviceRegistrations) {
@@ -212,7 +212,7 @@ public Builder appendServiceRegistrations(
      * Setter for {@code serviceRegistrations}.
      *
      * @param serviceRegistrations serviceRegistrations
-     * @return this builder
+     * @return this
      */
     public Builder serviceRegistrations(Collection<ServiceRegistration> serviceRegistrations) {
       this.serviceRegistrations =

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

@@ -4,13 +4,13 @@
 import io.scalecube.services.auth.PrincipalMapper;
 import io.scalecube.services.exceptions.ServiceProviderErrorMapper;
 import io.scalecube.services.transport.api.ServiceMessageDataDecoder;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ServiceInfo {
 
@@ -21,7 +21,6 @@ public class ServiceInfo {
   private final Authenticator<Object> authenticator;
   private final PrincipalMapper<Object, Object> principalMapper;
   private final Logger logger;
-  private final Level level;
 
   private ServiceInfo(Builder builder) {
     this.serviceInstance = builder.serviceInstance;
@@ -31,7 +30,6 @@ private ServiceInfo(Builder builder) {
     this.authenticator = builder.authenticator;
     this.principalMapper = builder.principalMapper;
     this.logger = builder.logger;
-    this.level = builder.level;
   }
 
   public static Builder from(ServiceInfo serviceInfo) {
@@ -70,10 +68,6 @@ public Logger logger() {
     return logger;
   }
 
-  public Level level() {
-    return level;
-  }
-
   @Override
   public String toString() {
     return new StringJoiner(", ", ServiceInfo.class.getSimpleName() + "[", "]")
@@ -84,7 +78,6 @@ public String toString() {
         .add("authenticator=" + authenticator)
         .add("principalMapper=" + principalMapper)
         .add("logger=" + logger)
-        .add("level=" + level)
         .toString();
   }
 
@@ -97,7 +90,6 @@ public static class Builder {
     private Authenticator<Object> authenticator;
     private PrincipalMapper<Object, Object> principalMapper;
     private Logger logger;
-    private Level level;
 
     private Builder(ServiceInfo serviceInfo) {
       this.serviceInstance = serviceInfo.serviceInstance;
@@ -107,7 +99,6 @@ private Builder(ServiceInfo serviceInfo) {
       this.authenticator = serviceInfo.authenticator;
       this.principalMapper = serviceInfo.principalMapper;
       this.logger = serviceInfo.logger;
-      this.level = serviceInfo.level;
     }
 
     private Builder(Object serviceInstance) {
@@ -120,7 +111,7 @@ private Builder(Object serviceInstance) {
      *
      * @param key tag key
      * @param value tag value
-     * @return this builder
+     * @return this
      */
     public Builder tag(String key, String value) {
       Objects.requireNonNull(key, "tag key");
@@ -133,7 +124,7 @@ public Builder tag(String key, String value) {
      * Setter for {@code errorMapper}. Overrides default {@code Microservices.errorMapper}.
      *
      * @param errorMapper error mapper
-     * @return this buidler
+     * @return this
      */
     public Builder errorMapper(ServiceProviderErrorMapper errorMapper) {
       this.errorMapper = Objects.requireNonNull(errorMapper, "errorMapper");
@@ -144,30 +135,40 @@ public Builder errorMapper(ServiceProviderErrorMapper errorMapper) {
      * Setter for {@code logger}. Overrides default {@code Microservices.logger}.
      *
      * @param name logger name (optional)
-     * @param level logger level (optional)
-     * @return this buidler
+     * @return this
      */
-    public Builder logger(String name, Level level) {
-      this.logger = name != null ? System.getLogger(name) : null;
-      this.level = level;
+    public Builder logger(String name) {
+      this.logger = name != null ? LoggerFactory.getLogger(name) : null;
       return this;
     }
 
     /**
      * Setter for {@code logger}. Overrides default {@code Microservices.logger}.
      *
-     * @param name logger name (optional)
-     * @return this buidler
+     * @param clazz logger name (optional)
+     * @return this
      */
-    public Builder logger(String name) {
-      return logger(name, Level.DEBUG);
+    public Builder logger(Class<?> clazz) {
+      this.logger = clazz != null ? LoggerFactory.getLogger(clazz) : null;
+      return this;
+    }
+
+    /**
+     * Setter for {@code logger}. Overrides default {@code Microservices.logger}.
+     *
+     * @param logger logger (optional)
+     * @return this
+     */
+    public Builder logger(Logger logger) {
+      this.logger = logger;
+      return this;
     }
 
     /**
      * Setter for {@code dataDecoder}. Overrides default {@code Microservices.dataDecoder}.
      *
      * @param dataDecoder data decoder
-     * @return this builder
+     * @return this
      */
     public Builder dataDecoder(ServiceMessageDataDecoder dataDecoder) {
       this.dataDecoder = Objects.requireNonNull(dataDecoder, "dataDecoder");
@@ -179,7 +180,7 @@ public Builder dataDecoder(ServiceMessageDataDecoder dataDecoder) {
      *
      * @param authenticator authenticator (optional)
      * @param <T> type of auth data returned by authenticator
-     * @return this builder
+     * @return this
      */
     public <T> Builder authenticator(Authenticator<? extends T> authenticator) {
       //noinspection unchecked
@@ -193,7 +194,7 @@ public <T> Builder authenticator(Authenticator<? extends T> authenticator) {
      * @param principalMapper principalMapper (optional)
      * @param <T> auth data type
      * @param <R> principal type
-     * @return this builder
+     * @return this
      */
     public <T, R> Builder principalMapper(PrincipalMapper<? super T, ? extends R> principalMapper) {
       //noinspection unchecked
@@ -229,9 +230,9 @@ Builder principalMapperIfAbsent(PrincipalMapper<Object, Object> principalMapper)
       return this;
     }
 
-    Builder loggerIfAbsent(String name, Level level) {
+    Builder loggerIfAbsent(Logger logger) {
       if (this.logger == null) {
-        return logger(name, level);
+        return logger(logger);
       }
       return this;
     }