Merge pull request #331 from congyuluo/identifier_refactorings

Refactored Identifiers
Sunagatov · Jul 1, 2024 · 2686670 · 2686670
2 parents 4411ff1 + b06e8ac
commit 2686670
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/zufar/icedlatte/order/entity/Order.java b/src/main/java/com/zufar/icedlatte/order/entity/Order.java
@@ -83,8 +83,8 @@ public boolean equals(Object object) {
             return true;
         if (object == null || getClass() != object.getClass())
             return false;
-        var that = (Order) object;
-        return Objects.equals(id, that.id);
+        var order = (Order) object;
+        return Objects.equals(id, order.id);
     }
 
     @Override

diff --git a/src/main/java/com/zufar/icedlatte/order/entity/OrderItem.java b/src/main/java/com/zufar/icedlatte/order/entity/OrderItem.java
@@ -51,11 +51,11 @@ public boolean equals(Object object) {
         if (object == null || getClass() != object.getClass())
             return false;
 
-        var that = (OrderItem) object;
+        var otherOrderItem = (OrderItem) object;
 
         return new EqualsBuilder()
-                .append(id, that.id)
-                .append(productInfo, that.productInfo)
+                .append(id, otherOrderItem.id)
+                .append(productInfo, otherOrderItem.productInfo)
                 .isEquals();
     }
 

diff --git a/src/main/java/com/zufar/icedlatte/security/api/ResetLoginAttemptsService.java b/src/main/java/com/zufar/icedlatte/security/api/ResetLoginAttemptsService.java
@@ -23,9 +23,9 @@ public void reset(final String userEmail) {
         userAccountLocker.unlockUserAccount(userEmail);
 
         loginAttemptRepository.findByUserEmail(userEmail)
-                .ifPresent(loginAttempt -> {
+                .ifPresent(existingLoginAttempt -> {
                     LoginAttemptEntity newLoginAttempt = loginAttemptFactory.createInitialFailedLoggedAttemptEntity(userEmail);
-                    newLoginAttempt.setId(loginAttempt.getId());
+                    newLoginAttempt.setId(existingLoginAttempt.getId());
 
                     loginAttemptRepository.save(newLoginAttempt);
                     log.info("Login attempts reset for user {}.", userEmail);