EDELIVERY-1893 Minor refactoring

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

@@ -50,6 +50,7 @@ public class DBServiceGroup implements BaseEntity {
     }
 
     @EmbeddedId
+    @Override
     public DBServiceGroupId getId() {
         return serviceGroupId;
     }

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/smlintegration/SmlClientFactoryMultipleDomainsTest.java → smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/smlintegration/SmlClientFactoryAuthenticationByClientCertFromKeystoreTest.java

@@ -47,14 +47,14 @@ import static org.junit.Assert.assertTrue;
  */
 @RunWith(SpringRunner.class)
 @ContextConfiguration
-public class SmlClientFactoryMultipleDomainsTest {
+public class SmlClientFactoryAuthenticationByClientCertFromKeystoreTest {
 
     @Configuration
     @ComponentScan("eu.europa.ec.edelivery.smp.sml")
     static class Config {
         @Bean
         public PropertySourcesPlaceholderConfigurer setLocalProperties() {
-            String clientCertificatesKeystorePath = Thread.currentThread().getContextClassLoader().getResource("service_integration_signatures_multiple_domains.jks").getFile();
+            String clientCertificatesKeystorePath = Thread.currentThread().getContextClassLoader().getResource("sml_integration_client_certificates.jks").getFile();
             return buildLocalProperties(new String[][]{
                     {"bdmsl.integration.url", "https://sml.url.pl"},
                     {"bdmsl.integration.keystore.path", clientCertificatesKeystorePath},
@@ -93,7 +93,7 @@ public class SmlClientFactoryMultipleDomainsTest {
         assertEquals("CN=SMP Mock Services, OU=DIGIT, O=European Commision, C=BE", clientCert.getSubjectDN().getName());
     }
 
-    private static X509Certificate getClientCertFromKeystore(Client cxfClient){
+    private static X509Certificate getClientCertFromKeystore(Client cxfClient) {
         HTTPConduit httpConduit = (HTTPConduit) cxfClient.getConduit();
         TLSClientParameters tlsParams = httpConduit.getTlsClientParameters();
         String alias = tlsParams.getCertAlias();
@@ -104,6 +104,18 @@ public class SmlClientFactoryMultipleDomainsTest {
         return ((X509KeyManager) keyManager).getCertificateChain(alias)[0];
     }
 
+    @Test
+    public void factoryProducesPreconfiguredCxfClientWithoutAnyHttpHeaderValue() {
+        //when
+        IManageParticipantIdentifierWS client = smlClientFactory.create("second_domain_alias", null);
+
+        //then
+        Client cxfClient = ClientProxy.getClient(client);
+        Map<String, Object> requestContext = cxfClient.getRequestContext();
+        Map httpHeaders = (Map) requestContext.get(Message.PROTOCOL_HEADERS);
+        assertTrue(httpHeaders == null || httpHeaders.isEmpty());
+    }
+
     @Test(expected = IllegalStateException.class)
     public void factoryDoesNotAcceptBothAuthentication() {
         smlClientFactory.create("any_domain_alias", "any_header_value");

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/smlintegration/SmlClientFactorySingleDomainTest.java → smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/smlintegration/SmlClientFactoryAuthenticationByClientCertHttpHeaderTest.java

@@ -40,7 +40,9 @@ import static org.junit.Assert.assertNotNull;
  */
 @RunWith(SpringRunner.class)
 @ContextConfiguration
-public class SmlClientFactorySingleDomainTest {
+public class SmlClientFactoryAuthenticationByClientCertHttpHeaderTest {
+
+    public static final String CLIENT_CERT_HTTP_HEADER = "value_of_ClientCert_HTTP_header";
 
     @Configuration
     @ComponentScan("eu.europa.ec.edelivery.smp.sml")
@@ -59,7 +61,7 @@ public class SmlClientFactorySingleDomainTest {
     @Test
     public void factoryProducesPreconfiguredCxfClientThatAuthenticatesItselfWithGivenHttpHeader() {
         //when
-        IManageParticipantIdentifierWS client = smlClientFactory.create(null, "value_of_ClientCert_HTTP_header");
+        IManageParticipantIdentifierWS client = smlClientFactory.create(null, CLIENT_CERT_HTTP_HEADER);
 
         //then
         assertNotNull(client);
@@ -68,8 +70,8 @@ public class SmlClientFactorySingleDomainTest {
         Map httpHeaders = (Map) requestContext.get(Message.PROTOCOL_HEADERS);
         List clientCerts = (List) httpHeaders.get("Client-Cert");
         assertEquals(1, clientCerts.size());
-        assertEquals("value_of_ClientCert_HTTP_header", clientCerts.get(0));
+        assertEquals(CLIENT_CERT_HTTP_HEADER, clientCerts.get(0));
         assertEquals("https://sml.url.pl", requestContext.get(Message.ENDPOINT_ADDRESS));
     }
-    
+
 }