Fixes based on static analysis (#765)

nashtech-garage · May 7, 2024 · 06c843b · 06c843b
1 parent 480ca90
commit 06c843b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/customer/src/main/java/com/yas/customer/service/UserAddressService.java b/customer/src/main/java/com/yas/customer/service/UserAddressService.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -107,7 +108,7 @@ public void chooseDefaultAddress(Long id) {
         List<UserAddress> userAddressList = userAddressRepository.findAllByUserId(userId);
         List<UserAddress> newUserAddressList = new ArrayList<>();
         for (UserAddress userAddress : userAddressList) {
-            if (userAddress.getAddressId() == id) {
+            if (Objects.equals(userAddress.getAddressId(), id)) {
                 userAddress.setIsActive(true);
             } else {
                 userAddress.setIsActive(false);

diff --git a/product/src/main/java/com/yas/product/service/ProductService.java b/product/src/main/java/com/yas/product/service/ProductService.java
@@ -841,10 +841,9 @@ public void updateProductQuantity(List<ProductQuantityPostVm> productQuantityPos
         List<Long> productIds = productQuantityPostVms.stream().map(ProductQuantityPostVm::productId).toList();
         List<Product> products = productRepository.findAllByIdIn(productIds);
         products.parallelStream().forEach(product -> {
-            ProductQuantityPostVm productQuantityPostVm = productQuantityPostVms.parallelStream()
-                    .filter(productPostVm -> product.getId().equals(productPostVm.productId())).findFirst().get();
-
-            product.setStockQuantity(productQuantityPostVm.stockQuantity());
+            Optional<ProductQuantityPostVm> productQuantityPostVmOptional = productQuantityPostVms.parallelStream()
+                    .filter(productPostVm -> product.getId().equals(productPostVm.productId())).findFirst();
+            productQuantityPostVmOptional.ifPresent(productQuantityPostVm -> product.setStockQuantity(productQuantityPostVm.stockQuantity()));
         });
 
         productRepository.saveAll(products);

diff --git a/tax/src/main/java/com/yas/tax/service/TaxRateService.java b/tax/src/main/java/com/yas/tax/service/TaxRateService.java
@@ -1,6 +1,5 @@
 package com.yas.tax.service;
 
-import com.yas.tax.exception.DuplicatedException;
 import com.yas.tax.exception.NotFoundException;
 import com.yas.tax.model.TaxRate;
 import com.yas.tax.repository.TaxClassRepository;
@@ -135,20 +134,16 @@ public TaxRateListGetVm getPageableTaxRates(int pageNo, int pageSize) {
       //Call location service to get country names and state or province name by list of state or province ids
       List<StateOrProvinceAndCountryGetNameVm> stateOrProvinceAndCountryGetNameVms = locationService.getStateOrProvinceAndCountryNames(stateOrProvinceIds);
       taxRates.forEach(taxRate -> {
-        StateOrProvinceAndCountryGetNameVm stateOrProvinceAndCountryGetNameVm = stateOrProvinceAndCountryGetNameVms.stream()
-              .filter(x -> x.stateOrProvinceId().equals(taxRate.getStateOrProvinceId()))
-              .findAny()
-              .orElse(null);
-
-        if(stateOrProvinceAndCountryGetNameVm != null) {
-          taxRateGetDetailVms.add(new TaxRateGetDetailVm(
-                  taxRate.getId(),
-                  taxRate.getRate(),
-                  taxRate.getZipCode(),
-                  taxRate.getTaxClass().getName(),
-                  stateOrProvinceAndCountryGetNameVm.stateOrProvinceName(),
-                  stateOrProvinceAndCountryGetNameVm.countryName()));
-        }
+        stateOrProvinceAndCountryGetNameVms.stream()
+                .filter(x -> x.stateOrProvinceId().equals(taxRate.getStateOrProvinceId()))
+                .findAny().ifPresent(stateOrProvinceAndCountryGetNameVm -> taxRateGetDetailVms.add(new TaxRateGetDetailVm(
+                        taxRate.getId(),
+                        taxRate.getRate(),
+                        taxRate.getZipCode(),
+                        taxRate.getTaxClass().getName(),
+                        stateOrProvinceAndCountryGetNameVm.stateOrProvinceName(),
+                        stateOrProvinceAndCountryGetNameVm.countryName())));
+
       });
     }