Changed ex to e

gmsdelmundo · gmsdelmundo · commit fd4172b7942f · 2023-02-16T14:14:39.000+08:00
diff --git a/src/main/java/com/uid2/operator/service/UIDOperatorService.java b/src/main/java/com/uid2/operator/service/UIDOperatorService.java
@@ -116,7 +116,7 @@ public RefreshResponse refreshIdentity(RefreshToken token) {
             } else {
                 return RefreshResponse.Optout;
             }
-        } catch (Exception ex) {
+        } catch (Exception e) {
             return RefreshResponse.Invalid;
         }
     }
diff --git a/src/main/java/com/uid2/operator/service/V2RequestUtil.java b/src/main/java/com/uid2/operator/service/V2RequestUtil.java
@@ -62,7 +62,7 @@ public static V2Request parseRequest(String bodyString, ClientKey ck) {
             //  byte 13-end: encrypted payload + GCM AUTH TAG
             bodyBytes = Utils.decodeBase64String(bodyString);
         }
-        catch (IllegalArgumentException ex) {
+        catch (IllegalArgumentException e) {
             return new V2Request("Invalid body: Body is not valid base64.");
         }
 
@@ -77,7 +77,7 @@ public static V2Request parseRequest(String bodyString, ClientKey ck) {
         byte[] decryptedBody;
         try {
             decryptedBody = AesGcm.decrypt(bodyBytes, 1, ck.getSecretBytes());
-        } catch (Exception ex) {
+        } catch (Exception e) {
             return new V2Request("Invalid body: Check encryption key (ClientSecret)");
         }
 
@@ -98,8 +98,8 @@ public static V2Request parseRequest(String bodyString, ClientKey ck) {
                 // Skip 8 bytes timestamp, 8 bytes nonce
                 String bodyStr = new String(decryptedBody, 16, decryptedBody.length - 16, StandardCharsets.UTF_8);
                 payload = new JsonObject(bodyStr);
-            } catch (Exception ex) {
-                LOGGER.error("Invalid payload in body: Data is not valid json string.", ex);
+            } catch (Exception e) {
+                LOGGER.error("Invalid payload in body: Data is not valid json string.", e);
                 return new V2Request("Invalid payload in body: Data is not valid json string.");
             }
         }
@@ -116,7 +116,7 @@ public static V2Request parseRefreshRequest(String bodyString, IKeyStore keyStor
             //  byte 5-N: IV + encrypted body + GCM AUTH TAG
             bytes = Utils.decodeBase64String(bodyString);
         }
-        catch (IllegalArgumentException ex) {
+        catch (IllegalArgumentException e) {
             return new V2Request("Invalid body: Body is not valid base64.");
         }
 
@@ -131,8 +131,8 @@ public static V2Request parseRefreshRequest(String bodyString, IKeyStore keyStor
         byte[] decrypted;
         try {
             decrypted = AesGcm.decrypt(bytes, 5, key);
-        } catch (Exception ex) {
-            LOGGER.error("Invalid data: Check encryption method and encryption key", ex);
+        } catch (Exception e) {
+            LOGGER.error("Invalid data: Check encryption method and encryption key", e);
             return new V2Request("Invalid data: Check encryption method and encryption key");
         }
 
@@ -142,8 +142,8 @@ public static V2Request parseRefreshRequest(String bodyString, IKeyStore keyStor
             String refreshToken = tokenJson.getString("refresh_token");
 
             return new V2Request(null, refreshToken, responseKey);
-        } catch (Exception ex) {
-            LOGGER.error("Invalid format: Payload is not valid json or missing required data", ex);
+        } catch (Exception e) {
+            LOGGER.error("Invalid format: Payload is not valid json or missing required data", e);
             return new V2Request("Invalid format: Payload is not valid json or missing required data");
         }
     }
diff --git a/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java b/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java
@@ -172,7 +172,7 @@ public static class IndexUpdateMessage {
         public static IndexUpdateMessage fromJsonString(String str) {
             try {
                 return IndexUpdateMessage.mapper.readValue(str, IndexUpdateMessage.class);
-            } catch (JsonProcessingException ex) {
+            } catch (JsonProcessingException e) {
                 // IndexUpdateMessage is an internal message, any serialization and deserialization exception is logic error
                 // return null here
                 return null;
@@ -182,7 +182,7 @@ public static IndexUpdateMessage fromJsonString(String str) {
         public String toJsonString() {
             try {
                 return IndexUpdateMessage.mapper.writeValueAsString(this);
-            } catch (JsonProcessingException ex) {
+            } catch (JsonProcessingException e) {
                 // IndexUpdateMessage is an internal message, any serialization and deserialization exception is logic error
                 // return null here
                 return null;
diff --git a/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java b/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java
@@ -638,8 +638,8 @@ private void handleOptOutGet(RoutingContext rc) {
                 rc.response().setStatusCode(200)
                         .setChunked(true)
                         .write(String.valueOf(timestamp));
-            } catch (Exception ex) {
-                LOGGER.error("Unexpected error while handling optout get", ex);
+            } catch (Exception e) {
+                LOGGER.error("Unexpected error while handling optout get", e);
                 rc.fail(500);
             }
         } else {
@@ -738,8 +738,8 @@ private void handleIdentityMap(RoutingContext rc) {
                 rc.fail(400);
             }
         }
-        catch (Exception ex) {
-            LOGGER.error("Unexpected error while mapping identity", ex);
+        catch (Exception e) {
+            LOGGER.error("Unexpected error while mapping identity", e);
             rc.fail(500);
         }
     }
@@ -1081,8 +1081,8 @@ private static String getApiContact(RoutingContext rc) {
         try {
             apiContact = (String) rc.data().get(AuthMiddleware.API_CONTACT_PROP);
             apiContact = apiContact == null ? "unknown" : apiContact;
-        } catch (Exception ex) {
-            apiContact = "error: " + ex.getMessage();
+        } catch (Exception e) {
+            apiContact = "error: " + e.getMessage();
         }
 
         return apiContact;
diff --git a/src/main/java/com/uid2/operator/vertx/V2PayloadHandler.java b/src/main/java/com/uid2/operator/vertx/V2PayloadHandler.java
@@ -98,8 +98,8 @@ public void handleTokenGenerate(RoutingContext rc, Handler<RoutingContext> apiHa
 
             writeResponse(rc, request.nonce, respJson, request.encryptionKey);
         }
-        catch (Exception ex){
-            LOGGER.error("Failed to generate token", ex);
+        catch (Exception e){
+            LOGGER.error("Failed to generate token", e);
             ResponseUtil.Error(UIDOperatorVerticle.ResponseStatus.GenericError, 500, rc, "");
         }
     }
@@ -151,8 +151,8 @@ public void handleTokenRefresh(RoutingContext rc, Handler<RoutingContext> apiHan
                         .end(respJson.encode());
             }
         }
-        catch (Exception ex){
-            LOGGER.error("Failed to refresh token", ex);
+        catch (Exception e){
+            LOGGER.error("Failed to refresh token", e);
             ResponseUtil.Error(UIDOperatorVerticle.ResponseStatus.GenericError, 500, rc, "");
         }
     }
@@ -187,8 +187,8 @@ private void handleResponse(RoutingContext rc, V2RequestUtil.V2Request request)
             JsonObject respJson = (JsonObject) rc.data().get("response");
 
             writeResponse(rc, request.nonce, respJson, request.encryptionKey);
-        } catch (Exception ex) {
-            LOGGER.error("Failed to generate response", ex);
+        } catch (Exception e) {
+            LOGGER.error("Failed to generate response", e);
             ResponseUtil.Error(UIDOperatorVerticle.ResponseStatus.GenericError, 500, rc, "");
         }
     }
diff --git a/src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java b/src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java
@@ -294,7 +294,7 @@ private void decodeV2RefreshToken(JsonObject respJson) {
     private JsonObject tryParseResponse(HttpResponse resp) {
         try {
             return resp.bodyAsJsonObject();
-        } catch (Exception ex) {
+        } catch (Exception e) {
             return null;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public RefreshResponse refreshIdentity(RefreshToken token) {`
`116`	`116`	`} else {`
`117`	`117`	`return RefreshResponse.Optout;`
`118`	`118`	`}`
`119`		`- } catch (Exception ex) {`
	`119`	`+ } catch (Exception e) {`
`120`	`120`	`return RefreshResponse.Invalid;`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static V2Request parseRequest(String bodyString, ClientKey ck) {`
`62`	`62`	`// byte 13-end: encrypted payload + GCM AUTH TAG`
`63`	`63`	`bodyBytes = Utils.decodeBase64String(bodyString);`
`64`	`64`	`}`
`65`		`- catch (IllegalArgumentException ex) {`
	`65`	`+ catch (IllegalArgumentException e) {`
`66`	`66`	`return new V2Request("Invalid body: Body is not valid base64.");`
`67`	`67`	`}`
`68`	`68`
`@@ -77,7 +77,7 @@ public static V2Request parseRequest(String bodyString, ClientKey ck) {`
`77`	`77`	`byte[] decryptedBody;`
`78`	`78`	`try {`
`79`	`79`	`decryptedBody = AesGcm.decrypt(bodyBytes, 1, ck.getSecretBytes());`
`80`		`- } catch (Exception ex) {`
	`80`	`+ } catch (Exception e) {`
`81`	`81`	`return new V2Request("Invalid body: Check encryption key (ClientSecret)");`
`82`	`82`	`}`
`83`	`83`
`@@ -98,8 +98,8 @@ public static V2Request parseRequest(String bodyString, ClientKey ck) {`
`98`	`98`	`// Skip 8 bytes timestamp, 8 bytes nonce`
`99`	`99`	`String bodyStr = new String(decryptedBody, 16, decryptedBody.length - 16, StandardCharsets.UTF_8);`
`100`	`100`	`payload = new JsonObject(bodyStr);`
`101`		`- } catch (Exception ex) {`
`102`		`- LOGGER.error("Invalid payload in body: Data is not valid json string.", ex);`
	`101`	`+ } catch (Exception e) {`
	`102`	`+ LOGGER.error("Invalid payload in body: Data is not valid json string.", e);`
`103`	`103`	`return new V2Request("Invalid payload in body: Data is not valid json string.");`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -116,7 +116,7 @@ public static V2Request parseRefreshRequest(String bodyString, IKeyStore keyStor`
`116`	`116`	`// byte 5-N: IV + encrypted body + GCM AUTH TAG`
`117`	`117`	`bytes = Utils.decodeBase64String(bodyString);`
`118`	`118`	`}`
`119`		`- catch (IllegalArgumentException ex) {`
	`119`	`+ catch (IllegalArgumentException e) {`
`120`	`120`	`return new V2Request("Invalid body: Body is not valid base64.");`
`121`	`121`	`}`
`122`	`122`
`@@ -131,8 +131,8 @@ public static V2Request parseRefreshRequest(String bodyString, IKeyStore keyStor`
`131`	`131`	`byte[] decrypted;`
`132`	`132`	`try {`
`133`	`133`	`decrypted = AesGcm.decrypt(bytes, 5, key);`
`134`		`- } catch (Exception ex) {`
`135`		`- LOGGER.error("Invalid data: Check encryption method and encryption key", ex);`
	`134`	`+ } catch (Exception e) {`
	`135`	`+ LOGGER.error("Invalid data: Check encryption method and encryption key", e);`
`136`	`136`	`return new V2Request("Invalid data: Check encryption method and encryption key");`
`137`	`137`	`}`
`138`	`138`
`@@ -142,8 +142,8 @@ public static V2Request parseRefreshRequest(String bodyString, IKeyStore keyStor`
`142`	`142`	`String refreshToken = tokenJson.getString("refresh_token");`
`143`	`143`
`144`	`144`	`return new V2Request(null, refreshToken, responseKey);`
`145`		`- } catch (Exception ex) {`
`146`		`- LOGGER.error("Invalid format: Payload is not valid json or missing required data", ex);`
	`145`	`+ } catch (Exception e) {`
	`146`	`+ LOGGER.error("Invalid format: Payload is not valid json or missing required data", e);`
`147`	`147`	`return new V2Request("Invalid format: Payload is not valid json or missing required data");`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -638,8 +638,8 @@ private void handleOptOutGet(RoutingContext rc) {`
`638`	`638`	`rc.response().setStatusCode(200)`
`639`	`639`	`.setChunked(true)`
`640`	`640`	`.write(String.valueOf(timestamp));`
`641`		`- } catch (Exception ex) {`
`642`		`- LOGGER.error("Unexpected error while handling optout get", ex);`
	`641`	`+ } catch (Exception e) {`
	`642`	`+ LOGGER.error("Unexpected error while handling optout get", e);`
`643`	`643`	`rc.fail(500);`
`644`	`644`	`}`
`645`	`645`	`} else {`
`@@ -738,8 +738,8 @@ private void handleIdentityMap(RoutingContext rc) {`
`738`	`738`	`rc.fail(400);`
`739`	`739`	`}`
`740`	`740`	`}`
`741`		`- catch (Exception ex) {`
`742`		`- LOGGER.error("Unexpected error while mapping identity", ex);`
	`741`	`+ catch (Exception e) {`
	`742`	`+ LOGGER.error("Unexpected error while mapping identity", e);`
`743`	`743`	`rc.fail(500);`
`744`	`744`	`}`
`745`	`745`	`}`
`@@ -1081,8 +1081,8 @@ private static String getApiContact(RoutingContext rc) {`
`1081`	`1081`	`try {`
`1082`	`1082`	`apiContact = (String) rc.data().get(AuthMiddleware.API_CONTACT_PROP);`
`1083`	`1083`	`apiContact = apiContact == null ? "unknown" : apiContact;`
`1084`		`- } catch (Exception ex) {`
`1085`		`- apiContact = "error: " + ex.getMessage();`
	`1084`	`+ } catch (Exception e) {`
	`1085`	`+ apiContact = "error: " + e.getMessage();`
`1086`	`1086`	`}`
`1087`	`1087`
`1088`	`1088`	`return apiContact;`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ public void handleTokenGenerate(RoutingContext rc, Handler<RoutingContext> apiHa`
`98`	`98`
`99`	`99`	`writeResponse(rc, request.nonce, respJson, request.encryptionKey);`
`100`	`100`	`}`
`101`		`- catch (Exception ex){`
`102`		`- LOGGER.error("Failed to generate token", ex);`
	`101`	`+ catch (Exception e){`
	`102`	`+ LOGGER.error("Failed to generate token", e);`
`103`	`103`	`ResponseUtil.Error(UIDOperatorVerticle.ResponseStatus.GenericError, 500, rc, "");`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -151,8 +151,8 @@ public void handleTokenRefresh(RoutingContext rc, Handler<RoutingContext> apiHan`
`151`	`151`	`.end(respJson.encode());`
`152`	`152`	`}`
`153`	`153`	`}`
`154`		`- catch (Exception ex){`
`155`		`- LOGGER.error("Failed to refresh token", ex);`
	`154`	`+ catch (Exception e){`
	`155`	`+ LOGGER.error("Failed to refresh token", e);`
`156`	`156`	`ResponseUtil.Error(UIDOperatorVerticle.ResponseStatus.GenericError, 500, rc, "");`
`157`	`157`	`}`
`158`	`158`	`}`
`@@ -187,8 +187,8 @@ private void handleResponse(RoutingContext rc, V2RequestUtil.V2Request request)`
`187`	`187`	`JsonObject respJson = (JsonObject) rc.data().get("response");`
`188`	`188`
`189`	`189`	`writeResponse(rc, request.nonce, respJson, request.encryptionKey);`
`190`		`- } catch (Exception ex) {`
`191`		`- LOGGER.error("Failed to generate response", ex);`
	`190`	`+ } catch (Exception e) {`
	`191`	`+ LOGGER.error("Failed to generate response", e);`
`192`	`192`	`ResponseUtil.Error(UIDOperatorVerticle.ResponseStatus.GenericError, 500, rc, "");`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ private void decodeV2RefreshToken(JsonObject respJson) {`
`294`	`294`	`private JsonObject tryParseResponse(HttpResponse resp) {`
`295`	`295`	`try {`
`296`	`296`	`return resp.bodyAsJsonObject();`
`297`		`- } catch (Exception ex) {`
	`297`	`+ } catch (Exception e) {`
`298`	`298`	`return null;`
`299`	`299`	`}`
`300`	`300`	`}`