Merge branch 'develop' into 'feature/patreg-192bis'

# Conflicts:
#   pom.xml

.gitlab-ci.yml

@@ -41,5 +41,5 @@ release/code:
   extends:
     - .releaseCodeForJava
   variables:
-    P_MAVEN_IMAGE_TAG: "3.6.3"
+    P_MAVEN_IMAGE_TAG: "wildfly-3.6.3-18.0.1.Final"
 

pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.ihe.gazelle</groupId>
 	<artifactId>pixm-connector</artifactId>

src/main/java/net/ihe/gazelle/business/provider/ChPatientResourceProvider.java

@@ -272,7 +272,7 @@ public class ChPatientResourceProvider implements IResourceProvider {
      */
     private List<String> createTargetSystemListFromParam(StringAndListParam targetSystemParam) {
         if (targetSystemParam == null) {
-            throw new InvalidRequestException(INVALID_REQUEST_TARGET_DOMAIN_CAN_NOT_BE_EMPTY);
+            throw new ForbiddenOperationException(TARGET_SYSTEM_NOT_FOUND);
         }
         List<String> targetSystemList = new ArrayList<>();
         for (StringOrListParam listParam : targetSystemParam.getValuesAsQueryTokens()) {
@@ -291,6 +291,9 @@ public class ChPatientResourceProvider implements IResourceProvider {
                 targetSystemList.add(singleParamValue);
             }
         }
+        if (targetSystemList.size()>2){
+            throw new ForbiddenOperationException(TARGET_SYSTEM_NOT_FOUND);
+        }
         return targetSystemList;
     }