Update doc : delete ignoreChoicesPredicates

docs/installation-guide.md

@@ -212,8 +212,7 @@ This section remains to **run** Gazelle Objects Checker and generate the CDA MBV
 we will need the following parameters to run GOC and generate the validator:
 
 
-> Notice: ignoreChoicesPredicates is a new feature to ignore all choices predicates
-> (wasn't in the last version )
+
 <table>
   <thead>
     <th>Parameters</th>

hl7templates/goc-tests/goc-tests-runner/src/main/java/net/ihe/gazelle/goctests/interlay/GenerationConfiguration.java

@@ -14,8 +14,6 @@ public class GenerationConfiguration {
 
     private Boolean ignoreCdaBasicRequirements = Boolean.FALSE;
 
-    private Boolean ignoreChoicesPredicates = Boolean.FALSE;
-
     private String serviceName;
 
     private String versionLabel;
@@ -30,13 +28,12 @@ public class GenerationConfiguration {
     }
 
     public GenerationConfiguration(URL bbrUrl, String outputFolder, String mvn, Boolean ignoreTemplateIdRequirements,
-                                   Boolean ignoreCdaBasicRequirements, Boolean ignoreChoicesPredicates, String serviceName, String hl7Conf) {
+                                   Boolean ignoreCdaBasicRequirements, String serviceName, String hl7Conf) {
         this.bbrUrl = bbrUrl;
         this.outputFolder = outputFolder;
         this.mvn = mvn;
         this.ignoreTemplateIdRequirements = ignoreTemplateIdRequirements;
         this.ignoreCdaBasicRequirements = ignoreCdaBasicRequirements;
-        this.ignoreChoicesPredicates = ignoreChoicesPredicates;
         this.serviceName = serviceName;
         this.hl7Conf = hl7Conf;
     }
@@ -89,14 +86,6 @@ public class GenerationConfiguration {
         this.serviceName = serviceName;
     }
 
-    public Boolean isIgnoreChoicesPredicates() {
-        return ignoreChoicesPredicates;
-    }
-
-    public void setIgnoreChoicesPredicates(Boolean ignoreChoicesPredicates) {
-        this.ignoreChoicesPredicates = ignoreChoicesPredicates;
-    }
-
     public String getVersionLabel() {
         return versionLabel;
     }

hl7templates/goc-tests/goc-tests-runner/src/main/java/net/ihe/gazelle/goctests/interlay/ValidatorGeneratorImpl.java

@@ -30,7 +30,6 @@ public class ValidatorGeneratorImpl implements ValidatorGenerator {
 
         Boolean ignoreTemplateIdRequirements = generationConfiguration.isIgnoreTemplateIdRequirements();
         Boolean ignoreCdaBasicRequirements = generationConfiguration.isIgnoreCdaBasicRequirements();
-        Boolean ignoreChoicesPredicates = generationConfiguration.isIgnoreChoicesPredicates();
         String serviceName = generationConfiguration.getServiceName();
         String versionLabel = generationConfiguration.getVersionLabel();
         String hl7Conf = generationConfiguration.getHl7Conf();
@@ -38,7 +37,7 @@ public class ValidatorGeneratorImpl implements ValidatorGenerator {
         //Run GOC
         GOCExecutor gocExecutor = new GOCExecutor(outputFolder);
         ValidatorConfiguration validatorConfiguration = gocExecutor.execute(new StreamBBRResource(bbrUrl),mvn,
-                versionLabel, ignoreTemplateIdRequirements, ignoreCdaBasicRequirements, serviceName, ignoreChoicesPredicates, hl7Conf);
+                versionLabel, ignoreTemplateIdRequirements, ignoreCdaBasicRequirements, serviceName, hl7Conf);
 
         StringBuilder logPath = new StringBuilder(outputFolder)
                 .append("/").append(GeneratedValidator.ROOT_LOG_DIRECTORY)

hl7templates/hl7templates-generator-jar/src/it/java/net/ihe/gazelle/tempgen/test/HL7TemplatesConverterIT.java

@@ -75,7 +75,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMI6() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/decor_labeled3.xml", false, "1.0",false);
+		String res = conv.convertArtDecorXMI("src/test/resources/decor_labeled3.xml", false, "1.0");
 		assertTrue(res.contains("29762-2"));
 		assertFalse(res.contains("entry"));
 		assertTrue(res.contains("1.2.3.4.5"));
@@ -84,7 +84,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMI7() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/decor_labeled3.xml", false, "1.1",false);
+		String res = conv.convertArtDecorXMI("src/test/resources/decor_labeled3.xml", false, "1.1");
 		assertFalse(res.contains("29762-2"));
 		assertTrue(res.contains("entry"));
 		assertTrue(res.contains("1.2.3.4.5"));
@@ -93,7 +93,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMI8() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/decor_labeled3.xml", false, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/decor_labeled3.xml", false, null);
 		assertFalse(res.contains("29762-2"));
 		assertTrue(res.contains("entry"));
 		assertTrue(res.contains("1.2.3.4.5"));
@@ -102,7 +102,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMITrueIgnoreTemplateRequirementForContains() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", true, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", true, null);
 		assertFalse(res.contains("SHALL contain at least ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertFalse(res.contains("SHALL contain at most ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 	}
@@ -110,7 +110,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMIFalseIgnoreTemplateRequirementForContains() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", false, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", false, null);
 		assertTrue(res.contains("SHALL contain at least ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertTrue(res.contains("SHALL contain at most ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 	}
@@ -118,7 +118,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMIFalseIgnoreTemplateRequirementForContainsMandatory() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_ter_mandatory.xml", false, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_ter_mandatory.xml", false, null);
 		assertTrue(res.contains("SHALL contain at least ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertTrue(res.contains("SHALL contain at most ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertTrue(res.contains("the element(s) hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4'] SHALL not have nullFlavor (mandatory)"));
@@ -127,7 +127,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMITrueIgnoreTemplateRequirementForContainsMandatory() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", true, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", true, null);
 		assertFalse(res.contains("SHALL contain at least ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertFalse(res.contains("SHALL contain at most ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 	}
@@ -135,7 +135,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMIFalseIgnoreTemplateRequirementForContainsInclude() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain.xml", false, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain.xml", false, null);
 		assertTrue(res.contains("SHALL contain at least ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertTrue(res.contains("SHALL contain at most ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 	}
@@ -143,7 +143,7 @@ public class HL7TemplatesConverterIT {
 	@Test
 	public void testConvertArtDecorXMITrueIgnoreTemplateRequirementForContainsInclude() throws FileNotFoundException, JAXBException {
 		HL7TemplatesConverter conv = new HL7TemplatesConverter();
-		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", true, null,false);
+		String res = conv.convertArtDecorXMI("src/test/resources/contain/decor_contain_bis.xml", true, null);
 		assertFalse(res.contains("SHALL contain at least ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 		assertFalse(res.contains("SHALL contain at most ONE hl7:templateId[@root='1.3.6.1.4.1.19376.1.5.3.1.4.13.4']"));
 	}

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/ChoiceDefinitionAnalyzer.java

@@ -39,8 +39,6 @@ public class ChoiceDefinitionAnalyzer extends ChoiceDefinitionProcessorImpl {
 	
 	protected Boolean ignoreTemplateIdRequirements = Boolean.FALSE;
 
-	protected Boolean ignoreChoicesPredicates = Boolean.FALSE;
-	
 	private List<OwnedRule> listGeneratedOwnedRule = new ArrayList<>();
 
 	private static final String PATH_ELEM = "(([^/@]+?:)([^/\\[]+)(\\[(.+)])?)";
@@ -62,9 +60,6 @@ public class ChoiceDefinitionAnalyzer extends ChoiceDefinitionProcessorImpl {
 		if (objects.length>1) {
 			this.ignoreTemplateIdRequirements = (Boolean)objects[1];
 		}
-		if (objects.length>2) {
-			this.ignoreChoicesPredicates = (Boolean) objects[2];
-		}
 		this.currentChoiceDefinition = t;
 		this.currentPackagedElement = (PackagedElement) objects[0];
 		if (verifyThatChoiceIsProcessable(this.currentChoiceDefinition)){
@@ -168,7 +163,7 @@ public class ChoiceDefinitionAnalyzer extends ChoiceDefinitionProcessorImpl {
 	public void processElements(List<RuleDefinition> elements) {
 		if (elements != null) {
 			for (RuleDefinition ruleDefinition : elements) {
-				(new RuleDefinitionAnalyzer()).process(ruleDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements,this.ignoreChoicesPredicates);
+				(new RuleDefinitionAnalyzer()).process(ruleDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements);
 			}
 		}
 	}
@@ -197,23 +192,19 @@ public class ChoiceDefinitionAnalyzer extends ChoiceDefinitionProcessorImpl {
 	@Override
 	public void processPredicates(List<RuleDefinition> elements){
 
-		boolean processingDone = false;
 
 		// TODO: 24/06/2021  check the homogeneity of predicates for performance
-		if(this.ignoreChoicesPredicates == Boolean.FALSE){
 			if(elements != null) {
 				if (choiceHasNumberedPredicates(elements)) {
 					OwnedRule choiceOwnedRule = processNumberedPredicates(elements);
 					this.listGeneratedOwnedRule.add(choiceOwnedRule);
 					currentPackagedElement.getOwnedRule().add(choiceOwnedRule);
-					processingDone = true;
 				} else if (choiceHasPredicates(elements) && !choiceHasNumberedPredicates(elements)) {
 					List<List<OwnedRule>> rules = generateSubRuleOfAssertionElements(elements);
 					if (rules != null && rules.size() > 0) {
 						OwnedRule generalOwnedRule = generateGeneraleRuleForChoice(rules);
 						this.listGeneratedOwnedRule.add(generalOwnedRule);
 						currentPackagedElement.getOwnedRule().add(generalOwnedRule);
-						processingDone = true;
 					}
 					// don't process elements if there is an error in one sub element
 					else {
@@ -229,7 +220,6 @@ public class ChoiceDefinitionAnalyzer extends ChoiceDefinitionProcessorImpl {
 							OwnedRule generalOwnedRule = generateGeneraleRuleForChoice(rules);
 							this.listGeneratedOwnedRule.add(generalOwnedRule);
 							currentPackagedElement.getOwnedRule().add(generalOwnedRule);
-							processingDone = true;
 						}
 						// don't process elements if there is an error in one sub element
 						else {
@@ -238,11 +228,8 @@ public class ChoiceDefinitionAnalyzer extends ChoiceDefinitionProcessorImpl {
 					}
 				}
 			}
-		}
-		if(!processingDone){
 			//case 2: different names (normal process)
 			this.processElements(elements);
-		}
 	}
 
 	protected void ANDRules(OwnedRule ownedRule, OwnedRule subOwnedRule){

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/DecorAnalyzer.java

@@ -20,8 +20,6 @@ public class DecorAnalyzer extends DecorProcessorImpl {
 	
 	protected Boolean ignoreTemplateIdRequirements = Boolean.FALSE;
 
-	protected Boolean ignoreChoicesPredicates = Boolean.FALSE;
-
 	@Override
 	public void process(Decor t, Object... objects) {
 		this.currentDecor = t;
@@ -29,9 +27,7 @@ public class DecorAnalyzer extends DecorProcessorImpl {
 		if (objects.length>1) {
 			this.ignoreTemplateIdRequirements = (Boolean) objects[1];
 		}
-		if (objects.length>2) {
-			this.ignoreChoicesPredicates = (Boolean) objects[2];
-		}
+
 		String prefix = DecorUtil.extractPrefixFromDecor(this.currentDecor);
 		OwnedRuleUtil.setReqIdentifier(prefix);
 
@@ -44,7 +40,7 @@ public class DecorAnalyzer extends DecorProcessorImpl {
 	
 	@Override
 	public void processRules(Rules rules) {
-		(new RulesAnalyzer()).process(rules, this.xmi, this.ignoreTemplateIdRequirements,this.ignoreChoicesPredicates);
+		(new RulesAnalyzer()).process(rules, this.xmi, this.ignoreTemplateIdRequirements);
 	}
 
 }

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/HL7TemplatesConverter.java

@@ -41,7 +41,7 @@ public class HL7TemplatesConverter {
      * @return the XMI String
      */
     public String convertArtDecorXMI(String bbrpath) throws JAXBException {
-        return convertArtDecorXMI(bbrpath, false, null,false);
+        return convertArtDecorXMI(bbrpath, false, null);
     }
 
     /**
@@ -52,7 +52,7 @@ public class HL7TemplatesConverter {
      * @throws JAXBException if decor cannot be unmarshall
      * @return The XMI String
      */
-    public String convertArtDecorXMI(Decor decor, boolean ignoreTemplateIdRequirements, String templateVersionFilter, Boolean ignoreChoicesPredicates)
+    public String convertArtDecorXMI(Decor decor, boolean ignoreTemplateIdRequirements, String templateVersionFilter)
             throws JAXBException {
 
         log.info("Converting BBR to UML Model");
@@ -86,7 +86,7 @@ public class HL7TemplatesConverter {
 
         log.warn("Converting Decor to XMI");
         //
-        XMI xmi = convertFlattenedDecorToXMI(decor, ignoreTemplateIdRequirements,ignoreChoicesPredicates);
+        XMI xmi = convertFlattenedDecorToXMI(decor, ignoreTemplateIdRequirements);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMIMarshaller.printXMI(xmi, baos);
         String res = baos.toString();
@@ -103,18 +103,18 @@ public class HL7TemplatesConverter {
         return res;
     }
 
-    public String convertArtDecorXMI(String bbrpath, boolean ignoreTemplateIdRequirements, String templateVersionFilter,Boolean ignoreChoicesPredicates)
+    public String convertArtDecorXMI(String bbrpath, boolean ignoreTemplateIdRequirements, String templateVersionFilter)
             throws JAXBException {
             Decor decor = DecorMarshaller.loadDecor(bbrpath);
-            return convertArtDecorXMI(decor, ignoreTemplateIdRequirements, templateVersionFilter,ignoreChoicesPredicates);
+            return convertArtDecorXMI(decor, ignoreTemplateIdRequirements, templateVersionFilter);
     }
 
-    public String convertArtDecorXMI(BBRResource bbrResource, Boolean ignoreTemplateIdRequirements, String templateVersionFilter,boolean ignoreChoicesPredicates)
+    public String convertArtDecorXMI(BBRResource bbrResource, Boolean ignoreTemplateIdRequirements, String templateVersionFilter)
             throws JAXBException {
 
         //TODO interface to hl7templates-model-jar
         Decor decor = DecorMarshaller.loadDecor(bbrResource);
-        return convertArtDecorXMI(decor, ignoreTemplateIdRequirements, templateVersionFilter,ignoreChoicesPredicates);
+        return convertArtDecorXMI(decor, ignoreTemplateIdRequirements, templateVersionFilter);
     }
 
     protected Decor flattenDecor(Decor decorParam) {
@@ -134,11 +134,11 @@ public class HL7TemplatesConverter {
     }
 
 
-    protected XMI convertFlattenedDecorToXMI(Decor decor, boolean ignoreTemplateIdRequirements,Boolean ignoreChoicesPredicates) {
+    protected XMI convertFlattenedDecorToXMI(Decor decor, boolean ignoreTemplateIdRequirements) {
         String prefix = DecorUtil.extractPrefixFromDecor(decor);
         XMI xmi = XMIUtil.createXMI(prefix);
         //The entrypoint to convert the decor to OCL!
-        (new DecorAnalyzer()).process(decor, xmi, Boolean.valueOf(ignoreTemplateIdRequirements),ignoreChoicesPredicates);
+        (new DecorAnalyzer()).process(decor, xmi, Boolean.valueOf(ignoreTemplateIdRequirements));
         //Skip incorrect OCL
         //cleanTAML(xmi);
         clearXMI(xmi);

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/RuleDefinitionAnalyzer.java

@@ -41,8 +41,6 @@ public class RuleDefinitionAnalyzer extends RuleDefinitionProcessorImpl {
 
     protected Boolean ignoreTemplateIdRequirements = Boolean.FALSE;
 
-    protected Boolean ignoreChoicesPredicates = Boolean.FALSE;
-
     private List<OwnedRule> listGeneratedOwnedRule = new ArrayList<>();
 
     private Boolean generateDTDistinguisher = Boolean.FALSE;
@@ -152,9 +150,6 @@ public class RuleDefinitionAnalyzer extends RuleDefinitionProcessorImpl {
         if (objects.length > 1) {
             this.ignoreTemplateIdRequirements = (Boolean) objects[1];
         }
-        if (objects.length > 2) {
-            this.ignoreChoicesPredicates = (Boolean) objects[2];
-        }
         if (this.ignoreTemplateIdRequirements.booleanValue() && this.selectedRuleDefinition.getName() != null &&
                 (this.selectedRuleDefinition.getName().matches(".*:templateId") || this.selectedRuleDefinition.getName().matches("templateId"))) {
             return;
@@ -359,7 +354,7 @@ public class RuleDefinitionAnalyzer extends RuleDefinitionProcessorImpl {
     public void processChoices(List<ChoiceDefinition> choices) {
         if (choices != null) {
             for (ChoiceDefinition choiceDefinition : choices) {
-                (new ChoiceDefinitionAnalyzer()).process(choiceDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements,this.ignoreChoicesPredicates);
+                (new ChoiceDefinitionAnalyzer()).process(choiceDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements);
             }
         }
     }
@@ -420,7 +415,7 @@ public class RuleDefinitionAnalyzer extends RuleDefinitionProcessorImpl {
         if (elements != null) {
             for (RuleDefinition ruleDefinition : elements) {
                 RuleDefinitionAnalyzer rda = new RuleDefinitionAnalyzer();
-                rda.process(ruleDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements,this.ignoreChoicesPredicates);
+                rda.process(ruleDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements);
             }
         }
     }

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/RulesAnalyzer.java

@@ -30,17 +30,12 @@ public class RulesAnalyzer extends RulesProcessorImpl {
 	
 	protected Boolean ignoreTemplateIdRequirements = Boolean.FALSE;
 
-	protected Boolean ignoreChoicesPredicates = Boolean.FALSE;
-	
 	@Override
 	public void process(Rules t, Object... objects) {
 		this.xmi = (XMI) objects[0];
 		if (objects.length>1) {
 			this.ignoreTemplateIdRequirements = (Boolean) objects[1];
 		}
-		if (objects.length>2) {
-			this.ignoreChoicesPredicates = (Boolean) objects[2];
-		}
 		this.currentRules = t;
 		List<TemplateDefinition> ltd = RulesUtil.getTemplates(this.currentRules);
 		log.info("complete templates size : {}", Integer.valueOf(ltd.size()));
@@ -56,7 +51,7 @@ public class RulesAnalyzer extends RulesProcessorImpl {
 	public void processTemplates(List<TemplateDefinition> templates) {
 		for (TemplateDefinition templateDefinition : templates) {
 			if ((this.listCDATemplates != null) && this.listCDATemplates.contains(templateDefinition)) {
-				(new TemplateDefinitionAnalyzer()).process(templateDefinition, this.xmi, this.ignoreTemplateIdRequirements,this.ignoreChoicesPredicates);
+				(new TemplateDefinitionAnalyzer()).process(templateDefinition, this.xmi, this.ignoreTemplateIdRequirements);
 			}
 		}
 	}		

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/TemplateDefinitionAnalyzer.java

@@ -36,8 +36,6 @@ public class TemplateDefinitionAnalyzer extends TemplateDefinitionProcessorImpl
 	
 	private Boolean ignoreTemplateIdRequirements = false;
 
-	private Boolean ignoreChoicesPredicates = Boolean.FALSE;
-
 	@Override
 	public void process(TemplateDefinition t, Object... objects) {
 		if (objects== null || objects.length<1 || !(objects[0] instanceof XMI)) {
@@ -49,9 +47,6 @@ public class TemplateDefinitionAnalyzer extends TemplateDefinitionProcessorImpl
 		if (objects.length>1) {
 			this.ignoreTemplateIdRequirements = (Boolean) objects[1];
 		}
-		if (objects.length>2) {
-			this.ignoreChoicesPredicates = (Boolean)objects[2];
-		}
 		this.currentPackagedElement = PackagedElementUtil.initPackagedElement();
 		this.currentTemplateDefinition = t;
 		String nam = this.currentTemplateDefinition.getName().replace("-", "").replace(".", "");
@@ -95,7 +90,7 @@ public class TemplateDefinitionAnalyzer extends TemplateDefinitionProcessorImpl
 	@Override
 	public void processElements(List<RuleDefinition> ruleDefinitions) {
 		for (RuleDefinition ruleDefinition : ruleDefinitions) {
-			(new RuleDefinitionAnalyzer()).process(ruleDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements,this.ignoreChoicesPredicates);
+			(new RuleDefinitionAnalyzer()).process(ruleDefinition, this.currentPackagedElement, this.ignoreTemplateIdRequirements);
 		}
 
 	}

hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/UMLModelGenerator.java

@@ -86,7 +86,7 @@ public class UMLModelGenerator implements ModelGenerator {
             Boolean ignoreTemplateIdRequirements = validatorConfiguration.ignoreTemplateIdRequirements();
             String tempalteVersionFilter = validatorConfiguration.getTemplateVersionFilter();
             String umlModelForBBR;
-            umlModelForBBR = templatesConverter.convertArtDecorXMI(bbrResource, ignoreTemplateIdRequirements, tempalteVersionFilter,validatorConfiguration.getIgnoreChoicesPredicates());
+            umlModelForBBR = templatesConverter.convertArtDecorXMI(bbrResource, ignoreTemplateIdRequirements, tempalteVersionFilter);
             log.info("ValidatorConfiguration converted to UML.");
             FileUtils.writeStringToFile(outUmlModelPath, umlModelForBBR, "UTF-8");
             log.warn("Generated UML Model is saved at: "+outUmlModelPath);

hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/ValidatorConfiguration.java

@@ -16,15 +16,6 @@ public class ValidatorConfiguration {
     private Boolean ignoreCdaBasicRequirements;
     private String serviceName;
     private ProjectNaming projectNaming;
-    private Boolean ignoreChoicesPredicates;
-
-    public Boolean getIgnoreChoicesPredicates() {
-        return ignoreChoicesPredicates;
-    }
-
-    public void setIgnoreChoicesPredicates(Boolean ignoreChoicesPredicates) {
-        this.ignoreChoicesPredicates = ignoreChoicesPredicates;
-    }
 
     @Deprecated
     private String bbrPath;
@@ -46,13 +37,12 @@ public class ValidatorConfiguration {
      * @param serviceName                  : service name that will be used in validation reports
      */
     public ValidatorConfiguration(BBRResource bbrResource, String templateVersionFilter, Boolean ignoreTemplateIdRequirements,
-                                  Boolean ignoreCdaBasicRequirements, String serviceName, Boolean ignoreChoicesPredicates) {
+                                  Boolean ignoreCdaBasicRequirements, String serviceName) {
         this.bbrResource = bbrResource;
         setTemplateVersionFilter(templateVersionFilter);
         setIgnoreTemplateIdRequirements(ignoreTemplateIdRequirements);
         setIgnoreCdaBasicRequirements(ignoreCdaBasicRequirements);
         setServiceName(serviceName);
-        setIgnoreChoicesPredicates(ignoreChoicesPredicates);
         projectNaming = new ProjectNaming(bbrResource);
     }
 

hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCExecutor.java

@@ -29,12 +29,12 @@ public class GOCExecutor {
     }
 
     public ValidatorConfiguration execute(BBRResource bbrResource, String mvnExecPath){
-        return execute(bbrResource,mvnExecPath,null,true,false,null,false,null);
+        return execute(bbrResource,mvnExecPath,null,true,false,null,null);
     }
 
     public ValidatorConfiguration execute(BBRResource bbrResource,String mvnExecPath,
                                           String versionLabel, Boolean ignoreTemplateIdRequirements,
-                                          Boolean ignoreCdaBasicRequirements, String serviceName,Boolean ignoreChoicesPredicates, String hl7Conf) {
+                                          Boolean ignoreCdaBasicRequirements, String serviceName, String hl7Conf) {
 
         try{
             addSubDirectoryToOutput("/validator");
@@ -69,7 +69,7 @@ public class GOCExecutor {
 
             ValidatorConfiguration validatorConfiguration = new ValidatorConfiguration(bbrResource, versionLabel,
                     ignoreTemplateIdRequirements, ignoreCdaBasicRequirements,
-                    serviceName,ignoreChoicesPredicates);
+                    serviceName);
             packager.packageBBRToGOCValidationTool(new Workspace(getWorkspaceName()),validatorConfiguration);
 
             return validatorConfiguration;

hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/HL7Templates2GOC.java

@@ -52,9 +52,6 @@ public class HL7Templates2GOC implements GOCEntry {
     @Option(name = "-in", metaVar = "inputFile", usage = "Input folder", required = false)
     private String inputFile;
 
-    @Option(name = "-ignoreChoicesPredicates", metaVar = "ignoreChoicesPredicates", usage = "Ignore all choices predicates processing", required = false)
-    private boolean ignoreChoicesPredicates=false;
-
     public String getVersionLabel() {
         return versionLabel;
     }
@@ -192,7 +189,7 @@ public class HL7Templates2GOC implements GOCEntry {
 
             GOCExecutor gocExecutor = new GOCExecutor(outputFile);
             gocExecutor.execute(new PathBBRResource(bbr),mvnExecPath,versionLabel,
-                    ignoreTemplateIdRequirements,ignoreCdaBasicRequirements, serviceName,ignoreChoicesPredicates, HL7TEMP_CDACONFFOLDERNAME);
+                    ignoreTemplateIdRequirements,ignoreCdaBasicRequirements, serviceName, HL7TEMP_CDACONFFOLDERNAME);
 
         } catch (CmdLineException e) {
             System.err.println("Exception in the execution of command line");

hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh

@@ -213,7 +213,7 @@ fi;
 echo -e "${GREEN}your validator will be generated in: ${workspaceDir}/${folderName}${NC}"
 
 ######## GENERATION COMMAND ########
-$JAVA_HOME/bin/java -jar $jarPath -bbr $bbrPath -out "${workspaceDir}/${folderName}" -mvn $mavenPath -serviceName $validator -HL7TEMP_CDACONFFOLDERNAME cdaepsos -ignoreChoicesPredicates
+$JAVA_HOME/bin/java -jar $jarPath -bbr $bbrPath -out "${workspaceDir}/${folderName}" -mvn $mavenPath -serviceName $validator -HL7TEMP_CDACONFFOLDERNAME cdaepsos
 ####################################
 
 #Replacing XSD

hl7templates/hl7templates-packager-jar/src/test/java/net/ihe/gazelle/lib/hl7templatespackager/application/GOCPackgerTest.java

@@ -34,6 +34,6 @@ public class GOCPackgerTest {
         Files.createDirectories(path);
 
         //notOverride set to false because new resources are retrieved with an anonymous workspace so we need to replace it
-        packager.packageBBRToGOCValidationTool(new Workspace(folderOutput), new ValidatorConfiguration(new PathBBRResource(bbrPath), "2.1", false,false, serviceName,false));
+        packager.packageBBRToGOCValidationTool(new Workspace(folderOutput), new ValidatorConfiguration(new PathBBRResource(bbrPath), "2.1", false,false, serviceName));
     }
 }