Merge branch 'development' into EDELIVERY-11049-start_preparing_the_testing_framework_

pom.xml

@@ -121,6 +121,7 @@
         <sonar.coverage.exclusions>
             **/*Entity.java,
             **/*RO.java,
+            **/DB*.java,
             **/*Exception.java,
             **/*Types.java,
             **/*Constants.java,

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

@@ -9,7 +9,7 @@ import org.mockito.Mockito;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 class DomiSMPResourceExampleExtensionTest {

smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExampleTest.java

@@ -10,7 +10,8 @@ import org.mockito.Mockito;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class DomiSMPJsonResourceExampleTest {
 

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-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandler.java

@@ -20,7 +20,6 @@ import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBElement;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;

smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/OasisCPPA3ExtensionTest.java

@@ -7,7 +7,7 @@ import org.mockito.Mockito;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class OasisCPPA3ExtensionTest {
     OasisCppaCppDocument mockOasisCppaCppDocument = Mockito.mock(OasisCppaCppDocument.class);

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

 package eu.europa.ec.smp.spi.def;
 
-import eu.europa.ec.smp.spi.OasisCPPA3Extension;
 import eu.europa.ec.smp.spi.handler.OasisCppa3CppHandler;
 import eu.europa.ec.smp.spi.resource.ResourceHandlerSpi;
 import eu.europa.ec.smp.spi.resource.SubresourceDefinitionSpi;
@@ -11,7 +10,8 @@ import org.mockito.Mockito;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class OasisCppaCppDocumentTest {
 

smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractOasisSMPHandler.java

@@ -2,7 +2,6 @@ package eu.europa.ec.smp.spi.handler;
 
 import eu.europa.ec.smp.spi.api.model.RequestData;
 import eu.europa.ec.smp.spi.api.model.ResourceIdentifier;
-import eu.europa.ec.smp.spi.api.model.ResponseData;
 import eu.europa.ec.smp.spi.exceptions.ResourceException;
 import eu.europa.ec.smp.spi.resource.ResourceHandlerSpi;
 import org.apache.commons.lang3.StringUtils;
@@ -10,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
 
 /**
  * The abstract class with common methods for implementation of the  ResourceHandlerSpi.

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

@@ -4,12 +4,11 @@ import eu.europa.ec.smp.spi.def.OasisSMPServiceGroup10;
 import eu.europa.ec.smp.spi.def.OasisSMPServiceGroup20;
 import eu.europa.ec.smp.spi.resource.ResourceDefinitionSpi;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class OasisSMPExtensionTest {
 

smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ServiceGroupConverterTest.java

@@ -23,7 +23,8 @@ import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 
 /**
  * Created by gutowpa on 11/04/2017.

smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ServiceMetadataConverterTest.java

@@ -30,7 +30,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import java.io.ByteArrayInputStream;
-import java.util.Arrays;
 
 import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.*;

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

@@ -10,11 +10,11 @@ import org.mockito.Mockito;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 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/def/OasisSMPServiceMetadata10Test.java

@@ -7,7 +7,7 @@ import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class OasisSMPServiceMetadata10Test {
 

smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPServiceMetadata20HandlerTest.java

@@ -2,11 +2,9 @@ package eu.europa.ec.smp.spi.handler;
 
 import eu.europa.ec.smp.spi.api.model.ResourceIdentifier;
 import eu.europa.ec.smp.spi.exceptions.ResourceException;
-import eu.europa.ec.smp.spi.validation.ServiceMetadata10Validator;
 import eu.europa.ec.smp.spi.validation.ServiceMetadata20Validator;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import static org.junit.Assert.assertThrows;
 

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/SMPAuthenticationToken.java

 package eu.europa.ec.edelivery.smp.auth;
 
+import eu.europa.ec.edelivery.security.utils.SecurityUtils;
 import eu.europa.ec.edelivery.smp.logging.SMPLogger;
 import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
-import eu.europa.ec.edelivery.security.utils.SecurityUtils;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 

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/UILoginAuthenticationToken.java

 package eu.europa.ec.edelivery.smp.auth;
 
-import eu.europa.ec.edelivery.smp.logging.SMPLogger;
-import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 

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
+}