Merge pull request #103 from scalecube/set-back-slf4j

Set back slf4j

Author: artem-v

jwt/pom.xml

@@ -27,6 +27,10 @@
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

pom.xml

@@ -44,13 +44,13 @@
     <reactor.version>2020.0.32</reactor.version>
     <vault-java-driver.version>5.1.0</vault-java-driver.version>
     <jackson.version>2.18.2</jackson.version>
+    <slf4j.version>1.7.36</slf4j.version>
     <jjwt.version>0.11.2</jjwt.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>
     <testcontainers.version>1.20.1</testcontainers.version>
-    <slf4j.version>2.0.7</slf4j.version>
 
     <distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-security
     </distributionManagement.url>
@@ -108,11 +108,7 @@
         <groupId>org.testcontainers</groupId>
         <artifactId>vault</artifactId>
         <version>${testcontainers.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.bettercloud</groupId>
-        <artifactId>vault-java-driver</artifactId>
-        <version>${vault-java-driver.version}</version>
+        <scope>test</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>

tokens/pom.xml

@@ -27,6 +27,10 @@
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
     <!-- Tests -->
     <dependency>
       <groupId>org.testcontainers</groupId>

tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java

@@ -1,22 +1,22 @@
 package io.scalecube.security.tokens.jwt;
 
 import io.scalecube.security.tokens.jwt.jsonwebtoken.JsonwebtokenParserFactory;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.security.Key;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
 public final class JwtTokenResolverImpl implements JwtTokenResolver {
 
-  private static final Logger LOGGER = System.getLogger(JwtTokenResolver.class.getName());
+  private static final Logger LOGGER = LoggerFactory.getLogger(JwtTokenResolver.class);
 
   private KeyProvider keyProvider;
   private JwtTokenParserFactory tokenParserFactory = new JsonwebtokenParserFactory();
@@ -100,7 +100,7 @@ public Mono<Map<String, Object>> resolve(String token) {
           String kid = (String) header.get("kid");
           Objects.requireNonNull(kid, "kid is missing");
 
-          LOGGER.log(Level.DEBUG, "[resolveToken][kid:{0}] Resolving token {1}", kid, mask(token));
+          LOGGER.debug("[resolveToken][kid:{}] Resolving token {}", kid, mask(token));
 
           // workaround to remove safely on errors
           AtomicReference<Mono<Key>> computedValueHolder = new AtomicReference<>();
@@ -110,19 +110,13 @@ public Mono<Map<String, Object>> resolve(String token) {
               .doOnError(throwable -> cleanup(kid, computedValueHolder))
               .doOnError(
                   throwable ->
-                      LOGGER.log(
-                          Level.ERROR,
-                          "[resolveToken][kid:{0}][{1}] Exception occurred: {2}",
+                      LOGGER.error(
+                          "[resolveToken][kid:{}][{}] Exception occurred: {}",
                           kid,
                           mask(token),
                           throwable.toString()))
               .doOnSuccess(
-                  s ->
-                      LOGGER.log(
-                          Level.DEBUG,
-                          "[resolveToken][kid:{0}] Resolved token {1}",
-                          kid,
-                          mask(token)));
+                  s -> LOGGER.debug("[resolveToken][kid:{}] Resolved token {}", kid, mask(token)));
         });
   }
 

vault/pom.xml

@@ -21,6 +21,10 @@
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java

@@ -13,8 +13,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
@@ -23,10 +21,12 @@
 import java.util.StringJoiner;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class VaultServiceRolesInstaller {
 
-  private static final Logger LOGGER = System.getLogger(VaultServiceRolesInstaller.class.getName());
+  private static final Logger LOGGER = LoggerFactory.getLogger(VaultServiceRolesInstaller.class);
 
   private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
 
@@ -64,13 +64,13 @@ private VaultServiceRolesInstaller(Builder builder) {
    */
   public void install() {
     if (isNullOrNoneOrEmpty(vaultAddress)) {
-      LOGGER.log(Level.DEBUG, "Skipping serviceRoles installation, vaultAddress not set");
+      LOGGER.debug("Skipping serviceRoles installation, vaultAddress not set");
       return;
     }
 
     final ServiceRoles serviceRoles = loadServiceRoles();
     if (serviceRoles == null || serviceRoles.roles.isEmpty()) {
-      LOGGER.log(Level.DEBUG, "Skipping serviceRoles installation, serviceRoles not set");
+      LOGGER.debug("Skipping serviceRoles installation, serviceRoles not set");
       return;
     }
 
@@ -86,7 +86,7 @@ public void install() {
           rest.url(buildVaultIdentityRoleUri(roleName)), keyName, roleName, role.permissions);
     }
 
-    LOGGER.log(Level.DEBUG, "Installed serviceRoles ({0})", serviceRoles);
+    LOGGER.debug("Installed serviceRoles ({})", serviceRoles);
   }
 
   private ServiceRoles loadServiceRoles() {
@@ -111,7 +111,7 @@ private static void verifyOk(int status) {
   }
 
   private void createVaultIdentityKey(Rest rest, String keyName) {
-    LOGGER.log(Level.DEBUG, "[createVaultIdentityKey] {0}", keyName);
+    LOGGER.debug("[createVaultIdentityKey] {}", keyName);
 
     byte[] body =
         Json.object()
@@ -131,7 +131,7 @@ private void createVaultIdentityKey(Rest rest, String keyName) {
 
   private void createVaultIdentityRole(
       Rest rest, String keyName, String roleName, List<String> permissions) {
-    LOGGER.log(Level.DEBUG, "[createVaultIdentityRole] {0}", roleName);
+    LOGGER.debug("[createVaultIdentityRole] {}", roleName);
 
     byte[] body =
         Json.object()

vault/src/main/java/io/scalecube/security/vault/VaultServiceTokenSupplier.java

@@ -4,17 +4,17 @@
 import com.bettercloud.vault.rest.Rest;
 import com.bettercloud.vault.rest.RestException;
 import com.bettercloud.vault.rest.RestResponse;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class VaultServiceTokenSupplier {
 
-  private static final Logger LOGGER = System.getLogger(VaultServiceTokenSupplier.class.getName());
+  private static final Logger LOGGER = LoggerFactory.getLogger(VaultServiceTokenSupplier.class);
 
   private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
 
@@ -44,8 +44,7 @@ public String getToken(Map<String, String> tags) {
       final String vaultToken = vaultTokenSupplier.get();
       final String uri = toServiceTokenUri(tags);
       final String token = rpcGetToken(uri, vaultToken);
-      LOGGER.log(
-          Level.DEBUG, "[getToken][success] uri={0}, tags={1}, result={2}", uri, tags, mask(token));
+      LOGGER.debug("[getToken][success] uri={}, tags={}, result={}", uri, tags, mask(token));
       return token;
     } catch (Exception ex) {
       throw new RuntimeException(ex);