Apply fixes from IDE recommendations (#13)

* Remove unused code * Add minor improvements * Suppress noisy IDE warnings
cmenon12 · Apr 4, 2024 · e1907d2 · e1907d2
1 parent d65b27e
commit e1907d2
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 23 deletions.
diff --git a/src/main/java/com/sportyshoes/controller/ControllerHelper.java b/src/main/java/com/sportyshoes/controller/ControllerHelper.java
diff --git a/src/main/java/com/sportyshoes/controller/ShoppingController.java b/src/main/java/com/sportyshoes/controller/ShoppingController.java
@@ -42,6 +42,7 @@ public String home(Model model) {
     return "shop";
   }
 
+  @SuppressWarnings("OptionalGetWithoutIsPresent")
   @PostMapping(value = "/order")
   public String order(@AuthenticationPrincipal UserDetails userDetails,
       RedirectAttributes redirectAttrs,
@@ -100,7 +101,6 @@ public String order(@AuthenticationPrincipal UserDetails userDetails,
         }
         redirectAttrs.addFlashAttribute("resultDanger", resultDanger.toString());
       }
-      return "redirect:/";
 
     } else {
       // create order
@@ -115,10 +115,11 @@ public String order(@AuthenticationPrincipal UserDetails userDetails,
       } else {
         redirectAttrs.addFlashAttribute("resultDanger", result);
       }
-      return "redirect:/";
     }
+    return "redirect:/";
   }
 
+  @SuppressWarnings("OptionalGetWithoutIsPresent")
   @GetMapping(value = "/orders")
   public String orders(@AuthenticationPrincipal UserDetails userDetails, Model model) {
     List<Order> allOrders = orderService.getAllByUser(userService.get(userDetails)

diff --git a/src/main/java/com/sportyshoes/controller/UserController.java b/src/main/java/com/sportyshoes/controller/UserController.java
@@ -25,7 +25,7 @@ public class UserController {
   @Autowired
   PasswordEncoder passwordEncoder;
 
-  SecurityContextLogoutHandler logoutHandler = new SecurityContextLogoutHandler();
+  final SecurityContextLogoutHandler logoutHandler = new SecurityContextLogoutHandler();
 
   @GetMapping(value = "/login")
   public String login(@AuthenticationPrincipal UserDetails userDetails, Model model) {

diff --git a/src/main/java/com/sportyshoes/repository/ProductCategoryRepository.java b/src/main/java/com/sportyshoes/repository/ProductCategoryRepository.java
@@ -10,6 +10,6 @@
 public interface ProductCategoryRepository extends JpaRepository<ProductCategory, Long> {
 
   @Query("select c from product_category c where c.name = :name")
-  public Optional<ProductCategory> findByName(String name);
+  Optional<ProductCategory> findByName(String name);
 
 }
diff --git a/src/main/java/com/sportyshoes/repository/ProductRepository.java b/src/main/java/com/sportyshoes/repository/ProductRepository.java
@@ -12,6 +12,7 @@
 @Repository
 public interface ProductRepository extends JpaRepository<Product, Long> {
 
+  @SuppressWarnings("NullableProblems")
   @Query("select p from Product p where p.isDeleted = false")
   List<Product> findAll();
 

diff --git a/src/main/java/com/sportyshoes/repository/UserRepository.java b/src/main/java/com/sportyshoes/repository/UserRepository.java
@@ -1,15 +1,10 @@
 package com.sportyshoes.repository;
 
 import com.sportyshoes.entity.User;
-import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface UserRepository extends JpaRepository<User, String> {
 
-  @Query("select u from users u where u.isAdmin = true")
-  List<User> getAdmin();
-
 }
diff --git a/src/main/java/com/sportyshoes/service/UserService.java b/src/main/java/com/sportyshoes/service/UserService.java
@@ -48,15 +48,6 @@ public Optional<User> getByEmail(String email) {
     return userRepository.findById(email);
   }
 
-  public Optional<User> getAdmin() {
-    List<User> admins = userRepository.getAdmin();
-    if (admins.isEmpty()) {
-      return Optional.empty();
-    } else {
-      return Optional.of(admins.get(0));
-    }
-  }
-
   public Optional<User> get(UserDetails userDetails) {
     return getByEmail(userDetails.getUsername());
   }

diff --git a/src/main/resources/templates/admin_product_categories.html b/src/main/resources/templates/admin_product_categories.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head
     th:replace="~{fragments/base :: head('Sporty Shoes Shop - Admin - Product Categories')}"></head>
 <body class="text-bg-light">

diff --git a/src/main/resources/templates/admin_product_categories_edit.html b/src/main/resources/templates/admin_product_categories_edit.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<!--suppress HtmlRequiredTitleElement -->
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
 <head
     th:replace="~{fragments/base :: head('Sporty Shoes Shop - Admin - ' + ${category.getId() != null ? 'Edit' : 'Create'} + ' Product Category')}"></head>

diff --git a/src/main/resources/templates/admin_products.html b/src/main/resources/templates/admin_products.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head th:replace="~{fragments/base :: head('Sporty Shoes Shop - Admin - Products')}"></head>
 <body class="text-bg-light">
 <header th:replace="~{fragments/base :: header('Sporty Shoes Shop - Admin - Products')}"></header>

diff --git a/src/main/resources/templates/admin_products_edit.html b/src/main/resources/templates/admin_products_edit.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
+<!--suppress HtmlUnknownTag -->
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head
     th:replace="~{fragments/base :: head('Sporty Shoes Shop - Admin - ' + ${product.getId() != null ? 'Edit' : 'Create'} + ' Product')}"></head>
 <body class="text-bg-light">
@@ -48,10 +50,12 @@
           <div class="row m-3">
             <div class="col">
               <div class="form-floating">
+                <!--suppress XmlDuplicatedId -->
                 <select th:if="${allCategories.isEmpty()}" class="form-select" id="productCategory"
                         aria-label="Product Category" disabled>
                   <option>No categories available.</option>
                 </select>
+                <!--suppress XmlDuplicatedId -->
                 <select th:unless="${allCategories.isEmpty()}" name="categoryId"
                         class="form-select" id="productCategory" aria-label="Product Category">
                   <option value="none">None</option>

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head th:replace="~{fragments/base :: head('Sporty Shoes Shop - Login')}"></head>
 <body class="text-bg-light">
 <!--/*@thymesVar id="resultDanger" type="java.lang.String"*/-->

diff --git a/src/main/resources/templates/orders.html b/src/main/resources/templates/orders.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head
     th:replace="~{fragments/base :: head('Sporty Shoes Shop - ' + ${showUser != null ? 'Admin - ' : ''} + 'Orders')}"></head>
 <body class="text-bg-light">

diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head th:replace="~{fragments/base :: head('Sporty Shoes Shop - Register')}"></head>
 <body class="text-bg-light">
 

diff --git a/src/main/resources/templates/shop.html b/src/main/resources/templates/shop.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en-GB">
+<!--suppress HtmlRequiredTitleElement -->
 <head th:replace="~{fragments/base :: head('Sporty Shoes Shop')}"></head>
 <body class="text-bg-light">
 <header th:replace="~{fragments/base :: header('Sporty Shoes Shop')}"></header>