Refactor: Clean code

common/src/main/java/org/sitmun/authorization/service/Profile.java

@@ -12,7 +12,6 @@
 import org.sitmun.domain.territory.Territory;
 
 import java.util.List;
-import java.util.Map;
 
 @Getter
 @Setter

common/src/main/java/org/sitmun/domain/application/Application.java

@@ -93,8 +93,7 @@ public class Application {
   /**
    * The JSP viewer to be loaded in this application when it is internal or a link to the
    * external application.
-   *
-   *  TODO Rename this property to "Url" and change the type to URL.
+   * TODO Rename this property to "Url" and change the type to URL.
    */
   @Column(name = "APP_TEMPLATE", length = PersistenceConstants.SHORT_DESCRIPTION)
   private String jspTemplate;

common/src/main/java/org/sitmun/infrastructure/persistence/type/envelope/EnvelopeToStringConverter.java

@@ -58,7 +58,7 @@ public Envelope convertToEntityAttribute(String dbData) {
           .maxY(extractDouble(values[3]))
           .build();
       } catch (Exception e) {
-        log.error('[' + dbData + "] cannot be parsed to Envelope", e);
+        log.error("[{}] cannot be parsed to Envelope", dbData, e);
         return null;
       }
   }

common/src/main/java/org/sitmun/infrastructure/persistence/type/point/PointToStringConverter.java

@@ -54,7 +54,7 @@ public Point convertToEntityAttribute(String dbData) {
           .y(extractDouble(values[1]))
           .build();
       } catch (Exception e) {
-        log.error('[' + dbData + "] cannot be parsed to Point", e);
+        log.error("[{}] cannot be parsed to Point", dbData, e);
         return null;
       }
   }

common/src/main/java/org/sitmun/infrastructure/security/core/userdetails/UserDetailsImplementation.java

@@ -14,7 +14,6 @@
 import java.util.stream.Collectors;
 
 public class UserDetailsImplementation implements UserDetails {
-  private static final long serialVersionUID = 1L;
 
   @Getter
   private final Integer id;

deploy/heroku-dev-lite/src/test/java/org/sitmun/domain/user/UserResourceTest.java

@@ -58,11 +58,6 @@ class UserResourceTest {
   @Autowired
   private MockMvc mockMvc;
   private User organizacionAdmin;
-  private User territory1User;
-  private User territory2User;
-
-  private Territory territory1;
-  private Territory territory2;
 
 
   private Role organizacionAdminRole;
@@ -86,17 +81,17 @@ void init() {
 
       territories = new ArrayList<>();
       users = new ArrayList<>();
-      territory1 = Territory.builder()
-        .name("Territorio 1")
-        .code("")
-        .blocked(false)
-        .build();
-
-      territory2 = Territory.builder()
-        .name("Territorio 2")
-        .code("")
-        .blocked(false)
-        .build();
+    Territory territory1 = Territory.builder()
+      .name("Territorio 1")
+      .code("")
+      .blocked(false)
+      .build();
+
+    Territory territory2 = Territory.builder()
+      .name("Territorio 2")
+      .code("")
+      .blocked(false)
+      .build();
       territories.add(territory1);
       territories.add(territory2);
 
@@ -117,27 +112,27 @@ void init() {
       users.add(organizacionAdmin);
 
       // Territory 1 user
-      territory1User = User.builder()
-        .administrator(false)
-        .blocked(USER_BLOCKED)
-        .firstName(USER_FIRSTNAME)
-        .lastName(USER_LASTNAME)
-        .password(USER_PASSWORD)
-        .username(TERRITORY1_USER_USERNAME)
-        .build();
+    User territory1User = User.builder()
+      .administrator(false)
+      .blocked(USER_BLOCKED)
+      .firstName(USER_FIRSTNAME)
+      .lastName(USER_LASTNAME)
+      .password(USER_PASSWORD)
+      .username(TERRITORY1_USER_USERNAME)
+      .build();
 
       territory1User = userRepository.save(territory1User);
       users.add(territory1User);
 
       // Territory 2 user
-      territory2User = User.builder()
-        .administrator(false)
-        .blocked(USER_BLOCKED)
-        .firstName(USER_FIRSTNAME)
-        .lastName(USER_LASTNAME)
-        .password(USER_PASSWORD)
-        .username(TERRITORY2_USER_USERNAME)
-        .build();
+    User territory2User = User.builder()
+      .administrator(false)
+      .blocked(USER_BLOCKED)
+      .firstName(USER_FIRSTNAME)
+      .lastName(USER_LASTNAME)
+      .password(USER_PASSWORD)
+      .username(TERRITORY2_USER_USERNAME)
+      .build();
       territory2User = userRepository.save(territory2User);
       users.add(territory2User);
 

legacy/src/main/java/org/sitmun/domain/task/query/QueryTaskEventHandler.java

@@ -197,8 +197,7 @@ List<QueryParameter> extractParameters(Task task) {
               return r;
             }
           ).filter(Optional::isPresent).map(Optional::get).collect(joining(", "));
-          log.info("For Task " + task.getId() + " (task type = " + task.getType().getId() + ")" +
-            " parameter " + qp.getKey() + " not extracted: " + fail + " param rows not found");
+          log.info("For Task {} (task type = {}) parameter {} not extracted: {} param rows not found", task.getId(), task.getType().getId(), qp.getKey(), fail);
           result = Optional.empty();
         }
         return result;