Merge pull request #94 in EDELIVERY/smp from...

Merge pull request #94 in EDELIVERY/smp from EDELIVERY-1856_PUT_ServiceGroup_validation to development

* commit '8eb57a8d35e43b6691fedef047c3dd94d5305d3c':
  EDELIVERY-1856 Added ServiceGroup references validation

smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidator.java

@@ -17,6 +17,7 @@ import eu.europa.ec.edelivery.smp.error.exceptions.BadRequestException;
 import eu.europa.ec.smp.api.Identifiers;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ParticipantIdentifierType;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceGroup;
+import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceMetadataReferenceCollectionType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -24,6 +25,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import static eu.europa.ec.edelivery.smp.error.ErrorBusinessCode.WRONG_FIELD;
+import static org.springframework.util.CollectionUtils.isEmpty;
 
 
 /**
@@ -55,6 +57,11 @@ public class ServiceGroupValidator {
         if (!schemaPattern.matcher(scheme).matches()) {
             throw new BadRequestException(WRONG_FIELD, "Service Group scheme does not match allowed pattern: " + schemaPattern.pattern());
         }
+
+        ServiceMetadataReferenceCollectionType references = serviceGroup.getServiceMetadataReferenceCollection();
+        if (references != null && !isEmpty(references.getServiceMetadataReferences())) {
+            throw new BadRequestException(WRONG_FIELD, "ServiceMetadataReferenceCollection must be empty");
+        }
     }
 
 }

smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidatorTest.java

@@ -18,8 +18,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ParticipantIdentifierType;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceGroup;
+import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceMetadataReferenceCollectionType;
+import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceMetadataReferenceType;
 
 import static eu.europa.ec.smp.api.Identifiers.asString;
+import static java.util.Arrays.asList;
 
 /**
  * Created by gutowpa on 02/08/2017.
@@ -68,4 +71,19 @@ public class ServiceGroupValidatorTest {
 
         validator.validate(asString(id), sg);
     }
+
+    @Test(expected = BadRequestException.class)
+    public void testServiceGroupWithReference() throws Throwable {
+        //given
+        ServiceMetadataReferenceType ref = new ServiceMetadataReferenceType("http://poland.pl");
+        ServiceMetadataReferenceCollectionType references = new ServiceMetadataReferenceCollectionType(asList(ref));
+
+        ParticipantIdentifierType id = new ParticipantIdentifierType("urn:poland:ncpb", "correct-scheme-ok");
+        ServiceGroup sg = new ServiceGroup();
+        sg.setServiceMetadataReferenceCollection(references);
+        sg.setParticipantIdentifier(id);
+
+        //when-then
+        validator.validate(asString(id), sg);
+    }
 }