Updated formatting

Author: gmsdelmundo

src/main/java/com/uid2/operator/model/IdentityRequest.java

@@ -5,11 +5,9 @@ public final class IdentityRequest {
     public final UserIdentity userIdentity;
     public final TokenGeneratePolicy tokenGeneratePolicy;
 
-    public IdentityRequest(
-            PublisherIdentity publisherIdentity,
-            UserIdentity userIdentity,
-            TokenGeneratePolicy tokenGeneratePolicy)
-    {
+    public IdentityRequest(PublisherIdentity publisherIdentity,
+                           UserIdentity userIdentity,
+                           TokenGeneratePolicy tokenGeneratePolicy) {
         this.publisherIdentity = publisherIdentity;
         this.userIdentity = userIdentity;
         this.tokenGeneratePolicy = tokenGeneratePolicy;

src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java

@@ -57,7 +57,8 @@ public class UIDOperatorVerticle extends AbstractVerticle{
 
     private static final int DEFAULT_MASTER_KEYSET_ID = 1;
     private static final int DEFAULT_KEYSET_ID = 99999;
-    private static DateTimeFormatter APIDateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME.withZone(ZoneId.of("UTC"));
+    private static final DateTimeFormatter API_DATE_TIME_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME.withZone(ZoneId.of("UTC"));
+
     private final HealthComponent healthComponent = HealthManager.instance.registerComponent("http-server");
     private final JsonObject config;
     private final AuthMiddleware auth;
@@ -75,8 +76,7 @@ public class UIDOperatorVerticle extends AbstractVerticle{
     private Handler<RoutingContext> disableHandler = null;
     private final boolean phoneSupport;
     private final int tcfVendorId;
-
-    private IStatsCollectorQueue _statsCollectorQueue;
+    private final IStatsCollectorQueue _statsCollectorQueue;
 
     public UIDOperatorVerticle(JsonObject config,
                                IClientKeyProvider clientKeyProvider,
@@ -99,7 +99,6 @@ public UIDOperatorVerticle(JsonObject config,
         this.v2PayloadHandler = new V2PayloadHandler(keyStore, config.getBoolean("enable_v2_encryption", true), this.identityScope);
         this.phoneSupport = config.getBoolean("enable_phone_support", true);
         this.tcfVendorId = config.getInteger("tcf_vendor_id", 21);
-
         this._statsCollectorQueue = statsCollectorQueue;
     }
 
@@ -303,10 +302,10 @@ public void handleKeysSharing(RoutingContext rc) {
     }
 
     private List<EncryptionKey> getEncryptionKeys() {
-        final List<EncryptionKey> keyStore = this.keyStore.getSnapshot().getActiveKeySet()
-                .stream().filter(k -> k.getSiteId() != Const.Data.RefreshKeySiteId)
+        return this.keyStore.getSnapshot().getActiveKeySet()
+                .stream()
+                .filter(k -> k.getSiteId() != Const.Data.RefreshKeySiteId)
                 .collect(Collectors.toList());
-        return keyStore;
     }
 
     private void handleHealthCheck(RoutingContext rc) {
@@ -667,7 +666,7 @@ private void handleBucketsV1(RoutingContext rc) {
                     o.put("bucket_id", e.getHashedId());
                     Instant lastUpdated = Instant.ofEpochMilli(e.getLastUpdated());
 
-                    o.put("last_updated", APIDateTimeFormatter.format(lastUpdated));
+                    o.put("last_updated", API_DATE_TIME_FORMATTER.format(lastUpdated));
                     resp.add(o);
                 }
                 ResponseUtil.Success(rc, resp);
@@ -698,7 +697,7 @@ private void handleBucketsV2(RoutingContext rc) {
                     o.put("bucket_id", e.getHashedId());
                     Instant lastUpdated = Instant.ofEpochMilli(e.getLastUpdated());
 
-                    o.put("last_updated", APIDateTimeFormatter.format(lastUpdated));
+                    o.put("last_updated", API_DATE_TIME_FORMATTER.format(lastUpdated));
                     resp.add(o);
                 }
                 ResponseUtil.SuccessV2(rc, resp);
@@ -1058,9 +1057,7 @@ private void handleIdentityMapBatch(RoutingContext rc) {
 
             final Instant now = Instant.now();
             final JsonArray mapped = new JsonArray();
-            final int count = inputList.length;
-            for (int i = 0; i < count; ++i) {
-                final InputUtil.InputVal input = inputList[i];
+            for (final InputUtil.InputVal input : inputList) {
                 if (input != null && input.isValid()) {
                     final MappedIdentity mappedIdentity = this.idService.map(input.toUserIdentity(this.identityScope, 0, now), now);
                     final JsonObject resp = new JsonObject();
@@ -1245,8 +1242,7 @@ private JsonObject toJsonV1(IdentityTokens t) {
 
     private JsonArray toJson(List<EncryptionKey> keys, ClientKey clientKey, IKeysAclSnapshot acls) {
         final JsonArray a = new JsonArray();
-        for (int i = 0; i < keys.size(); ++i) {
-            final EncryptionKey k = keys.get(i);
+        for (final EncryptionKey k : keys) {
             if (!acls.canClientAccessKey(clientKey, k)) {
                 continue;
             }
@@ -1295,7 +1291,7 @@ public static class ResponseStatus {
         public static String InsufficientUserConsent = "insufficient_user_consent";
     }
 
-    public static enum UserConsentStatus {
+    public enum UserConsentStatus {
         SUFFICIENT,
         INSUFFICIENT,
         INVALID,

src/main/java/com/uid2/operator/vertx/V2PayloadHandler.java

@@ -23,11 +23,9 @@
 public class V2PayloadHandler {
     private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(V2PayloadHandler.class);
 
-    private IKeyStore keyStore;
-
-    private Boolean enableEncryption;
-
-    private IdentityScope identityScope;
+    private final IKeyStore keyStore;
+    private final Boolean enableEncryption;
+    private final IdentityScope identityScope;
 
     public V2PayloadHandler(IKeyStore keyStore, Boolean enableEncryption, IdentityScope identityScope) {
         this.keyStore = keyStore;
@@ -144,13 +142,13 @@ public void handleTokenRefresh(RoutingContext rc, Handler<RoutingContext> apiHan
                 rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "text/plain");
                 // Encrypt whole payload using key shared with client.
                 byte[] encryptedResp = AesGcm.encrypt(
-                    respJson.encode().getBytes(StandardCharsets.UTF_8),
-                    request.encryptionKey);
+                        respJson.encode().getBytes(StandardCharsets.UTF_8),
+                        request.encryptionKey);
                 rc.response().end(Utils.toBase64String(encryptedResp));
             }
             else {
                 rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-                    .end(respJson.encode());
+                        .end(respJson.encode());
             }
         }
         catch (Exception ex){
@@ -167,7 +165,7 @@ private void passThrough(RoutingContext rc, Handler<RoutingContext> apiHandler)
         }
         JsonObject respJson = (JsonObject) rc.data().get("response");
         rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-            .end(respJson.encode());
+                .end(respJson.encode());
     }
 
     private void writeResponse(RoutingContext rc, byte[] nonce, JsonObject resp, byte[] keyBytes) {
@@ -195,4 +193,3 @@ private void handleResponse(RoutingContext rc, V2RequestUtil.V2Request request)
         }
     }
 }
-