Clean code

smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java

@@ -108,8 +108,6 @@ abstract class AbstractHandlerTest {
         Mockito.doReturn(bios).when(requestData).getResourceInputStream();
         Mockito.doReturn(resourceIdentifier).when(mockSmpIdentifierServiceApi).normalizeResourceIdentifier(Mockito.anyString(), Mockito.anyString());
         getTestInstance().validateResource(requestData);
-
-        System.out.println("Generated resource: " + new String(baos.toByteArray()));
     }
 
     abstract AbstractHandler getTestInstance();

smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup10Test.java

@@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 class OasisSMPServiceGroup10Test {
 
-    OasisSMPServiceGroup10Handler mockOasisSMPServiceGroup10Handler  = Mockito.mock(OasisSMPServiceGroup10Handler.class);;
+    OasisSMPServiceGroup10Handler mockOasisSMPServiceGroup10Handler  = Mockito.mock(OasisSMPServiceGroup10Handler.class);
     OasisSMPServiceMetadata10 mockOasisSMPServiceMetadata10  = Mockito.mock(OasisSMPServiceMetadata10.class);
 
     OasisSMPServiceGroup10 testInstance = new OasisSMPServiceGroup10(mockOasisSMPServiceGroup10Handler,mockOasisSMPServiceMetadata10 );

smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup20Test.java

@@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class OasisSMPServiceGroup20Test {
     OasisSMPServiceGroup20Handler mockOasisSMPServiceGroup20Handler = Mockito.mock(OasisSMPServiceGroup20Handler.class);
-    ;
     OasisSMPServiceMetadata20 mockOasisSMPServiceMetadata20 = Mockito.mock(OasisSMPServiceMetadata20.class);
 
     OasisSMPServiceGroup20 testInstance = new OasisSMPServiceGroup20(mockOasisSMPServiceGroup20Handler, mockOasisSMPServiceMetadata20);

smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java

@@ -33,6 +33,7 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import java.io.*;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -49,7 +50,7 @@ public class XmlTestUtils {
 
     public static String loadDocumentAsString(String docResourcePath) throws IOException, URISyntaxException {
         byte[] value = loadDocumentAsByteArray(docResourcePath);
-        return new String(value, UTF_8);
+        return new String(value, StandardCharsets.UTF_8);
     }
 
     public static Document loadDocument(String docResourcePath) throws ParserConfigurationException, SAXException, IOException {

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java

@@ -23,7 +23,7 @@ public class SMPUserDetails implements UserDetails {
     @Transient
     private final SecurityUtils.Secret sessionSecret;
     private boolean casAuthenticated = false;
-    private List<SMPAuthority> smpAuthorities = new ArrayList<>();
+    private final List<SMPAuthority> smpAuthorities = new ArrayList<>();
 
     public SMPUserDetails(DBUser user, SecurityUtils.Secret sessionSecret, List<SMPAuthority> smpAuthorities) {
         this.user = user;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java

 package eu.europa.ec.edelivery.smp.auth.enums;
 
 /**
- *  Authentication types for application accounts supporting automated application functionalities. The application accounts
- *  are used for SMP web-service integrations.
+ * Authentication types for application accounts supporting automated application functionalities. The application accounts
+ * are used for SMP web-service integrations.
+ * <p>
+ * Supported authentication types
+ * - PASSWORD: the application username/password (Note:automation-user authentication is different than ui-user
+ * password and it can be used only for web-services!).
+ * - CERTIFICATE: certificate authentication username/password.,
  *
- *  Supported authentication types
- *   - PASSWORD: the application username/password (Note:automation-user authentication is different than ui-user
- *               password and it can be used only for web-services!).
- *   - CERTIFICATE: certificate authentication username/password.,
- *
- *  @author Joze Rihtarsic
- *  @since 4.2
+ * @author Joze Rihtarsic
+ * @since 4.2
  */
 public enum SMPAutomationAuthenticationTypes {
     PASSWORD,
-    CERTIFICATE;
-}
\ No newline at end of file
+    CERTIFICATE
+}

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java

@@ -14,5 +14,5 @@ package eu.europa.ec.edelivery.smp.auth.enums;
  */
 public enum SMPUserAuthenticationTypes {
     PASSWORD,
-    SSO;
-}
\ No newline at end of file
+    SSO
+}

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java

@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 @Component
 public class DBExtensionToExtensionROConverter implements Converter<DBExtension, ExtensionRO> {
     private static final SMPLogger LOG = SMPLoggerFactory.getLogger(DBExtensionToExtensionROConverter.class);
-    private ConversionService conversionService;
+    private final ConversionService conversionService;
 
     public DBExtensionToExtensionROConverter( @Lazy ConversionService conversionService) {
         this.conversionService = conversionService;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java

@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 @Component
 public class DBResourceDefToResourceDefinitionROConverter implements Converter<DBResourceDef, ResourceDefinitionRO> {
     private static final SMPLogger LOG = SMPLoggerFactory.getLogger(DBResourceDefToResourceDefinitionROConverter.class);
-    private ConversionService conversionService;
+    private final ConversionService conversionService;
 
     public DBResourceDefToResourceDefinitionROConverter(@Lazy ConversionService conversionService) {
         this.conversionService = conversionService;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java

@@ -221,7 +221,7 @@ public abstract class BaseDao<E extends BaseEntity> {
                 // get return parameter
                 Object searchValue;
                 try {
-                    searchValue = m.invoke(searchParams, new Object[]{});
+                    searchValue = m.invoke(searchParams);
                 } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
                     LOG.error("Error setting retrieveing search parameters", ex);
                     continue;
@@ -241,7 +241,7 @@ public abstract class BaseDao<E extends BaseEntity> {
                     }
                 } else {
                     try {
-                        cls.getMethod("set" + fieldName, new Class[]{m.getReturnType()});
+                        cls.getMethod("set" + fieldName, m.getReturnType());
                     } catch (NoSuchMethodException | SecurityException ex) {
                         // method does not have setter // ignore other methods
                         LOG.error("Field '" + fieldName + "' does not have a setter!", ex);

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java

@@ -167,16 +167,15 @@ public class DBAlert extends BaseEntity {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("DBAlert{");
-        sb.append("id=").append(id);
-        sb.append(", username=").append(username);
-        sb.append(", processedTime=").append(processedTime);
-        sb.append(", alertType=").append(alertType);
-        sb.append(", reportingTime=").append(reportingTime);
-        sb.append(", alertStatus=").append(alertStatus);
-        sb.append(", alertLevel=").append(alertLevel);
-        sb.append(", properties=").append(String.join(",", properties.keySet()));
-        sb.append('}');
-        return sb.toString();
+        String sb = "DBAlert{" + "id=" + id +
+                ", username=" + username +
+                ", processedTime=" + processedTime +
+                ", alertType=" + alertType +
+                ", reportingTime=" + reportingTime +
+                ", alertStatus=" + alertStatus +
+                ", alertLevel=" + alertLevel +
+                ", properties=" + String.join(",", properties.keySet()) +
+                '}';
+        return sb;
     }
 }

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java

@@ -26,7 +26,7 @@ public class AlertRO extends BaseRO {
     private AlertStatusEnum alertStatus;
     private String alertStatusDesc;
     private AlertLevelEnum alertLevel;
-    private Map<String, String> alertDetails = new HashMap<>();
+    private final Map<String, String> alertDetails = new HashMap<>();
 
     public String getSid() {
         return sid;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java

@@ -26,7 +26,7 @@ public class CertificateRO extends BaseRO {
 
     private boolean isContainingKey;
 
-    private List<String> certificatePolicies = new ArrayList<>();
+    private final List<String> certificatePolicies = new ArrayList<>();
     private String invalidReason;
     private OffsetDateTime validFrom;
     private OffsetDateTime validTo;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java

@@ -11,8 +11,8 @@ public class DeleteEntityValidation implements Serializable {
 
     private boolean validOperation;
     private String stringMessage;
-    private List<String> listIds= new ArrayList<>();
-    private List<String> listDeleteNotPermitedIds = new ArrayList<>();
+    private final List<String> listIds= new ArrayList<>();
+    private final List<String> listDeleteNotPermitedIds = new ArrayList<>();
 
     public boolean isValidOperation() {
         return validOperation;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java

@@ -25,8 +25,8 @@ public class DomainRO extends BaseRO {
     private boolean smlRegistered;
     private VisibilityType visibility;
     private String defaultResourceTypeIdentifier;
-    private List<GroupRO> groups = new ArrayList<>();
-    private List<String> resourceDefinitions = new ArrayList<>();
+    private final List<GroupRO> groups = new ArrayList<>();
+    private final List<String> resourceDefinitions = new ArrayList<>();
 
     public String getDomainId() {
         return domainId;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java

@@ -18,7 +18,7 @@ public class ExtensionRO extends BaseRO {
     private String name;
     private String description;
     private String implementationName;
-    private List<ResourceDefinitionRO> resourceDefinitions = new ArrayList<>();
+    private final List<ResourceDefinitionRO> resourceDefinitions = new ArrayList<>();
 
     public String getExtensionId() {
         return extensionId;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java

@@ -17,7 +17,7 @@ public class NavigationTreeNodeRO extends BaseRO {
     private String icon;
     private String tooltip;
     private String routerLink;
-    private List<NavigationTreeNodeRO> children = new ArrayList<>();
+    private final List<NavigationTreeNodeRO> children = new ArrayList<>();
 
     public NavigationTreeNodeRO() {
     }

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java

@@ -19,7 +19,7 @@ public class ResourceDefinitionRO extends BaseRO {
     private String mimeType;
     private String urlSegment;
 
-    private List<SubresourceDefinitionRO> subresourceDefinitions = new ArrayList<>();
+    private final List<SubresourceDefinitionRO> subresourceDefinitions = new ArrayList<>();
 
     public String getResourceId() {
         return resourceId;

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java

@@ -21,7 +21,7 @@ public class ServiceGroupSearchRO extends BaseRO {
     private String resourceDefUrlSegment;
     private String participantIdentifier;
     private String participantScheme;
-    private List<ServiceMetadataRO> lstServiceMetadata = new ArrayList<>();
+    private final List<ServiceMetadataRO> lstServiceMetadata = new ArrayList<>();
 
 
     public Long getId() {

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java

@@ -21,7 +21,7 @@ public class SmpConfigRO implements Serializable {
 
     private String passwordValidationRegExp;
     private String passwordValidationRegExpMessage;
-    private List<String> webServiceAuthTypes = new ArrayList<>();
+    private final List<String> webServiceAuthTypes = new ArrayList<>();
 
 
     public boolean isSmlIntegrationOn() {