diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java
index 5985697e38c7ed4a7b084141bbdf0b809be8e9da..34c6c5a911f0cfb983ffccf7e901fe14e789c59d 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java
+++ b/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();
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup10Test.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup10Test.java
index 60b7b7f692486725ed0cc28b01f3f0ef9dc32ae4..89133468bad35f80138e857f39e3d5804d68b13d 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup10Test.java
+++ b/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 );
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup20Test.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup20Test.java
index 95981d128a305f563c399450d11dd8faa19b9448..4e7045e66d040954da84d0ba239aa33400985f65 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPServiceGroup20Test.java
+++ b/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);
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java
index dbfd05d44a060bba56847f36cd8d0a79bf9dc8fc..17401d976daf54b0c359f4d1fc9f484633f2980e 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java
+++ b/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 {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java
index 4c2adee5507d094ee37a24a7b289cfbea2d5e506..bff5990d95e0c062a42a8b15ab4b1b95151d2925 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java
index e0ccbeb75c83380eb120584b5cf69d20de68681f..04673eca9a7460c7a9d38e42bbc57e4a7844e10b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java
@@ -1,18 +1,18 @@
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
+}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java
index 7b916df865a8670376016d96858a3afd986174cd..0e2564b95a4b4a71d1f4aee91da3101a7807a25c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java
+++ b/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
+}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java
index 534b297b9627545b40892e2e6794faca312b1378..0b8b583a9466ae04930dd8a623bcb7374b95ee64 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java
index 0f57a0856a5f9d900257edfc3a6e30fca4583a67..dca7b5b36a7252f11aaf4eebbc434fc32d30bf14 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
index ac787cf2c160629f8126601da18e0e5ad2521590..f5a830635e068bab95778e5016895574b05e4757 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
+++ b/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);
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java
index 49370b4fcaddb91e3a3540ea7f0923314fa1eb82..fc840a401209eeb9688d0f6d7f11177c50c8a66c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java
+++ b/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;
}
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java
index 473c4b6d0853fdf7560e347bee60a7191c254563..4dfb67f4c13825c014a15a4fd419b371ffe940df 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java
index e21af5e13f4682de8cb43a88214401067d4098b7..0507e5fbd3282c6a22bfa1068423e8d966f7a3ba 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java
index e6b92cd15655ace2d5b98144720f78a61a2071d8..6772d17ec5838f4e6e965e04507a53a01693cb3a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java
index c0cddbfcd027681e32907aaeb611573264072def..be5ed1676aadb5d5c3fd32280a1c2756852c7c06 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java
index 6a5ffeff0e2713547b49e6e4d68d8d6fffdf6604..7be31c4f90149aa918f49fcb0f319a5148fdffa6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java
index 5f2cdd6168dd06b1dc0de53aa71ce779f02a03d3..36ae72990c0da637fac0ef50030c0e5da4aa6fa0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java
+++ b/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() {
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java
index 7deeeb2855647f3e2f615cebbd97e08bfd1b34c8..f2420c1201f45fb60d7dba3717a470a2a3636b73 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java
+++ b/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;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java
index b6b5cf802200ba5febe7215e0d039dd48f80ea2d..8c17560a1453fbd9059bd4554a284ceac02a7e46 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java
+++ b/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() {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java
index 16ae95532fc67a94c982a74ce5281c9e6e4710ff..0336286a1fa1ad36d5ed22e5ec06143e199070c3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java
+++ b/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() {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java
index e48892502e201aaf80899ea88aee060b6261d4b6..66f0a360b318885b2680be1217ca06761de7d7cd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java
@@ -16,7 +16,7 @@ public class SmpInfoRO implements Serializable {
private String ssoAuthenticationLabel;
private String ssoAuthenticationURI;
private String contextPath;
- private List<String> authTypes = new ArrayList<>();
+ private final List<String> authTypes = new ArrayList<>();
public String getVersion() {
return version;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java
index cdc776e9ae99b9013a5c0e236775df350b1b7fae..3974033ba997c463ce92f4ab6e1f1ef84230e724 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java
@@ -76,11 +76,10 @@ public class ErrorResponseRO {
@Override
public String toString() {
- final StringBuffer sb = new StringBuffer("ErrorResponseRO{");
- sb.append("'businessCode'='").append(businessCode).append('\'');
- sb.append(", 'errorDescription'='").append(errorDescription).append('\'');
- sb.append(", 'errorUniqueId'='").append(errorUniqueId).append('\'');
- sb.append('}');
- return sb.toString();
+ String sb = "ErrorResponseRO{" + "'businessCode'='" + businessCode + '\'' +
+ ", 'errorDescription'='" + errorDescription + '\'' +
+ ", 'errorUniqueId'='" + errorUniqueId + '\'' +
+ '}';
+ return sb;
}
-}
\ No newline at end of file
+}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java
index 6fcf1a38a56073b637fbd81e6568512a654028df..a28a76e90dc30081ec10b427cd7d71972629236c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java
@@ -13,13 +13,11 @@
package eu.europa.ec.edelivery.smp.exceptions;
-import eu.europa.ec.edelivery.smp.exceptions.ErrorBusinessCode;
-
/**
* Created by migueti on 13/01/2017.
*/
public class BadRequestException extends RuntimeException {
- private ErrorBusinessCode errorBusinessCode;
+ private final ErrorBusinessCode errorBusinessCode;
public BadRequestException(ErrorBusinessCode errorBusinessCode, String sMsg) {
super(sMsg);
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java
index 13081b04cfa403539c25e680938e6a4f8fd309dc..f43458a3d68a79d78353d0eab3f29433e9f39c04 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java
@@ -28,5 +28,5 @@ public enum ErrorBusinessCode {
NOT_FOUND,
USER_NOT_FOUND,
INVALID_INPUT_DATA,
- TECHNICAL;
+ TECHNICAL
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java
index fda9563605eada8e8ae87286097d337ad940ce14..264565b0d9a6f1c1af9581f043cce27072abf612 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java
@@ -4,7 +4,7 @@ package eu.europa.ec.edelivery.smp.exceptions;
*
*/
public class SMPRuntimeException extends RuntimeException {
- private ErrorCode errorCode;
+ private final ErrorCode errorCode;
public SMPRuntimeException(ErrorCode errorCode, Object ... args) {
super(errorCode.getMessage(args));
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/AbstractIdentifierFormatter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/AbstractIdentifierFormatter.java
index 3cdb57fadbc95754372fc8ae070498820051f840..ea8b442888c7780f26eb3e2a72bbdce461779967 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/AbstractIdentifierFormatter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/AbstractIdentifierFormatter.java
@@ -259,7 +259,7 @@ public abstract class AbstractIdentifierFormatter<T> {
if (this.formatterTypes == null) {
this.formatterTypes = new ArrayList<>();
}
- this.formatterTypes.addAll(Arrays.asList(formatterTypes));;
+ this.formatterTypes.addAll(Arrays.asList(formatterTypes));
}
public List<FormatterType> getFormatterTypes() {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
index 0fcdc3558951529d82eade5bb82245bbf2c5ee1e..1d5ec305cd936c1b5d223c72a30eb690e22d9845 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
@@ -257,7 +257,7 @@ public class CRLVerifierService implements ICRLVerifierService {
return false;
}
- for (String parameter : Arrays.asList(parameters)) {
+ for (String parameter : parameters) {
if (StringUtils.isBlank(parameter)) {
return false;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
index 8965eaafad938f8d87a83f67037835f3f27a9995..44e3fd4c37f0007d1d4eebca8f86fd7c544b370f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
@@ -35,8 +35,8 @@ public class MailService {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(MailService.class);
- private Configuration freemarkerConfig;
- private JavaMailSenderImpl javaMailSender;
+ private final Configuration freemarkerConfig;
+ private final JavaMailSenderImpl javaMailSender;
public MailService(Configuration freemarkerConfig, JavaMailSenderImpl javaMailSender) {
this.freemarkerConfig = freemarkerConfig;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java
index a64af55725d027271146489f2fb2ded8de5a6235..a60788bfe6ff272fc88afed12ce5a46eb7904c61 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java
@@ -38,14 +38,14 @@ public class UIDomainService extends UIServiceBase<DBDomain, DomainRO> {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(UIDomainService.class);
- private DomainDao domainDao;
- private DomainMemberDao domainMemberDao;
- private ResourceDao resourceDao;
- private ResourceDefDao resourceDefDao;
- private DomainResourceDefDao domainResourceDefDao;
- private ConversionService conversionService;
- private GroupDao groupDao;
- private GroupMemberDao groupMemberDao;
+ private final DomainDao domainDao;
+ private final DomainMemberDao domainMemberDao;
+ private final ResourceDao resourceDao;
+ private final ResourceDefDao resourceDefDao;
+ private final DomainResourceDefDao domainResourceDefDao;
+ private final ConversionService conversionService;
+ private final GroupDao groupDao;
+ private final GroupMemberDao groupMemberDao;
public UIDomainService(ConversionService conversionService,
@@ -102,11 +102,11 @@ public class UIDomainService extends UIServiceBase<DBDomain, DomainRO> {
public void createDomainData(DomainRO data) {
if (StringUtils.isBlank(data.getDomainCode())){
throw new SMPRuntimeException(ErrorCode.INVALID_DOMAIN_DATA, "Domain code must not be empty!");
- };
+ }
if (domainDao.getDomainByCode(data.getDomainCode()).isPresent()){
throw new SMPRuntimeException(ErrorCode.INVALID_DOMAIN_DATA, "Domain with code ["+data.getDomainCode()+"] already exists!");
- };
+ }
DBDomain domain = new DBDomain();
domain.setDomainCode(data.getDomainCode());
domain.setDefaultResourceTypeIdentifier(data.getDefaultResourceTypeIdentifier());
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
index c438fa91b2bceedb8334c30f0334ef9d6561eeec..a0650df4ec237a2ee5e2752d390e6628aaf58505 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
@@ -7,10 +7,8 @@ import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
import eu.europa.ec.edelivery.smp.logging.SMPLogger;
import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
import eu.europa.ec.edelivery.smp.services.ConfigurationService;
-import eu.europa.ec.edelivery.smp.services.ICRLVerifierService;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Service;
@@ -36,8 +34,8 @@ public class UIKeystoreService extends BasicKeystoreService {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(UIKeystoreService.class);
- private ConversionService conversionService;
- private ConfigurationService configurationService;
+ private final ConversionService conversionService;
+ private final ConfigurationService configurationService;
public UIKeystoreService(ConversionService conversionService, ConfigurationService configurationService) {
super(null);
@@ -45,9 +43,9 @@ public class UIKeystoreService extends BasicKeystoreService {
this.configurationService = configurationService;
}
- private Map<String, Key> keystoreKeys = new HashMap<>();
- private Map<String, X509Certificate> keystoreCertificates = new HashMap<>();
- private List<CertificateRO> certificateROList = new ArrayList<>();
+ private final Map<String, Key> keystoreKeys = new HashMap<>();
+ private final Map<String, X509Certificate> keystoreCertificates = new HashMap<>();
+ private final List<CertificateRO> certificateROList = new ArrayList<>();
private KeyManager[] keyManagers;
@@ -71,7 +69,7 @@ public class UIKeystoreService extends BasicKeystoreService {
KeyStore keyStore = loadKeystore(keystoreFile, keystoreSecToken);
if (keyStore == null) {
- LOG.error("Keystore: [{}] is not loaded! Check the keystore and the configuration!",keystoreFile.getAbsolutePath());
+ LOG.error("Keystore: [{}] is not loaded! Check the keystore and the configuration!", keystoreFile.getAbsolutePath());
return;
}
// init key managers for TLS
@@ -263,10 +261,10 @@ public class UIKeystoreService extends BasicKeystoreService {
String keystoreSecToken = configurationService.getKeystoreCredentialToken();
KeyStore keyStore = loadKeystore(configurationService.getKeystoreFile(), keystoreSecToken);
- if (keyStore == null || !keyStore.containsAlias(alias)){
+ if (keyStore == null || !keyStore.containsAlias(alias)) {
return null;
}
- X509Certificate certificate = (X509Certificate)keyStore.getCertificate(alias);
+ X509Certificate certificate = (X509Certificate) keyStore.getCertificate(alias);
keyStore.deleteEntry(alias);
// store keystore
storeKeystore(keyStore);
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
index 2ec17d2b745cb7d66fc575d8c1c09c475b92b622..d58089891f7fe6c18240b300e0536629597f85f9 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
@@ -49,12 +49,12 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(UIUserService.class);
- private UserDao userDao;
+ private final UserDao userDao;
CredentialDao credentialDao;
- private ConfigurationService configurationService;
- private ConversionService conversionService;
+ private final ConfigurationService configurationService;
+ private final ConversionService conversionService;
- private UITruststoreService truststoreService;
+ private final UITruststoreService truststoreService;
public UIUserService(UserDao userDao,
CredentialDao credentialDao,
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java
index cecc91f2b157b1ce8d6f67721689e8d2333293cc..2804ed719a08ba3a3c2565f1eac1941e04f7a12d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java
@@ -120,7 +120,7 @@ public class SmlConnector implements ApplicationContextAware {
} catch (NotFoundFault e) {
return processSMLErrorMessage(e, normalizedParticipantId);
} catch (Exception e) {
- LOG.error(e.getClass().getName() + "" + e.getMessage(), e);
+ LOG.error(e.getClass().getName() + e.getMessage(), e);
throw new SMPRuntimeException(ErrorCode.SML_INTEGRATION_EXCEPTION, e, ExceptionUtils.getRootCauseMessage(e));
}
}
@@ -193,7 +193,7 @@ public class SmlConnector implements ApplicationContextAware {
} catch (BadRequestFault e) {
processSMLErrorMessage(e, domain);
} catch (Exception e) {
- LOG.error(e.getClass().getName() + "" + e.getMessage(), e);
+ LOG.error(e.getClass().getName() + e.getMessage(), e);
throw new SMPRuntimeException(ErrorCode.SML_INTEGRATION_EXCEPTION, e, ExceptionUtils.getRootCauseMessage(e));
}
// if not error is thrown - the registration is done OK.
@@ -256,7 +256,7 @@ public class SmlConnector implements ApplicationContextAware {
} catch (NotFoundFault e) {
return processSMLErrorMessage(e, normalizedParticipantId);
} catch (Exception e) {
- LOG.error(e.getClass().getName() + "" + e.getMessage(), e);
+ LOG.error(e.getClass().getName() + e.getMessage(), e);
throw new SMPRuntimeException(ErrorCode.SML_INTEGRATION_EXCEPTION, e, ExceptionUtils.getRootCauseMessage(e));
}
}
@@ -273,7 +273,7 @@ public class SmlConnector implements ApplicationContextAware {
} catch (NotFoundFault e) {
processSMLErrorMessage(e, domain);
} catch (Exception e) {
- LOG.error(e.getClass().getName() + "" + e.getMessage(), e);
+ LOG.error(e.getClass().getName() + e.getMessage(), e);
throw new SMPRuntimeException(ErrorCode.SML_INTEGRATION_EXCEPTION, e, ExceptionUtils.getRootCauseMessage(e));
}
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java
index 47d7875b44ad45674b2b2851b938a6f9b506d360..8a3c2063a718818acd430dc29916a6fec5208ffc 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java
@@ -31,7 +31,7 @@ public class PropertyUtils {
private static final String REG_EXP_VALUE_SEPARATOR = "\\|";
private static final String REG_EXP_MAP_SEPARATOR = ":";
- private static UrlValidator urlValidator = new UrlValidator(new String[]{"http", "https"}, UrlValidator.ALLOW_LOCAL_URLS);
+ private static final UrlValidator urlValidator = new UrlValidator(new String[]{"http", "https"}, UrlValidator.ALLOW_LOCAL_URLS);
public static Object parseProperty(SMPPropertyEnum prop, String value, File rootFolder) {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java
index 0bc9fb999aa8793ec5a8ac98b109f816216d2fe3..55c05034fe2def18fa114076a72af29705347909 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java
@@ -67,12 +67,12 @@ public class SessionSecurityUtils {
SecurityUtils.Secret secret = getAuthenticationSecret();
if (secret == null) {
// try to convert to long value
- return new Long(id);
+ return Long.valueOf(id);
}
String decVal = SecurityUtils.decryptUrlSafe(secret, id);
int indexOfSeparator = decVal.indexOf('#');
String value = indexOfSeparator > -1 ? decVal.substring(0, indexOfSeparator) : decVal;
- return new Long(value);
+ return Long.valueOf(value);
}
public static Authentication getSessionAuthentication() {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java
index f7229c9131258b1907d1dca4bfba6d79df1e8fc3..f8bde695867dbfa5cd324f5d783a9cab4899fd1f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java
@@ -27,7 +27,6 @@ import org.springframework.web.util.UriComponentsBuilder;
import org.springframework.web.util.UrlPathHelper;
import javax.servlet.http.HttpServletRequest;
-import java.net.URI;
/**
* This class provides tools to generate SMP's URL in responses. The client can use provided URL for another call to the SMP.
@@ -49,7 +48,7 @@ public class SmpUrlBuilder {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(SmpUrlBuilder.class);
- private ConfigurationService configurationService;
+ private final ConfigurationService configurationService;
public SmpUrlBuilder(ConfigurationService configurationService) {
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java
index cb0c29d5d29f76c3f0b3581fa36cae858eacd05c..364c0f81d974d544a3587c466c11ffc4a3ea4702 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java
@@ -56,12 +56,12 @@ public class IdentifierServiceTests {
@Parameterized.Parameter(3)
public String expectedValue;
- private IdentifierService testInstance = new IdentifierService(Mockito.mock(ConfigurationService.class));
+ private final IdentifierService testInstance = new IdentifierService(Mockito.mock(ConfigurationService.class));
@Before
public void init() {
- testInstance.configureDocumentIdentifierFormatter(asList(new String[]{"case-SENSITIVE-scheme-1", "Case-SENSITIVE-Scheme-2"}));
- testInstance.configureParticipantIdentifierFormatter(asList(new String[]{"case-sensitive-scheme-1", "Case-SENSITIVE-Scheme-2"}), false, null);
+ testInstance.configureDocumentIdentifierFormatter(asList("case-SENSITIVE-scheme-1", "Case-SENSITIVE-Scheme-2"));
+ testInstance.configureParticipantIdentifierFormatter(asList("case-sensitive-scheme-1", "Case-SENSITIVE-Scheme-2"), false, null);
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java
index 99909a9f8021a7aada6a0f06d464fd1fe8fdf1b6..9d5fe297846f4d0e6c660f67304f779ce589000d 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java
@@ -414,11 +414,11 @@ public class ConfigurationDAOImplTest extends AbstractBaseDao {
String newTestPassword = UUID.randomUUID().toString();
String newDBTestPassword = newTestPassword;
configurationDao.setPropertyToDatabase(SMPPropertyEnum.KEYSTORE_PASSWORD,
- newDBTestPassword + "", "");
+ newDBTestPassword, "");
configurationDao.setPropertyToDatabase(SMPPropertyEnum.TRUSTSTORE_PASSWORD,
- newDBTestPassword + "", "");
+ newDBTestPassword, "");
configurationDao.setPropertyToDatabase(SMPPropertyEnum.HTTP_PROXY_PASSWORD,
- newDBTestPassword + "", "");
+ newDBTestPassword, "");
configurationDao.reloadPropertiesFromDatabase();
@@ -440,7 +440,7 @@ public class ConfigurationDAOImplTest extends AbstractBaseDao {
assertEquals(newTestPassword, configurationDao.getCachedPropertyValue(SMPPropertyEnum.HTTP_PROXY_PASSWORD));
// test decrypt
- File encryptionKey = (File) configurationDao.getCachedPropertyValue(SMPPropertyEnum.ENCRYPTION_FILENAME);
+ File encryptionKey = configurationDao.getCachedPropertyValue(SMPPropertyEnum.ENCRYPTION_FILENAME);
assertEquals(newTestPassword, configurationDao.decryptString(SMPPropertyEnum.KEYSTORE_PASSWORD, dbKeystorePassword, encryptionKey));
assertEquals(newTestPassword, configurationDao.decryptString(SMPPropertyEnum.TRUSTSTORE_PASSWORD, dbTruststorePassword, encryptionKey));
assertEquals(newTestPassword, configurationDao.decryptString(SMPPropertyEnum.HTTP_PROXY_PASSWORD, dbProxyPassword, encryptionKey));
@@ -485,7 +485,7 @@ public class ConfigurationDAOImplTest extends AbstractBaseDao {
configurationDao.contextRefreshedEvent();
PropertyUpdateListener listener = Mockito.mock(PropertyUpdateListener.class);
- Mockito.doReturn(Arrays.asList(SMP_ALERT_BATCH_SIZE)).when(listener).handledProperties();
+ Mockito.doReturn(Collections.singletonList(SMP_ALERT_BATCH_SIZE)).when(listener).handledProperties();
Mockito.doNothing().when(listener).updateProperties(Mockito.anyMap());
ArgumentCaptor<Map<SMPPropertyEnum, Object>> argCaptor = ArgumentCaptor.forClass(Map.class);
configurationDao.updateListener("testListener", listener);
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java
index 08034e8154805f0b644e042c48e5cd5c15ea40c2..d54bc1eeb2476c1a673166866486d99cc72f4eed 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java
@@ -1,24 +1,19 @@
package eu.europa.ec.edelivery.smp.data.dao;
-import eu.europa.ec.edelivery.smp.data.model.*;
-import eu.europa.ec.edelivery.smp.data.model.doc.DBResource;
+import eu.europa.ec.edelivery.smp.data.model.DBDomain;
import eu.europa.ec.edelivery.smp.exceptions.ErrorCode;
import eu.europa.ec.edelivery.smp.testutil.TestConstants;
import eu.europa.ec.edelivery.smp.testutil.TestDBUtils;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.annotation.Autowired;
-import java.util.Collections;
-import java.util.List;
import java.util.Optional;
import static org.junit.Assert.*;
/**
- * Purpose of class is to test all resource methods with database.
+ * Purpose of class is to test all resource methods with database.
*
* @author Joze Rihtarsic
* @since 4.1
@@ -67,7 +62,7 @@ public class DomainDaoIntegrationTest extends AbstractBaseDao {
public void getTheOnlyDomainNoDomain() {
// execute
- IllegalStateException exception = assertThrows(IllegalStateException.class, ()->testInstance.getTheOnlyDomain());
+ IllegalStateException exception = assertThrows(IllegalStateException.class, () -> testInstance.getTheOnlyDomain());
assertEquals(ErrorCode.NO_DOMAIN.getMessage(), exception.getMessage());
}
@@ -85,7 +80,7 @@ public class DomainDaoIntegrationTest extends AbstractBaseDao {
// test
Optional<DBDomain> res = testInstance.getTheOnlyDomain();
- assertTrue(!res.isPresent());
+ assertFalse(res.isPresent());
}
@Test
@@ -170,7 +165,7 @@ public class DomainDaoIntegrationTest extends AbstractBaseDao {
// set
testUtilsDao.createSubresources();
DBDomain d = testUtilsDao.getD1();
- Long cnt = testInstance.getResourceCountForDomain(d.getId());
+ Long cnt = testInstance.getResourceCountForDomain(d.getId());
assertEquals(1, cnt.intValue());
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java
index 9e772a48a3fc4e9db79521b9d911eac621162611..e45d672e61991a630dfd9c9f81abcf263ba47fe5 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java
@@ -1,9 +1,7 @@
package eu.europa.ec.edelivery.smp.data.dao.utils;
-import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -12,19 +10,17 @@ import org.junit.runner.RunWith;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@RunWith(JUnitParamsRunner.class)
public class SMPSchemaGeneratorTest {
- private static final String DIALECT_ORACLE="org.hibernate.dialect.Oracle10gDialect";
- private static final String DIALECT_MYSQL_INNO5="org.hibernate.dialect.MySQL5InnoDBDialect";
+ private static final String DIALECT_ORACLE = "org.hibernate.dialect.Oracle10gDialect";
+ private static final String DIALECT_MYSQL_INNO5 = "org.hibernate.dialect.MySQL5InnoDBDialect";
- protected static String ENTITY_PACKAGES= "eu.europa.ec.edelivery.smp.data.model,eu.europa.ec.edelivery.smp.data.model.user,eu.europa.ec.edelivery.smp.data.model.doc,eu.europa.ec.edelivery.smp.data.model.ext";
+ protected static String ENTITY_PACKAGES = "eu.europa.ec.edelivery.smp.data.model,eu.europa.ec.edelivery.smp.data.model.user,eu.europa.ec.edelivery.smp.data.model.doc,eu.europa.ec.edelivery.smp.data.model.ext";
private static final Object[] dialectTestCases() {
@@ -55,16 +51,16 @@ public class SMPSchemaGeneratorTest {
File fDrop = new File("target/oracle10g-drop.ddl");
f.delete(); // delete if exists
fDrop.delete(); // delete if exists
- assertTrue(!f.exists());
- assertTrue(!fDrop.exists());
+ assertFalse(f.exists());
+ assertFalse(fDrop.exists());
testInstance.createDDLScript(folder, dialect, lstPackages, version);
assertTrue(f.exists());
- assertTrue(f.length()>0);
+ assertTrue(f.length() > 0);
assertTrue(fDrop.exists());
- assertTrue(fDrop.length()>0);
+ assertTrue(fDrop.length() > 0);
}
@Test
@@ -122,11 +118,12 @@ public class SMPSchemaGeneratorTest {
testInstance.getAllEntityClasses("eu.not.exists");
}
+
@Test
public void getAllEntityClasses() throws ClassNotFoundException {
// given when
- List<Class> result = testInstance.getAllEntityClasses("eu.europa.ec.edelivery.smp.data.model");
+ List<Class> result = testInstance.getAllEntityClasses("eu.europa.ec.edelivery.smp.data.model");
assertEquals(10, result.size());
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java
index 93530708ec640bcdf7ee8ecfdf9cea89166a42d4..70f6ea13f07d5b2fa7bc5c60e48914bbebf1de14 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java
@@ -4,7 +4,6 @@ import eu.europa.ec.edelivery.smp.cron.SMPDynamicCronTrigger;
import eu.europa.ec.edelivery.smp.data.dao.AlertDao;
import eu.europa.ec.edelivery.smp.data.dao.CredentialDao;
import eu.europa.ec.edelivery.smp.data.dao.UserDao;
-import eu.europa.ec.edelivery.smp.data.enums.CredentialType;
import eu.europa.ec.edelivery.smp.data.model.DBAlert;
import eu.europa.ec.edelivery.smp.data.model.user.DBCredential;
import eu.europa.ec.edelivery.smp.data.model.user.DBUser;
@@ -17,7 +16,6 @@ import eu.europa.ec.edelivery.smp.services.mail.prop.CredentialSuspendedProperti
import eu.europa.ec.edelivery.smp.services.mail.prop.CredentialVerificationFailedProperties;
import eu.europa.ec.edelivery.smp.services.mail.prop.CredentialsExpirationProperties;
import eu.europa.ec.edelivery.smp.testutil.TestDBUtils;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
@@ -420,7 +418,7 @@ public class AlertServiceTest {
// test to contain all properties
for (String prop : templateProperties) {
- assertTrue(prop, model.getModel().keySet().contains(prop));
+ assertTrue(prop, model.getModel().containsKey(prop));
}
assertEquals(templateProperties.size(), model.getModel().size());
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java
index 3b3603a8b927f7d47861a77696e61e1da25ced3e..2771ccafe93b992e39b0780ca0cb733f87bc1b0e 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java
@@ -4,11 +4,8 @@ import eu.europa.ec.edelivery.smp.exceptions.ErrorCode;
import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
import eu.europa.ec.smp.spi.PayloadValidatorSpi;
import eu.europa.ec.smp.spi.exceptions.PayloadValidatorSpiException;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
import org.mockito.Mockito;
import org.springframework.util.MimeTypeUtils;
@@ -17,7 +14,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Optional;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
public class PayloadValidatorServiceTest {
@@ -41,9 +39,9 @@ public class PayloadValidatorServiceTest {
@Test
public void validateUploadedContent() throws PayloadValidatorSpiException {
- PayloadValidatorSpi validatorSpi1 = Mockito.mock(PayloadValidatorSpi.class);
- PayloadValidatorSpi validatorSpi2 = Mockito.mock(PayloadValidatorSpi.class);
- PayloadValidatorService testInstance = new PayloadValidatorService(Optional.of(Arrays.asList(validatorSpi1,validatorSpi2)));
+ PayloadValidatorSpi validatorSpi1 = Mockito.mock(PayloadValidatorSpi.class);
+ PayloadValidatorSpi validatorSpi2 = Mockito.mock(PayloadValidatorSpi.class);
+ PayloadValidatorService testInstance = new PayloadValidatorService(Optional.of(Arrays.asList(validatorSpi1, validatorSpi2)));
InputStream inputStream = Mockito.mock(InputStream.class);
String mimeType = MimeTypeUtils.APPLICATION_JSON.getType();
@@ -55,7 +53,7 @@ public class PayloadValidatorServiceTest {
ArgumentCaptor<InputStream> streamCapture2 = ArgumentCaptor.forClass(InputStream.class);
ArgumentCaptor<String> mimeTypeCapture2 = ArgumentCaptor.forClass(String.class);
Mockito.verify(validatorSpi1, Mockito.times(1)).validatePayload(streamCapture1.capture(), mimeTypeCapture1.capture());
- Mockito.verify(validatorSpi2,Mockito.times(1)).validatePayload(streamCapture2.capture(), mimeTypeCapture2.capture());
+ Mockito.verify(validatorSpi2, Mockito.times(1)).validatePayload(streamCapture2.capture(), mimeTypeCapture2.capture());
assertEquals(inputStream, streamCapture1.getValue());
assertEquals(inputStream, streamCapture2.getValue());
@@ -65,12 +63,12 @@ public class PayloadValidatorServiceTest {
@Test
public void validateUploadedContentThrowException() throws PayloadValidatorSpiException {
- PayloadValidatorSpi validatorSpi1 = Mockito.mock(PayloadValidatorSpi.class);
- PayloadValidatorService testInstance = new PayloadValidatorService(Optional.of(Arrays.asList(validatorSpi1)));
+ PayloadValidatorSpi validatorSpi1 = Mockito.mock(PayloadValidatorSpi.class);
+ PayloadValidatorService testInstance = new PayloadValidatorService(Optional.of(Collections.singletonList(validatorSpi1)));
InputStream inputStream = Mockito.mock(InputStream.class);
String mimeType = MimeTypeUtils.APPLICATION_JSON.getType();
PayloadValidatorSpiException spiException = new PayloadValidatorSpiException("TestError");
- Mockito.doThrow(spiException).when(validatorSpi1).validatePayload(Mockito.any(),Mockito.any());
+ Mockito.doThrow(spiException).when(validatorSpi1).validatePayload(Mockito.any(), Mockito.any());
SMPRuntimeException smpRuntimeException =
@@ -81,4 +79,4 @@ public class PayloadValidatorServiceTest {
assertEquals("Invalid request [Upload payload]. Error: Content validation failed!", smpRuntimeException.getMessage());
}
-}
\ No newline at end of file
+}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceNoSMLIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceNoSMLIntegrationTest.java
index 1ab14d9ed973f2316df410c73bad00903d08037f..07a0066585739588ff28e5f297d46b897834586e 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceNoSMLIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceNoSMLIntegrationTest.java
@@ -14,18 +14,16 @@
package eu.europa.ec.edelivery.smp.services;
import eu.europa.ec.edelivery.smp.config.enums.SMPPropertyEnum;
-import eu.europa.ec.edelivery.smp.data.dao.ConfigurationDao;
import eu.europa.ec.edelivery.smp.data.model.DBDomain;
import eu.europa.ec.edelivery.smp.data.model.doc.DBResource;
import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
-import org.junit.*;
-import org.junit.rules.ExpectedException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
-import static eu.europa.ec.edelivery.smp.testutil.TestConstants.*;
-
/**
* Purpose of class is to test ServiceGroupService base methods
*
@@ -46,7 +44,7 @@ public class SMLIntegrationServiceNoSMLIntegrationTest extends AbstractServiceIn
configurationDao.refreshProperties();
- testUtilsDao.clearData();;
+ testUtilsDao.clearData();
testUtilsDao.createResources();
}
@@ -78,7 +76,7 @@ public class SMLIntegrationServiceNoSMLIntegrationTest extends AbstractServiceIn
public void registerParticipant() {
DBDomain testDomain01 = testUtilsDao.getD1();
- DBResource resource = testUtilsDao.getResourceD1G1RD1();
+ DBResource resource = testUtilsDao.getResourceD1G1RD1();
// nothing is expected to be thrown
testInstance.registerParticipant(resource, testDomain01);
}
@@ -87,7 +85,7 @@ public class SMLIntegrationServiceNoSMLIntegrationTest extends AbstractServiceIn
public void unregisterParticipant() {
DBDomain testDomain01 = testUtilsDao.getD1();
- DBResource resource = testUtilsDao.getResourceD1G1RD1();
+ DBResource resource = testUtilsDao.getResourceD1G1RD1();
// nothing is expected to be thrown
testInstance.unregisterParticipant(resource, testDomain01);
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java
index e1f7492c1e19dd826eefdafd7077943de11d9bd5..e1d448a572e53a2b3bdd92641d7bc13a5b764f7a 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java
@@ -21,13 +21,9 @@ import eu.europa.ec.edelivery.smp.config.SmlIntegrationConfiguration;
import eu.europa.ec.edelivery.smp.conversion.IdentifierService;
import eu.europa.ec.edelivery.smp.data.model.DBDomain;
import eu.europa.ec.edelivery.smp.data.model.doc.DBResource;
-import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
import eu.europa.ec.edelivery.smp.sml.SmlConnector;
import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.regex.Pattern;
-import static eu.europa.ec.edelivery.smp.testutil.TestConstants.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
@@ -117,7 +111,7 @@ public class SMLIntegrationServiceTest extends AbstractServiceIntegrationTest {
// when
testInstance.unRegisterDomain(testDomain01);
- assertTrue(!testDomain01.isSmlRegistered());
+ assertFalse(testDomain01.isSmlRegistered());
assertEquals(1, integrationMock.getSmpManagerClientMocks().size());
verify(integrationMock.getSmpManagerClientMocks().get(0)).delete(testDomain01.getSmlSmpId());
Mockito.verifyNoMoreInteractions(integrationMock.getSmpManagerClientMocks().toArray());
@@ -139,90 +133,4 @@ public class SMLIntegrationServiceTest extends AbstractServiceIntegrationTest {
Mockito.verifyNoMoreInteractions(integrationMock.getParticipantManagmentClientMocks().toArray());
}
-/*
- @Test
- public void registerParticipantNullScheme() throws NotFoundFault, UnauthorizedFault, InternalErrorFault, BadRequestFault {
- /* given (init database - check setup)
- * Domain: TEST_DOMAIN_CODE_1
- * Users: USERNAME_1, USER_CERT_2
- * ServiceGroup1: TEST_SG_ID_NO_SCHEME, null
- * - Domain: TEST_DOMAIN_CODE_1
- *
- // when
- testInstance.registerParticipant(TEST_SG_ID_NO_SCHEME, null, TEST_DOMAIN_CODE_1);
-
- //then -- expect on call
- assertEquals(1, integrationMock.getParticipantManagmentClientMocks().size());
- verify(integrationMock.getParticipantManagmentClientMocks().get(0)).create(any());
- Mockito.verifyNoMoreInteractions(integrationMock.getParticipantManagmentClientMocks().toArray());
- }
-
- /**
-
-
- @Test
- public void unRegisterParticipant() throws NotFoundFault, UnauthorizedFault, InternalErrorFault, BadRequestFault {
- /* given (init database - check setup)
- * Domain: TEST_DOMAIN_CODE_1
- * Users: USERNAME_1, USER_CERT_2
- * ServiceGroup1: TEST_SG_ID_1, TEST_SG_SCHEMA_1
- * - Domain: TEST_DOMAIN_CODE_1
- *
- // when
- testInstance.registerParticipant(TEST_SG_ID_1, TEST_SG_SCHEMA_1, TEST_DOMAIN_CODE_1);
-
- //then -- expect on call
- assertEquals(1, integrationMock.getParticipantManagmentClientMocks().size());
- verify(integrationMock.getParticipantManagmentClientMocks().get(0)).create(any());
- Mockito.verifyNoMoreInteractions(integrationMock.getParticipantManagmentClientMocks().toArray());
-
- }
-
- @Test
- public void registerParticipant_NotExists() {
- expectedExeption.expect(SMPRuntimeException.class);
- String notExistsId = TEST_SG_ID_1 + "NotExists";
- expectedExeption.expectMessage("ServiceGroup not found (part. id: '" + TEST_SG_ID_1 + "NotExists', part. sch.: '" + TEST_SG_SCHEMA_1 + "')!");
-
- // when
- testInstance.registerParticipant(notExistsId, TEST_SG_SCHEMA_1, TEST_DOMAIN_CODE_1);
- }
-
- @Test
- public void registerParticipant_NotOnDomain() {
- expectedExeption.expect(SMPRuntimeException.class);
- expectedExeption.expectMessage("Service group not registered for domain (domain: " + TEST_DOMAIN_CODE_2 + ", part. id: '" + TEST_SG_ID_1 + "', part. sch.: '" + TEST_SG_SCHEMA_1 + "')!");
-
- // when
- testInstance.registerParticipant(TEST_SG_ID_1, TEST_SG_SCHEMA_1, TEST_DOMAIN_CODE_2);
- }
-
-*/
- /*
- @Test
- public void registerParticipantToSML() throws NotFoundFault, UnauthorizedFault, InternalErrorFault, BadRequestFault {
- DBDomain testDomain01 = domainDao.getDomainByCode(TEST_DOMAIN_CODE_1).get();
- // when
- testInstance.registerParticipantToSML(TEST_SG_ID_1, TEST_SG_SCHEMA_1, testDomain01);
-
- //then -- expect on call
- assertEquals(1, integrationMock.getParticipantManagmentClientMocks().size());
- verify(integrationMock.getParticipantManagmentClientMocks().get(0)).create(any());
- Mockito.verifyNoMoreInteractions(integrationMock.getParticipantManagmentClientMocks().toArray());
- }
-
- @Test
- public void unregisterParticipantFromSML() throws NotFoundFault, UnauthorizedFault, InternalErrorFault, BadRequestFault {
- DBDomain testDomain01 = domainDao.getDomainByCode(TEST_DOMAIN_CODE_1).get();
- testDomain01.setSmlRegistered(true);
- // when
- testInstance.unregisterParticipantFromSML(TEST_SG_ID_1, TEST_SG_SCHEMA_1, testDomain01);
-
- //then -- expect on call
- assertEquals(1, integrationMock.getParticipantManagmentClientMocks().size());
- verify(integrationMock.getParticipantManagmentClientMocks().get(0)).delete(any());
- Mockito.verifyNoMoreInteractions(integrationMock.getParticipantManagmentClientMocks().toArray());
- }
-
- */
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java
index f99a013b25af1486d60e497e32d52d54aa89dccf..fc8faa41b30f11897baa3601dc0b1b6444a62b76 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java
@@ -112,7 +112,7 @@ public class ResourceResolverServiceTest extends AbstractServiceIntegrationTest
public static ResourceRequest createResourceRequest(DBResource resource) {
- return new ResourceRequest(ResourceAction.READ, null, Arrays.asList(resource.getIdentifierScheme() + "::" + resource.getIdentifierValue()), null);
+ return new ResourceRequest(ResourceAction.READ, null, Collections.singletonList(resource.getIdentifierScheme() + "::" + resource.getIdentifierValue()), null);
}
public static ResourceRequest createResourceRequest(DBSubresource subresource) {
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java
index 92c1a47d3237640d756dd973db5d8e05eb785a98..d155b545731be667c9edc7e5d7c81daf1941313f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java
@@ -225,7 +225,7 @@ public class UIResourceServiceTest extends AbstractJunit5BaseDao {
testUtilsDao.getDomainResourceDefD1R1().getResourceDef().getIdentifier());
ResourceRO result = testInstance.createResourceForGroup(testResource, testUtilsDao.getGroupD1G1().getId(),
testUtilsDao.getD1().getId(), testUtilsDao.getUser1().getId());
- Long resourceId = new Long(result.getResourceId());
+ Long resourceId = Long.valueOf(result.getResourceId());
assertNotNull(resourceDao.find(resourceId));
// when
testInstance.deleteResourceFromGroup(resourceId, testUtilsDao.getGroupD1G1().getId(), testUtilsDao.getD1().getId());
@@ -264,7 +264,7 @@ public class UIResourceServiceTest extends AbstractJunit5BaseDao {
testUtilsDao.getDomainResourceDefD1R1().getResourceDef().getIdentifier());
ResourceRO resourceRO = testInstance.createResourceForGroup(testResource, testUtilsDao.getGroupD1G1().getId(),
testUtilsDao.getD1().getId(), testUtilsDao.getUser1().getId());
- Long resourceId = new Long(resourceRO.getResourceId());
+ Long resourceId = Long.valueOf(resourceRO.getResourceId());
assertNotNull(resourceDao.find(resourceId));
// when
SMPRuntimeException result = assertThrows(SMPRuntimeException.class,
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java
index a92b6e9e3393d9d595cc2cffe92d296a840de14f..551b4f23cb229267938f69c736406e59057b3124 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java
@@ -393,7 +393,7 @@ public class UITruststoreServiceIntegrationTest extends AbstractServiceIntegrati
OffsetDateTime.now().plusYears(1),
Collections.emptyList()
);
- Mockito.doReturn(Arrays.asList("InvalidKeyTest")).when(configurationService).getAllowedCertificateKeyTypes();
+ Mockito.doReturn(Collections.singletonList("InvalidKeyTest")).when(configurationService).getAllowedCertificateKeyTypes();
// add as trusted certificate
testInstance.addCertificate(UUID.randomUUID().toString(), certificate);
@@ -478,7 +478,7 @@ public class UITruststoreServiceIntegrationTest extends AbstractServiceIntegrati
@Test
public void testValidateCertificatePolicyLegacyMatchOk() throws Exception {
String certSubject = "CN=SMP Test,OU=eDelivery,O=DIGITAL,C=BE";
- X509Certificate certificate = X509CertificateTestUtils.createX509CertificateForTest(certSubject, BigInteger.TEN, Arrays.asList(CERTIFICATE_POLICY_QCP_NATURAL));
+ X509Certificate certificate = X509CertificateTestUtils.createX509CertificateForTest(certSubject, BigInteger.TEN, Collections.singletonList(CERTIFICATE_POLICY_QCP_NATURAL));
Mockito.doReturn(Arrays.asList(CERTIFICATE_POLICY_QCP_LEGAL, CERTIFICATE_POLICY_QCP_NATURAL)).when(configurationService).getAllowedCertificatePolicies();
testInstance.validateCertificatePolicyMatchLegacy(certificate);
}
@@ -497,7 +497,7 @@ public class UITruststoreServiceIntegrationTest extends AbstractServiceIntegrati
@Test
public void testValidateCertificatePolicyLegacyMatchMismatch() throws Exception {
String certSubject = "CN=SMP Test,OU=eDelivery,O=DIGITAL,C=BE";
- X509Certificate certificate = X509CertificateTestUtils.createX509CertificateForTest(certSubject, BigInteger.TEN, Arrays.asList(CERTIFICATE_POLICY_QCP_LEGAL_QSCD));
+ X509Certificate certificate = X509CertificateTestUtils.createX509CertificateForTest(certSubject, BigInteger.TEN, Collections.singletonList(CERTIFICATE_POLICY_QCP_LEGAL_QSCD));
Mockito.doReturn(Arrays.asList(CERTIFICATE_POLICY_QCP_LEGAL, CERTIFICATE_POLICY_QCP_NATURAL)).when(configurationService).getAllowedCertificatePolicies();
CertificateException result = assertThrows(CertificateException.class,
@@ -507,7 +507,7 @@ public class UITruststoreServiceIntegrationTest extends AbstractServiceIntegrati
@Test
public void validateCertificateNotUsed() throws CertificateException {
- String certId = "cn=test" + UUID.randomUUID().toString() + ",o=test,c=eu:123456";
+ String certId = "cn=test" + UUID.randomUUID() + ",o=test,c=eu:123456";
CertificateRO certificateRO = new CertificateRO();
certificateRO.setCertificateId(certId);
// when
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
index 9d4c18fbc93f24a0cf5facb02516d9c2c0ac2b62..6e26f1a3aa210d803f082467d6c5a1636b335293 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
@@ -58,7 +58,7 @@ public class UITruststoreServiceTest {
@Test
public void validateCertificateNotUsedOk() throws CertificateException {
- String certId = "cn=test" + UUID.randomUUID().toString() + ",o=test,c=eu:123456";
+ String certId = "cn=test" + UUID.randomUUID() + ",o=test,c=eu:123456";
CertificateRO certificateRO = new CertificateRO();
certificateRO.setCertificateId(certId);
doReturn(Optional.empty()).when(userDao).findUserByCertificateId(ArgumentMatchers.anyString());
@@ -73,7 +73,7 @@ public class UITruststoreServiceTest {
@Test
public void validateCertificateNotUsedIsUsed() {
- String certId = "cn=test" + UUID.randomUUID().toString() + ",o=test,c=eu:123456";
+ String certId = "cn=test" + UUID.randomUUID() + ",o=test,c=eu:123456";
CertificateRO certificateRO = new CertificateRO();
certificateRO.setCertificateId(certId);
doReturn(Optional.of(new DBUser())).when(userDao).findUserByCertificateId(ArgumentMatchers.anyString());
@@ -405,7 +405,7 @@ public class UITruststoreServiceTest {
/**
* This method is not a tests is it done for generating the tests Soapui certificates
*
- * @throws Exception
+ * @throws Exception if an error occurs
*/
@Test
@Disabled
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java
index 42f65a9f4decafb7283156a2b306043bda2b45bb..8b8f46c535cf15810796f859fc68a4a46b3639b0 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java
@@ -403,7 +403,7 @@ public class UIUserServiceIntegrationTest extends AbstractJunit5BaseDao {
credentialRO.setCertificate(certificateRO);
credentialRO = testInstance.storeCertificateCredentialForUser(user.getId(), credentialRO);
// the credential id for the test is not encrypted and we can use "Long parsing".
- CredentialRO result = testInstance.getUserCertificateCredential(user.getId(), new Long(credentialRO.getCredentialId()));
+ CredentialRO result = testInstance.getUserCertificateCredential(user.getId(), Long.valueOf(credentialRO.getCredentialId()));
assertNotNull(result);
assertEquals(credentialRO.getCredentialId(), result.getCredentialId());
@@ -425,7 +425,7 @@ public class UIUserServiceIntegrationTest extends AbstractJunit5BaseDao {
assertEquals(1, result.size());
assertEquals(credentialRO.getDescription(), result.get(0).getDescription());
// the credential id for the test is not encrypted and we can use "Long parsing".
- testInstance.deleteUserCredentials(user.getId(), new Long(result.get(0).getCredentialId()), CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API);
+ testInstance.deleteUserCredentials(user.getId(), Long.valueOf(result.get(0).getCredentialId()), CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API);
result = testInstance.getUserCredentials(user.getId(), CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API);
assertNotNull(result);
@@ -450,7 +450,7 @@ public class UIUserServiceIntegrationTest extends AbstractJunit5BaseDao {
credentialRO2.setCredentialType(CredentialType.ACCESS_TOKEN);
credentialRO2.setDescription("test description 2");
// the credential id for the test is not encrypted and we can use "Long parsing".
- testInstance.updateUserCredentials(user.getId(), new Long(result.get(0).getCredentialId()), CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API, credentialRO2);
+ testInstance.updateUserCredentials(user.getId(), Long.valueOf(result.get(0).getCredentialId()), CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API, credentialRO2);
result = testInstance.getUserCredentials(user.getId(), CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API);
assertNotNull(result);
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java
index cc9582a6e6a2c654f78a02404023386425121616..c4dff31cae72d380460c1b01f67d65c2f97476d7 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java
@@ -6,11 +6,9 @@ import eu.europa.ec.edelivery.smp.data.model.doc.DBResource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
import java.util.Optional;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
/**
* Purpose of class is to test database data. Class is created as a bean so that
@@ -39,15 +37,15 @@ public class DBAssertion {
@Transactional
public void assertServiceGroupExtensionEqual(String partId, String partSchema, byte[] expectedExt) {
byte[] ext = getExtensionForServiceGroup(partId, partSchema);
- assertTrue(Arrays.equals(expectedExt, ext));
+ assertArrayEquals(expectedExt, ext);
}
@Transactional
public byte[] getExtensionForServiceGroup(String partId, String partSchema) {
DBResource sg = serviceGroupDao.findServiceGroup(partId, partSchema).get();
- DBDocumentVersion currentVersion = sg.getDocument()!=null && !sg.getDocument().getDocumentVersions().isEmpty()?
- sg.getDocument().getDocumentVersions().stream().filter(res -> res.getVersion() == sg.getDocument().getCurrentVersion()).findFirst().orElse(null) :null;
- return currentVersion!=null? currentVersion.getContent():null;
+ DBDocumentVersion currentVersion = sg.getDocument() != null && !sg.getDocument().getDocumentVersions().isEmpty() ?
+ sg.getDocument().getDocumentVersions().stream().filter(res -> res.getVersion() == sg.getDocument().getCurrentVersion()).findFirst().orElse(null) : null;
+ return currentVersion != null ? currentVersion.getContent() : null;
}
@Transactional
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java
index 4fe62d0f26c153904f017ebfb1836aeab0c4a8c1..2a4d1ab77246eeecc755a0de51c1c7248c699ed7 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java
@@ -17,5 +17,5 @@ public class MockAlertBeans {
@Primary
public JavaMailSenderImpl getJavaMailSender(){
return javaMailSender;
- };
+ }
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java
index 1d27d6100b0bb0bdab7cfd0e460805df0962f623..aa6839d19563e4b3b5b90d36421eb6ec3ec260b8 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java
@@ -37,6 +37,7 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.security.*;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -122,7 +123,7 @@ public class SignatureUtil {
}
// Check core validation status.
- if (coreValidity == false) {
+ if (!coreValidity) {
printErrorDetails(valContext, signature);
throw new Exception("+++ Signature not valild +++");
} else {
@@ -135,7 +136,7 @@ public class SignatureUtil {
System.err.println("Signature failed core validation");
boolean sv = signature.getSignatureValue().validate(valContext);
System.out.println("signature validation status: " + sv);
- if (sv == false) {
+ if (!sv) {
// Check the validation status of each Reference.
Iterator i1 = signature.getSignedInfo().getReferences().iterator();
for (int j = 0; i1.hasNext(); j++) {
@@ -213,7 +214,7 @@ public class SignatureUtil {
public static String loadDocumentAsString(String docResourcePath) throws IOException {
InputStream inputStream = SignatureUtil.class.getResourceAsStream(docResourcePath);
- return org.apache.commons.io.IOUtils.toString(inputStream, "UTF-8");
+ return org.apache.commons.io.IOUtils.toString(inputStream, StandardCharsets.UTF_8);
}
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java
index b49a633f9d0495024ff506186d881e696223a5a3..c3ea243b3224d73e599659eba3a91906e207205c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java
@@ -20,12 +20,11 @@ import eu.europa.ec.edelivery.smp.data.model.user.DBUser;
import eu.europa.ec.edelivery.smp.data.ui.enums.AlertLevelEnum;
import eu.europa.ec.edelivery.smp.data.ui.enums.AlertStatusEnum;
import eu.europa.ec.edelivery.smp.data.ui.enums.AlertTypeEnum;
-import org.apache.commons.lang3.StringUtils;
import java.time.OffsetDateTime;
import java.util.UUID;
-import static eu.europa.ec.edelivery.smp.testutil.TestConstants.*;
+import static eu.europa.ec.edelivery.smp.testutil.TestConstants.SIMPLE_EXTENSION_XML;
public class TestDBUtils {
@@ -40,10 +39,10 @@ public class TestDBUtils {
}
public static DBGroup createDBGroup(String groupName) {
- return createDBGroup(groupName, VisibilityType.PUBLIC);
+ return createDBGroup(groupName, VisibilityType.PUBLIC);
}
- public static DBGroup createDBGroup(String groupName, VisibilityType visibility){
+ public static DBGroup createDBGroup(String groupName, VisibilityType visibility) {
DBGroup group = new DBGroup();
group.setGroupName(groupName);
group.setGroupDescription(anyString());
@@ -54,7 +53,7 @@ public class TestDBUtils {
public static DBExtension createDBExtension(String identifier) {
DBExtension entity = new DBExtension();
entity.setIdentifier(identifier);
- entity.setImplementationName(identifier+"Name");
+ entity.setImplementationName(identifier + "Name");
entity.setName(anyString());
entity.setDescription(anyString());
entity.setVersion(anyString());
@@ -82,7 +81,7 @@ public class TestDBUtils {
}
public static DBResourceDef createDBResourceDef(String identifier) {
- return createDBResourceDef(identifier, anyString());
+ return createDBResourceDef(identifier, anyString());
}
public static DBAlert createDBAlert(String username) {
@@ -177,7 +176,7 @@ public class TestDBUtils {
public static DBDocumentVersion createDBDocumentVersion(String id, String sch) {
DBDocumentVersion docuVersion = new DBDocumentVersion();
docuVersion.setContent(("<ServiceGroup xmlns=\"http://docs.oasis-open.org/bdxr/ns/SMP/2016/05\">" +
- "<ParticipantIdentifier scheme=\""+sch+"\">"+id+"</ParticipantIdentifier>" +
+ "<ParticipantIdentifier scheme=\"" + sch + "\">" + id + "</ParticipantIdentifier>" +
"<ServiceMetadataReferenceCollection />" +
"</ServiceGroup>").getBytes());
return docuVersion;
@@ -186,8 +185,8 @@ public class TestDBUtils {
public static DBDocumentVersion createDBDocumentVersion(String id, String sch, String docId, String docSch) {
DBDocumentVersion docuVersion = new DBDocumentVersion();
docuVersion.setContent(("<ServiceMetadata xmlns=\"http://docs.oasis-open.org/bdxr/ns/SMP/2016/05\" xmlns:ns2=\"http://www.w3.org/2000/09/xmldsig#\"><ServiceInformation>" +
- "<ParticipantIdentifier scheme=\""+sch+"\">"+id+"</ParticipantIdentifier>" +
- "<DocumentIdentifier scheme=\""+docSch+"\">"+docId+"</DocumentIdentifier>" +
+ "<ParticipantIdentifier scheme=\"" + sch + "\">" + id + "</ParticipantIdentifier>" +
+ "<DocumentIdentifier scheme=\"" + docSch + "\">" + docId + "</DocumentIdentifier>" +
"<ProcessList><Process>" +
"<ProcessIdentifier scheme=\"[test-schema]\">[test-value]</ProcessIdentifier>" +
"<ServiceEndpointList>" +
@@ -211,24 +210,24 @@ public class TestDBUtils {
return createDBCredential(name, "value", CredentialType.USERNAME_PASSWORD, CredentialTargetType.UI);
}
- public static DBCredential createDBCredentialForUser(DBUser user, OffsetDateTime from , OffsetDateTime to, OffsetDateTime lastAlertSent ) {
- DBCredential credential = createDBCredential(user, user.getUsername(), "value", CredentialType.USERNAME_PASSWORD, CredentialTargetType.UI);
+ public static DBCredential createDBCredentialForUser(DBUser user, OffsetDateTime from, OffsetDateTime to, OffsetDateTime lastAlertSent) {
+ DBCredential credential = createDBCredential(user, user.getUsername(), "value", CredentialType.USERNAME_PASSWORD, CredentialTargetType.UI);
credential.setExpireOn(to);
credential.setActiveFrom(from);
credential.setExpireAlertOn(lastAlertSent);
return credential;
}
- public static DBCredential createDBCredentialForUserAccessToken(DBUser user, OffsetDateTime from , OffsetDateTime to, OffsetDateTime lastAlertSent ) {
- DBCredential credential = createDBCredential(user, user.getUsername(), "value", CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API);
+ public static DBCredential createDBCredentialForUserAccessToken(DBUser user, OffsetDateTime from, OffsetDateTime to, OffsetDateTime lastAlertSent) {
+ DBCredential credential = createDBCredential(user, user.getUsername(), "value", CredentialType.ACCESS_TOKEN, CredentialTargetType.REST_API);
credential.setExpireOn(to);
credential.setActiveFrom(from);
credential.setExpireAlertOn(lastAlertSent);
return credential;
}
- public static DBCredential createDBCredentialForUserCertificate(DBUser user, OffsetDateTime from , OffsetDateTime to, OffsetDateTime lastAlertSent ) {
- DBCredential credential = createDBCredential(user, user.getUsername(), "value", CredentialType.CERTIFICATE, CredentialTargetType.REST_API);
+ public static DBCredential createDBCredentialForUserCertificate(DBUser user, OffsetDateTime from, OffsetDateTime to, OffsetDateTime lastAlertSent) {
+ DBCredential credential = createDBCredential(user, user.getUsername(), "value", CredentialType.CERTIFICATE, CredentialTargetType.REST_API);
credential.setExpireAlertOn(lastAlertSent);
if (to != null) {
credential.setExpireOn(to);
@@ -248,8 +247,8 @@ public class TestDBUtils {
dbCredential.setName(name);
dbCredential.setCredentialType(credentialType);
dbCredential.setCredentialTarget(credentialTargetType);
- dbCredential.setActiveFrom(OffsetDateTime.now().minusDays(1l));
- dbCredential.setExpireOn(OffsetDateTime.now().plusDays(2l));
+ dbCredential.setActiveFrom(OffsetDateTime.now().minusDays(1L));
+ dbCredential.setExpireOn(OffsetDateTime.now().plusDays(2L));
dbCredential.setChangedOn(OffsetDateTime.now());
dbCredential.setExpireAlertOn(OffsetDateTime.now());
dbCredential.setSequentialLoginFailureCount(1);
@@ -263,11 +262,11 @@ public class TestDBUtils {
certificate.setValidTo(dbCredential.getExpireOn());
int iSplit = name.lastIndexOf(':');
- if (iSplit>0) {
+ if (iSplit > 0) {
String subject = name.substring(0, iSplit);
certificate.setSubject(subject);
certificate.setIssuer(subject);
- certificate.setSerialNumber(name.substring(iSplit+1));
+ certificate.setSerialNumber(name.substring(iSplit + 1));
} else {
certificate.setSubject(name);
certificate.setIssuer(name);
@@ -286,8 +285,8 @@ public class TestDBUtils {
dbCredential.setName(name);
dbCredential.setCredentialType(credentialType);
dbCredential.setCredentialTarget(credentialTargetType);
- dbCredential.setActiveFrom(OffsetDateTime.now().minusDays(1l));
- dbCredential.setExpireOn(OffsetDateTime.now().plusDays(2l));
+ dbCredential.setActiveFrom(OffsetDateTime.now().minusDays(1L));
+ dbCredential.setExpireOn(OffsetDateTime.now().plusDays(2L));
dbCredential.setChangedOn(OffsetDateTime.now());
dbCredential.setExpireAlertOn(OffsetDateTime.now());
dbCredential.setSequentialLoginFailureCount(1);
@@ -343,7 +342,7 @@ public class TestDBUtils {
public static DBUser createDBUser(String userName, String certId, OffsetDateTime validFrom, OffsetDateTime validTo) {
DBUser dbuser = createDBUserByUsername(userName);
- DBCredential credential = createDBCredential(dbuser, certId,"", CredentialType.CERTIFICATE, CredentialTargetType.REST_API);
+ DBCredential credential = createDBCredential(dbuser, certId, "", CredentialType.CERTIFICATE, CredentialTargetType.REST_API);
credential.setActiveFrom(validFrom);
credential.setExpireOn(validTo);
credential.setCertificate(createDBCertificate(certId, validFrom, validTo));
@@ -351,7 +350,7 @@ public class TestDBUtils {
return dbuser;
}
- public static String anyString(){
+ public static String anyString() {
return UUID.randomUUID().toString();
}
}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java
index 3a0a21a385939ad92080517fe47329ad3e60c188..8ce924398e5ab13306d6b526a31c48cc98f2f9c4 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java
@@ -38,7 +38,7 @@ public class X509CertificateTestUtils {
KeyUsage usage = new KeyUsage(244);
X509Certificate cert = X509CertificateUtils.generateCertificate(serial,
key.getPublic(), subject, OffsetDateTime.now().minusDays(1L),
- OffsetDateTime.now().plusYears(5L), (String) null,
+ OffsetDateTime.now().plusYears(5L), null,
key.getPrivate(), false, -1, usage,
Collections.emptyList(), Collections.emptyList(),
listOfPolicyOIDs);
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java
index c39464956efe1325a23eb5a155324f6758848b69..b6caa945c638e7172bae82e87f831189b30cc869 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java
@@ -63,16 +63,12 @@ public class X509KeySelector extends KeySelector {
}
static boolean algEquals(String algorithmURI, String algorithmName) {
- if ((algorithmName.equalsIgnoreCase("DSA") &&
+ return (algorithmName.equalsIgnoreCase("DSA") &&
algorithmURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1))
|| (algorithmName.equalsIgnoreCase("RSA") &&
algorithmURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1))
|| (algorithmName.equalsIgnoreCase("RSA")
- && algorithmURI.equalsIgnoreCase("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"))) {
-
- return true;
- }
- return false;
+ && algorithmURI.equalsIgnoreCase("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"));
}
public X509Certificate getCertificate() {
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java
index 8a044dbd50e078fd71dc4196789b5e2a14fa89a4..955fc7216dbbdb745a611cf2552a9869cd761e3b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java
@@ -190,10 +190,10 @@ public class PropertyUtilsTest {
Assert.assertEquals(Integer.class, value.getClass());
break;
case LIST_STRING:
- Assert.assertTrue(List.class.isInstance(value));
+ Assert.assertTrue(value instanceof List);
break;
case MAP_STRING:
- Assert.assertTrue(Map.class.isInstance(value));
+ Assert.assertTrue(value instanceof Map);
break;
case PATH:
case FILENAME:
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java
index cae76a369da5eb29ee08f22e1177fbe37d919366..1d3ecfec11486a14f9e9dadf21d759fd596edf20 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java
@@ -30,7 +30,7 @@ public class SMPAuthenticationEventListener implements ApplicationListener<Authe
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(SMPAuthenticationEventListener.class);
- private ConfigurationService configurationService;
+ private final ConfigurationService configurationService;
@Autowired
public SMPAuthenticationEventListener(ConfigurationService configurationService) {
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java
index f8a5fa5290e1cd5ed1d09ea52162e2837f2337c9..0d70c736daba47297eee20429147919bb029bb03 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java
@@ -6,10 +6,12 @@ import org.slf4j.Logger;
import org.springframework.http.HttpMethod;
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
-import org.springframework.web.util.UrlPathHelper;
import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
/**
* URLCsrfMatcher matches the request and validates if request can be ignored for CSRF.
@@ -22,7 +24,7 @@ public class URLCsrfIgnoreMatcher implements RequestMatcher {
private static final Logger LOG = SMPLoggerFactory.getLogger(
URLCsrfIgnoreMatcher.class);
- private List<RegexRequestMatcher> unprotectedMatcherList = new ArrayList<>();
+ private final List<RegexRequestMatcher> unprotectedMatcherList = new ArrayList<>();
public URLCsrfIgnoreMatcher() {
this(null, null);
@@ -40,13 +42,13 @@ public class URLCsrfIgnoreMatcher implements RequestMatcher {
// ignore non ui sites!
String uri = request.getRequestURI();
LOG.debug("Test CSRF for uri [{}]", uri);
- if(!StringUtils.startsWithAny(uri,"/ui/","/smp/ui/")) {
+ if (!StringUtils.startsWithAny(uri, "/ui/", "/smp/ui/")) {
LOG.debug("URL is not part of the UI [{}]", uri);
return false;
}
Optional<RegexRequestMatcher> unprotectedMatcher = unprotectedMatcherList.stream().filter(requestMatcher -> requestMatcher.matches(request)).findFirst();
if (unprotectedMatcher.isPresent()) {
- LOG.debug("Ignore CSRF for: [{}] - [{}] with matcher [{}]!", request.getMethod(), request.getRequestURI(),unprotectedMatcher.get());
+ LOG.debug("Ignore CSRF for: [{}] - [{}] with matcher [{}]!", request.getMethod(), request.getRequestURI(), unprotectedMatcher.get());
}
return !unprotectedMatcher.isPresent();
}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java
index 1a5d96924f14556a316a9d45f545488c86fc4a56..65a41515a813d9ee5ee72804e022c47dc1f0b220 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java
@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
public class SMPCas20ServiceTicketValidator extends Cas20ServiceTicketValidator {
private static final Logger LOG = LoggerFactory.getLogger(Cas20ServiceTicketValidator.class);
- private String urlSuffix;
+ private final String urlSuffix;
public SMPCas20ServiceTicketValidator(String casServerUrl, String urlSuffix) {
super(casServerUrl);
@@ -39,4 +39,4 @@ public class SMPCas20ServiceTicketValidator extends Cas20ServiceTicketValidator
throws TicketValidationException {
LOG.debug("Got CAS response: [{}] and test it with assertion [{}]",response,assertion );
}
-}
\ No newline at end of file
+}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java
index cfbf80d9e20acf667b131e56bc72ff4a234873a8..c9fffefe572f349cda8189cd6ba3869f4457cd59 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java
@@ -144,7 +144,7 @@ public class SMPCasConfigurer {
provider.setTicketValidator(serviceTicketValidator);
provider.setAuthenticationUserDetailsService(smpCasUserService);
//A Key is required so CasAuthenticationProvider can identify tokens it previously authenticated
- provider.setKey(SMP_CAS_KEY + UUID.randomUUID().toString());
+ provider.setKey(SMP_CAS_KEY + UUID.randomUUID());
return provider;
}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java
index 4ad6d334226d6e16913a54aa20f7cc2a19830bbe..84609c7fa016167c6c65f78d23f4ec7dd00082ea 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java
@@ -42,11 +42,9 @@ public class ErrorResponseBuilder {
private String strErrorDescription = "Unexpected technical error occurred.";
private static String getErrorUniqueId() {
- StringBuilder errId = new StringBuilder();
- errId.append(OffsetDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
- .append(":")
- .append(UUID.randomUUID());
- return String.valueOf(errId);
+ return OffsetDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME) +
+ ":" +
+ UUID.randomUUID();
}
public ErrorResponseBuilder() {
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java
index 37a25f35fe3eefb26ea032c586778af36d23ac71..d18befb6918697491d8a836881a42e70985b832d 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java
@@ -11,7 +11,7 @@ import org.springframework.web.server.ResponseStatusException;
* @since 4.2
*/
public class SMPResponseStatusException extends ResponseStatusException {
- private ErrorBusinessCode errorBusinessCode;
+ private final ErrorBusinessCode errorBusinessCode;
public SMPResponseStatusException(ErrorBusinessCode errorBusinessCode, HttpStatus httpStatus, String sMsg) {
super(httpStatus, sMsg);
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java
index 1f92bf85e19591e912f7570238c9f0c66969047e..cef2a978edbe674b597037b7c03b79e6d151bda5 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java
@@ -39,9 +39,9 @@ public class AuthenticationController {
protected SMPAuthorizationService authorizationService;
- private ConfigurationService configurationService;
+ private final ConfigurationService configurationService;
- private CsrfTokenRepository csrfTokenRepository;
+ private final CsrfTokenRepository csrfTokenRepository;
SMPCookieWriter smpCookieWriter;
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java
index 771b43e840213bf6406762cbec7a0c3fc0905ab2..fd4e7861a76fafd763a7ffee90a15fec5f5be775 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java
@@ -3,22 +3,18 @@ package eu.europa.ec.edelivery.smp.auth;
import eu.europa.ec.edelivery.smp.data.ui.auth.SMPAuthority;
import eu.europa.ec.edelivery.smp.services.ConfigurationService;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.core.convert.ConversionService;
import org.springframework.security.core.GrantedAuthority;
-import javax.persistence.EntityManager;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
public class SMPAuthenticationEventListenerTest {
- ConfigurationService configurationService = Mockito.mock(ConfigurationService .class);;
+ ConfigurationService configurationService = Mockito.mock(ConfigurationService.class);
// test instance
SMPAuthenticationEventListener testInstance = new SMPAuthenticationEventListener(configurationService);
@@ -26,7 +22,7 @@ public class SMPAuthenticationEventListenerTest {
@Test
public void getSessionTimeoutForRolesSMPAdmin() {
// Given
- Collection<? extends GrantedAuthority> authorities = Arrays.asList(SMPAuthority.S_AUTHORITY_USER);
+ Collection<? extends GrantedAuthority> authorities = Collections.singletonList(SMPAuthority.S_AUTHORITY_USER);
// when then
assertTimeoutForAuthorities(authorities, false);
}
@@ -34,7 +30,7 @@ public class SMPAuthenticationEventListenerTest {
@Test
public void getSessionTimeoutForRolesSystemAdmin() {
// Given
- Collection<? extends GrantedAuthority> authorities = Arrays.asList(SMPAuthority.S_AUTHORITY_SYSTEM_ADMIN);
+ Collection<? extends GrantedAuthority> authorities = Collections.singletonList(SMPAuthority.S_AUTHORITY_SYSTEM_ADMIN);
// when then
assertTimeoutForAuthorities(authorities, true);
}
@@ -42,7 +38,7 @@ public class SMPAuthenticationEventListenerTest {
@Test
public void getSessionTimeoutForRolesUser() {
// Given
- Collection<? extends GrantedAuthority> authorities = Arrays.asList(SMPAuthority.S_AUTHORITY_USER);
+ Collection<? extends GrantedAuthority> authorities = Collections.singletonList(SMPAuthority.S_AUTHORITY_USER);
// when then
assertTimeoutForAuthorities(authorities, false);
}
@@ -50,7 +46,7 @@ public class SMPAuthenticationEventListenerTest {
@Test
public void getSessionTimeoutForRolesUserAndSystem() {
// Given
- Collection<? extends GrantedAuthority> authorities = Arrays.asList(SMPAuthority.S_AUTHORITY_USER,SMPAuthority.S_AUTHORITY_SYSTEM_ADMIN);
+ Collection<? extends GrantedAuthority> authorities = Arrays.asList(SMPAuthority.S_AUTHORITY_USER, SMPAuthority.S_AUTHORITY_SYSTEM_ADMIN);
// when then
assertTimeoutForAuthorities(authorities, true);
}
@@ -58,12 +54,12 @@ public class SMPAuthenticationEventListenerTest {
@Test
public void getSessionTimeoutForRolesUserAndSMP() {
// Given
- Collection<? extends GrantedAuthority> authorities = Arrays.asList(SMPAuthority.S_AUTHORITY_USER);
+ Collection<? extends GrantedAuthority> authorities = Collections.singletonList(SMPAuthority.S_AUTHORITY_USER);
// when then
assertTimeoutForAuthorities(authorities, false);
}
- public void assertTimeoutForAuthorities(Collection<? extends GrantedAuthority> authorities, boolean isAdmin){
+ public void assertTimeoutForAuthorities(Collection<? extends GrantedAuthority> authorities, boolean isAdmin) {
// Given
int secondsToTimeoutAdmin = 111;
int secondsToTimeoutUser = 555;
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
index 26d550c7afc41c483b5940f07eaa71c7f500adb3..72efa36f1360391b571e3cb0678105dd9619ea8f 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
@@ -22,7 +22,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import java.time.OffsetDateTime;
import java.util.Collections;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -55,7 +54,7 @@ public class SMPAuthorizationServiceTest {
}}, null, Collections.singletonList(SMPAuthority.S_AUTHORITY_USER));
mockSecurityContextSystemAdmin = new SecurityContext() {
- SMPAuthenticationToken smpa = new SMPAuthenticationToken("sg_admin", "test123", sysUserDetails);
+ final SMPAuthenticationToken smpa = new SMPAuthenticationToken("sg_admin", "test123", sysUserDetails);
@Override
public Authentication getAuthentication() {
@@ -67,7 +66,7 @@ public class SMPAuthorizationServiceTest {
}
};
mockSecurityContextSMPAdmin = new SecurityContext() {
- SMPAuthenticationToken smpa = new SMPAuthenticationToken("smp_admin", "test123", smpUserDetails);
+ final SMPAuthenticationToken smpa = new SMPAuthenticationToken("smp_admin", "test123", smpUserDetails);
@Override
public Authentication getAuthentication() {
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java
index 318bec87f8d8bcd65ca94440aae0c3eaf39e79b7..1b7ba9c7f9112a33fd38f66fcdd636ed05a2f767 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java
@@ -8,6 +8,7 @@ import org.springframework.http.HttpMethod;
import javax.servlet.http.HttpServletRequest;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import static java.util.Arrays.asList;
@@ -19,10 +20,10 @@ public class URLCsrfMatcherTest {
@Parameterized.Parameters(name = "{index}: {0}")
public static Collection cookieWriterTestParameters() {
return asList(new Object[][]{
- {"/test/", false, asList("/.*"), null},
- {"/ui/resource", true, asList("/!(ui/).*"), null},
- {"/test/resource", false, asList("^/(?!ui/).*"), null},
- {"/ui/resource", true, asList("^/(?!ui/).*"), null},
+ {"/test/", false, Collections.singletonList("/.*"), null},
+ {"/ui/resource", true, Collections.singletonList("/!(ui/).*"), null},
+ {"/test/resource", false, Collections.singletonList("^/(?!ui/).*"), null},
+ {"/ui/resource", true, Collections.singletonList("^/(?!ui/).*"), null},
});
}
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java
index cc5fdaabfb89361d423510e0c5a1600e09b0bb9f..940ed2dac0949d015e4f84f5018f3212f4037851 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java
@@ -35,7 +35,7 @@ public class SMPCasConfigurerTest {
assertNotNull(serviceProperties);
assertEquals(callbackString, serviceProperties.getService());
assertEquals(ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER, serviceProperties.getArtifactParameter());
- assertEquals(true, serviceProperties.isAuthenticateAllArtifacts());
+ assertTrue(serviceProperties.isAuthenticateAllArtifacts());
}
@Test
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java
index 47157baf061208e6300e00c0bfefbda2b2a8a52e..fc40c3c2825b2e8f06dd30a6792e2b4a74d6d6f8 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java
@@ -76,7 +76,7 @@ public class ResourceControllerTest extends AbstractControllerTest {
@Test
public void notFoundIsReturnedWhenServiceGroupDoesNotExist() throws Exception {
- mvc.perform(get(format("/%s::%s", IDENTIFIER_SCHEME, UUID.randomUUID().toString())))
+ mvc.perform(get(format("/%s::%s", IDENTIFIER_SCHEME, UUID.randomUUID())))
.andExpect(status().isNotFound());
}
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationClientCertTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationClientCertTest.java
index 679486811fd59ac61f3e925e375c6366f0955ccf..9d75fbd2b3499d1b9ae55efd2e64a21e98d5c243 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationClientCertTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationClientCertTest.java
@@ -61,8 +61,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
public class SecurityConfigurationClientCertTest {
//Jul++9+23:59:00+2019+GMT"
- private static DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("MMM dd HH:mm:ss yyyy 'GMT'");
- private static String CLIENT_CERT_FORMAT = "sno=%s" +
+ private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("MMM dd HH:mm:ss yyyy 'GMT'");
+ private static final String CLIENT_CERT_FORMAT = "sno=%s" +
"&subject=%s" +
"&validfrom=%s" +
"&validto=%s" +
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java
index 898cf39ec65a723f7336705e993d9272a6fc1a52..0b8d67c7da52671b23a16f257ee38dade5e080fb 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java
@@ -38,6 +38,7 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.security.*;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -125,7 +126,7 @@ public class SignatureUtil {
}
// Check core validation status.
- if (coreValidity == false) {
+ if (!coreValidity) {
printErrorDetails(valContext, signature);
throw new Exception("+++ Signature not valild +++");
} else {
@@ -138,7 +139,7 @@ public class SignatureUtil {
System.err.println("Signature failed core validation");
boolean sv = signature.getSignatureValue().validate(valContext);
System.out.println("signature validation status: " + sv);
- if (sv == false) {
+ if (!sv) {
// Check the validation status of each Reference.
Iterator i1 = signature.getSignedInfo().getReferences().iterator();
for (int j = 0; i1.hasNext(); j++) {
@@ -241,6 +242,6 @@ public class SignatureUtil {
public static String loadDocumentAsString(String docResourcePath) throws IOException {
InputStream inputStream = SignatureUtil.class.getResourceAsStream(docResourcePath);
- return org.apache.commons.io.IOUtils.toString(inputStream, "UTF-8");
+ return org.apache.commons.io.IOUtils.toString(inputStream, StandardCharsets.UTF_8);
}
}
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java
index c145371624000b1c790a650832007c4208fe7847..fa2449e8f578728f7f0e9eaba9f2fa3acf17b348 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java
@@ -63,16 +63,12 @@ public class X509KeySelector extends KeySelector {
}
static boolean algEquals(String algorithmURI, String algorithmName) {
- if ((algorithmName.equalsIgnoreCase("DSA") &&
+ return (algorithmName.equalsIgnoreCase("DSA") &&
algorithmURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1))
|| (algorithmName.equalsIgnoreCase("RSA") &&
algorithmURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1))
|| (algorithmName.equalsIgnoreCase("RSA")
- && algorithmURI.equalsIgnoreCase("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"))) {
-
- return true;
- }
- return false;
+ && algorithmURI.equalsIgnoreCase("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"));
}
public X509Certificate getCertificate() {
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java
index 5bfc52c0081c6ee3e3ae0b9ed9de30fa7a27df12..7c5e400a440dd73502fdae7110060a00b90083c6 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java
@@ -158,7 +158,7 @@ public class ApplicationResourceIT {
assertNotNull(res);
assertEquals("Participant scheme must start with:urn:oasis:names:tc:ebcore:partyid-type:(iso6523:|unregistered:) OR must be up to 25 characters long with form [domain]-[identifierArea]-[identifierType] (ex.: 'busdox-actorid-upis') and may only contain the following characters: [a-z0-9].", res.getParticipantSchemaRegExpMessage());
assertEquals("^$|^(?!^.{26})([a-z0-9]+-[a-z0-9]+-[a-z0-9]+)$|^urn:oasis:names:tc:ebcore:partyid-type:(iso6523|unregistered)(:.+)?$", res.getParticipantSchemaRegExp());
- assertEquals(SMPPropertyEnum.PARTC_EBCOREPARTYID_CONCATENATE.getDefValue(), res.isConcatEBCorePartyId() + "");
+ assertEquals(SMPPropertyEnum.PARTC_EBCOREPARTYID_CONCATENATE.getDefValue(), String.valueOf(res.isConcatEBCorePartyId()));
assertFalse(res.isSmlIntegrationOn());
}
}