Removing isEmpty dpendencies

fortify-presales · Jun 18, 2024 · c7e3653 · c7e3653
1 parent 760330b
commit c7e3653
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/microfocus/example/service/ProductService.java b/src/main/java/com/microfocus/example/service/ProductService.java
@@ -257,9 +257,9 @@ public Review saveReviewFromAdminReviewForm(AdminReviewForm adminReviewForm) thr
     public Review newReviewFromNewReviewForm(NewReviewForm newReviewForm) {
         Review rtmp = new Review();
         Optional<User> optionalUser = userRepository.findById(newReviewForm.getUserId());
-        if (optionalUser.isEmpty()) throw new UserNotFoundException("Cannot find user for product review.");
+        if (!optionalUser.isPresent()) throw new UserNotFoundException("Cannot find user for product review.");
         Optional<Product> optionalProduct = productRepository.findById(newReviewForm.getProductId());
-        if (optionalProduct.isEmpty()) throw new ProductNotFoundException("Cannot find product for product review");
+        if (!optionalProduct.isPresent()) throw new ProductNotFoundException("Cannot find product for product review");
         rtmp.setProduct(optionalProduct.get());
         rtmp.setUser(optionalUser.get());
         rtmp.setComment(newReviewForm.getComment());

diff --git a/src/main/java/com/microfocus/example/web/controllers/UserController.java b/src/main/java/com/microfocus/example/web/controllers/UserController.java
@@ -418,7 +418,7 @@ public String editReview(@PathVariable("id") UUID reviewId,
     public String newReview(@RequestParam("pid") Optional<UUID> pid,
                             Model model, Principal principal) {
         UUID productId = (pid.isPresent() ? pid.get() : null);
-        if (pid.isEmpty() || !productService.productExistsById(productId)) {
+        if (!pid.isPresent() || !productService.productExistsById(productId)) {
             model.addAttribute("message", "The product id '" + productId.toString() + "' is invalid!");
             model.addAttribute("alertClass", "alert-danger");
             this.setModelDefaults(model, principal, "product-not-found");