Fixed builders

Author: artem-v

tests/src/test/java/io/scalecube/security/tokens/jwt/JsonwebtokenResolverTests.java

@@ -29,7 +29,7 @@ void testResolveTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exce
 
     final var jwtToken =
         new JsonwebtokenResolver(
-                new JwksKeyLocator.Builder()
+                JwksKeyLocator.builder()
                     .jwksUri(vaultEnvironment.jwksUri())
                     .connectTimeout(Duration.ofSeconds(3))
                     .requestTimeout(Duration.ofSeconds(3))

tests/src/test/java/io/scalecube/security/vault/VaultServiceTokenTests.java

@@ -30,7 +30,7 @@ public class VaultServiceTokenTests {
   void testGetServiceTokenUsingWrongCredentials(VaultEnvironment vaultEnvironment)
       throws Exception {
     final var serviceTokenSupplier =
-        new VaultServiceTokenSupplier.Builder()
+        VaultServiceTokenSupplier.builder()
             .vaultAddress(vaultEnvironment.vaultAddr())
             .vaultTokenSupplier(() -> completedFuture(randomAlphabetic(16)))
             .serviceRole(randomAlphabetic(16))
@@ -52,7 +52,7 @@ void testGetNonExistingServiceToken(VaultEnvironment vaultEnvironment) throws Ex
     final var nonExistingServiceRole = "non-existing-role-" + System.currentTimeMillis();
 
     final var serviceTokenSupplier =
-        new VaultServiceTokenSupplier.Builder()
+        VaultServiceTokenSupplier.builder()
             .vaultAddress(vaultEnvironment.vaultAddr())
             .vaultTokenSupplier(() -> completedFuture(vaultEnvironment.login()))
             .serviceRole(nonExistingServiceRole)
@@ -76,7 +76,7 @@ void testGetServiceTokenByWrongServiceRole(VaultEnvironment vaultEnvironment) th
     final var serviceRole2 = "role2-" + now;
     final var serviceRole3 = "role3-" + now;
 
-    new VaultServiceRolesInstaller.Builder()
+    VaultServiceRolesInstaller.builder()
         .vaultAddress(vaultEnvironment.vaultAddr())
         .vaultTokenSupplier(() -> completedFuture(vaultEnvironment.login()))
         .keyNameSupplier(() -> "key-" + now)
@@ -94,7 +94,7 @@ void testGetServiceTokenByWrongServiceRole(VaultEnvironment vaultEnvironment) th
         .install();
 
     final var serviceTokenSupplier =
-        new VaultServiceTokenSupplier.Builder()
+        VaultServiceTokenSupplier.builder()
             .vaultAddress(vaultEnvironment.vaultAddr())
             .vaultTokenSupplier(() -> completedFuture(vaultEnvironment.login()))
             .serviceRole(serviceRole1)
@@ -117,7 +117,7 @@ void testGetServiceTokenSuccessfully(VaultEnvironment vaultEnvironment) throws E
     final var serviceRole = "role-" + now;
     final var tags = Map.of("type", "ops", "ns", "develop");
 
-    new VaultServiceRolesInstaller.Builder()
+    VaultServiceRolesInstaller.builder()
         .vaultAddress(vaultEnvironment.vaultAddr())
         .vaultTokenSupplier(() -> completedFuture(vaultEnvironment.login()))
         .keyNameSupplier(() -> "key-" + now)
@@ -128,7 +128,7 @@ void testGetServiceTokenSuccessfully(VaultEnvironment vaultEnvironment) throws E
         .install();
 
     final var serviceTokenSupplier =
-        new VaultServiceTokenSupplier.Builder()
+        VaultServiceTokenSupplier.builder()
             .vaultAddress(vaultEnvironment.vaultAddr())
             .vaultTokenSupplier(() -> completedFuture(vaultEnvironment.login()))
             .serviceRole(serviceRole)
@@ -142,7 +142,7 @@ void testGetServiceTokenSuccessfully(VaultEnvironment vaultEnvironment) throws E
 
     final var jwtToken =
         new JsonwebtokenResolver(
-                new JwksKeyLocator.Builder().jwksUri(vaultEnvironment.jwksUri()).build())
+                JwksKeyLocator.builder().jwksUri(vaultEnvironment.jwksUri()).build())
             .resolve(serviceToken)
             .get(3, TimeUnit.SECONDS);
 

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

@@ -47,6 +47,10 @@ private JwksKeyLocator(Builder builder) {
     this.keyTtl = builder.keyTtl;
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   @Override
   protected Key locate(JwsHeader header) {
     try {
@@ -160,6 +164,8 @@ public static class Builder {
     private Duration requestTimeout = Duration.ofSeconds(10);
     private int keyTtl = 60 * 1000;
 
+    private Builder() {}
+
     /**
      * Setter for JWKS URI. The JWKS URI typically follows a well-known pattern, such as
      * https://server_domain/.well-known/jwks.json. This endpoint is a read-only URL that responds

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

@@ -62,6 +62,10 @@ private VaultServiceRolesInstaller(Builder builder) {
     this.timeUnit = builder.timeUnit;
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   /**
    * Builds vault oidc micro-infrastructure (identity roles and keys) to use it for
    * machine-to-machine authentication.
@@ -363,7 +367,7 @@ public static class Builder {
     private long timeout = 10;
     private TimeUnit timeUnit = TimeUnit.SECONDS;
 
-    public Builder() {}
+    private Builder() {}
 
     public Builder vaultAddress(String vaultAddress) {
       this.vaultAddress = vaultAddress;

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

@@ -33,6 +33,10 @@ private VaultServiceTokenSupplier(Builder builder) {
         Objects.requireNonNull(builder.serviceTokenNameBuilder, "serviceTokenNameBuilder");
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   /**
    * Obtains vault service token (aka identity token or oidc token).
    *
@@ -98,7 +102,7 @@ public static class Builder {
     private Supplier<CompletableFuture<String>> vaultTokenSupplier;
     private BiFunction<String, Map<String, String>, String> serviceTokenNameBuilder;
 
-    public Builder() {}
+    private Builder() {}
 
     /**
      * Setter for {@code vaultAddress}.