add dependency to chhl7v3-validator-jar:1.0.0 + integrate CH:PDQ Query validator

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/GazelleHL7v2Validator/trunk@57809 356b4b1a-1d2b-0410-8bf1-ffa24008f01e

GazelleHL7v2Validator-ejb/pom.xml

@@ -223,6 +223,11 @@
       <artifactId>xcpd-plq-validator-jar</artifactId>
       <version>${xcpd.plq.validation.version}</version>
     </dependency>
+    <dependency>
+      <groupId>net.ihe.gazelle.maven</groupId>
+      <artifactId>chhl7v3-validator-jar</artifactId>
+      <version>${chhl7v3.validator.version}</version>
+    </dependency>
     <!-- sl4j -->
     <dependency>
       <groupId>org.slf4j</groupId>

GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7v3/validator/core/GazelleHL7v3Validator.java

@@ -29,6 +29,7 @@ import net.ihe.gazelle.hl7v3.prpain201306UV02.PRPAIN201306UV02Type;
 import net.ihe.gazelle.hl7v3.prpain201309UV02.PRPAIN201309UV02Type;
 import net.ihe.gazelle.hl7v3.prpain201310UV02.PRPAIN201310UV02Type;
 import net.ihe.gazelle.hl7v3.quqiin000003UV01.QUQIIN000003UV01Type;
+import net.ihe.gazelle.hl7v3.validator.chpdqquery.CHPDQQUERYPackValidator;
 import net.ihe.gazelle.hl7v3.validator.core.acceptacknowledgement.ACCEPTACKNOWLEDGEMENTPackValidator;
 import net.ihe.gazelle.hl7v3.validator.core.iti44common.ITI44COMMONPackValidator;
 import net.ihe.gazelle.hl7v3.validator.core.iti44patientadd.ITI44PATIENTADDPackValidator;
@@ -258,6 +259,13 @@ public class GazelleHL7v3Validator {
                                     "/MCCI_IN000002UV01", module, notifications);
                         }
                         break;
+                    case CH_PDQQUERY:
+                        getConstraintValidatorModulesForCHPDQQuery(modules);
+                        for (ConstraintValidatorModule module : modules) {
+                            PRPAIN201305UV02Type.validateByModule((PRPAIN201305UV02Type) objectToValidate,
+                                    "/PRPAIN201305UV02Type", module, notifications);
+                        }
+                        break;
                     default:
                         break;
                 }
@@ -270,6 +278,11 @@ public class GazelleHL7v3Validator {
         return notifications;
     }
 
+    private void getConstraintValidatorModulesForCHPDQQuery(List<ConstraintValidatorModule> modules) {
+        modules.add(new MCCIMT000100UV01PackValidator());
+        modules.add(new CHPDQQUERYPackValidator());
+    }
+
     private void getConstraintValidatorModulesForXCDPQueryResponse(List<ConstraintValidatorModule> modules) {
         modules.add(new MCCIMT000300UV01PackValidator());
         modules.add(new MFMIMT700711UV01PackValidator());

GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7v3/validator/core/ValidatorType.java

@@ -32,7 +32,8 @@ public enum ValidatorType {
     XCPD_QUERYRESPONSE("[ITI-55] Cross Gateway Patient Discovery Response", "IHE", PRPAIN201306UV02Type.class),
     XCPD_ACK("[ITI-55] Accept Acknowledgement", "IHE", MCCIIN000002UV01Type.class),
 	KSA_KPDQV3QUERY("KPDQ - Patient Demographics Query", "KSA", PRPAIN201305UV02Type.class),
-	KSA_KPDQV3QUERYRESPONSE("KPDQ - Patient Demographics Query Response", "KSA", PRPAIN201306UV02Type.class);
+	KSA_KPDQV3QUERYRESPONSE("KPDQ - Patient Demographics Query Response", "KSA", PRPAIN201306UV02Type.class),
+	CH_PDQQUERY("CH:PDQ - Patient Demographics Query", "CH", PRPAIN201305UV02Type.class);
 	
 	String label;
 	String descriminator;