Merge branch 'develop' into bugfix/HL7TEMP_RESOURCES_PATH

archetype/generated-validator/validator-archetype/src/main/resources/archetype-resources/pom.xml

@@ -244,7 +244,7 @@
         <dependency>
             <groupId>net.ihe.gazelle.common.code</groupId>
             <artifactId>common-operations-jar</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>

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

@@ -13,6 +13,7 @@ import net.ihe.gazelle.tempmodel.org.decor.art.model.RuleDefinition;
 import net.ihe.gazelle.tempmodel.org.decor.art.model.TemplateDefinition;
 import net.ihe.gazelle.tempmodel.org.decor.art.utils.*;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -42,6 +43,12 @@ public class AssertionChoicesIT extends ChoiceDefinitionAnalyzer {
         pe = new PackagedElement();
     }
 
+    /**
+     * This functionality is deprecated and the processAndReturn is not used anymore.
+     * Cause: Drop the processPredicate feature and delegate it to flattenning
+     */
+    @Deprecated
+    @Ignore
     @Test
     public void TestPrintChoices(){
         List<RuleDefinition> ruleDefinitions = ChoiceDefinitionUtil.getElements(currentChoice);
@@ -51,6 +58,12 @@ public class AssertionChoicesIT extends ChoiceDefinitionAnalyzer {
         assertEquals(ruleDefinitions.size(),3);
     }
 
+    /**
+     * This functionality is deprecated and the processAndReturn is not used anymore.
+     * Cause: Drop the processPredicate feature and delegate it to flattenning
+     */
+    @Deprecated
+    @Ignore
     @Test
     public void testProcessAndReturnRDTest(){
         List<OwnedRule> rules = (new RuleDefinitionAnalyzer()).processAndReturn(elements.get(1), pe);
@@ -59,6 +72,12 @@ public class AssertionChoicesIT extends ChoiceDefinitionAnalyzer {
         assertEquals(rules.get(0).getSpecification().getBody(),"self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::SPRT)->forAll(typeCode.oclIsUndefined() or typeCode=XActRelationshipEntryRelationship::SPRT)");
     }
 
+    /**
+     * This functionality is deprecated and the processAndReturn is not used anymore.
+     * Cause: Drop the processPredicate feature and delegate it to flattenning
+     */
+    @Deprecated
+    @Ignore
     @Test
     public void testProcessPredicatesTest(){
         this.currentPackagedElement = pe;
@@ -69,6 +88,12 @@ public class AssertionChoicesIT extends ChoiceDefinitionAnalyzer {
                 "((((self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::GEVL)->forAll(typeCode.oclIsUndefined() or typeCode=XActRelationshipEntryRelationship::GEVL)) and (self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::GEVL)->reject(not nullFlavor.oclIsUndefined())->forAll(aa | CommonOperationsStatic::validateByXPATHV2(aa, '@typeCode=\\u0027GEVL\\u0027') )))) or (((self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::SPRT)->forAll(typeCode.oclIsUndefined() or typeCode=XActRelationshipEntryRelationship::SPRT)) and (self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::SPRT)->forAll((not nullFlavor.oclIsUndefined()) or (not inversionInd.oclIsUndefined()))) and (self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::SPRT)->forAll(inversionInd.oclIsUndefined() or inversionInd=true)) and (self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::SPRT)->size()<2))) or (((self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::RSON)->forAll(typeCode.oclIsUndefined() or typeCode=XActRelationshipEntryRelationship::RSON)) and (self.entryRelationship->select((not typeCode.oclIsUndefined()) and typeCode=XActRelationshipEntryRelationship::RSON)->reject(not nullFlavor.oclIsUndefined())->forAll(aa | CommonOperationsStatic::validateByXPATHV2(aa, '@typeCode=\\u0027RSON\\u0027') )))))");
     }
 
+    /**
+     * This functionality is deprecated and the processAndReturn is not used anymore.
+     * Cause: Drop the processPredicate feature and delegate it to flattenning
+     */
+    @Deprecated
+    @Ignore
     @Test
     public void testProcessTest(){
         (new ChoiceDefinitionAnalyzer()).process(currentChoice,pe);
@@ -76,6 +101,12 @@ public class AssertionChoicesIT extends ChoiceDefinitionAnalyzer {
 
     }
 
+    /**
+     * This functionality is deprecated and the processAndReturn is not used anymore.
+     * Cause: Drop the processPredicate feature and delegate it to flattenning
+     */
+    @Deprecated
+    @Ignore
     @Test
     public void testGenerateSubRuleOfAssertionElementsTest(){
         assertTrue(choiceHasPredicates(elements) && !choiceHasNumberedPredicates(elements));
@@ -87,13 +118,19 @@ public class AssertionChoicesIT extends ChoiceDefinitionAnalyzer {
         assertEquals(rules.get(0).get(1).getOwnedRuleKind(),OwnedRuleKind.CONTEXT);
     }
 
+    /**
+     * This functionality is deprecated and the processAndReturn is not used anymore.
+     * Cause: Drop the processPredicate feature and delegate it to flattenning
+     */
+    @Deprecated
+    @Ignore
     @Test
     public void testGenerateGeneraleRuleForAssertionChoiceTest(){
         assertTrue(choiceHasPredicates(elements) && !choiceHasNumberedPredicates(elements));
         this.currentChoiceDefinition = currentChoice;
         List<List<OwnedRule>> rules = generateSubRuleOfAssertionElements(elements);
         OwnedRule generaleRule = generateGeneraleRuleForChoice(rules);
-        assertEquals(generaleRule.getOwnedRuleKind(),OwnedRuleKind.CHOICE);
+        assertEquals(OwnedRuleKind.CHOICE, generaleRule.getOwnedRuleKind());
 
     }
 }

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

@@ -6,6 +6,7 @@ import net.ihe.gazelle.tempmodel.org.decor.art.model.Decor;
 import net.ihe.gazelle.tempmodel.org.decor.art.utils.DecorMarshaller;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import javax.xml.bind.JAXBException;
@@ -121,10 +122,12 @@ public class GeneralFlattenDecorIT {
 
     /**
      * test for flattening names
-     *
+     * DROPPED: Ignored due to the ignore of old name flatenning
      * @throws JAXBException
      * @throws FileNotFoundException
      */
+    @Deprecated
+    @Ignore
     @Test
     public void testGeneralFlattenDecor3() throws JAXBException, FileNotFoundException {
         Decor dec = DecorMarshaller.loadDecor("src/test/resources/contain/decor_name2.xml");
@@ -137,10 +140,12 @@ public class GeneralFlattenDecorIT {
 
     /**
      * test for flattening names
-     *
+     * DROPPED: Ignored due to the ignore of old name flatenning
      * @throws JAXBException
      * @throws FileNotFoundException
      */
+    @Deprecated
+    @Ignore
     @Test
     public void testGeneralFlattenDecor4() throws JAXBException, FileNotFoundException {
         Decor dec = DecorMarshaller.loadDecor("src/test/resources/contain/decor_name2.xml");

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

@@ -11,6 +11,7 @@ import net.ihe.gazelle.tempmodel.org.decor.art.utils.RuleDefinitionUtil;
 import net.ihe.gazelle.tempmodel.org.decor.art.utils.RulesUtil;
 import net.ihe.gazelle.tempmodel.org.decor.art.utils.TemplateDefinitionUtil;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -90,6 +91,12 @@ public class RuleDefinitionFlattenProcIT extends RuleDefinitionFlattenProc {
         assertTrue(this.currentRuleDefinition.getName().equals("hl7:entry"));
     }
 
+    /**
+     * Ignored due to the ignore of old name flatenning
+     * @throws Exception Exception
+     */
+    @Ignore
+    @Deprecated
     @Test
     public void testProcessName2() throws Exception {
         Decor dec = DecorMarshaller.loadDecor("src/test/resources/contain/decor_contain_2.xml");
@@ -103,6 +110,12 @@ public class RuleDefinitionFlattenProcIT extends RuleDefinitionFlattenProc {
         assertTrue(this.currentRdNameAsXpath.isProcessed());
     }
 
+    /**
+     * Ignored due to the ignore of old name flatenning
+     * @throws Exception Exception
+     */
+    @Ignore
+    @Deprecated
     @Test
     public void testProcessName3() throws Exception {
         Decor dec = DecorMarshaller.loadDecor("src/test/resources/contain/decor_contain_2.xml");
@@ -131,6 +144,12 @@ public class RuleDefinitionFlattenProcIT extends RuleDefinitionFlattenProc {
         assertTrue(!this.currentRdNameAsXpath.isPathIsIgnorable());
     }
 
+    /**
+     * Ignored due to the ignore of old name flatenning
+     * @throws Exception Exception
+     */
+    @Ignore
+    @Deprecated
     @Test
     public void testProcessName5() throws Exception {
         Decor dec = DecorMarshaller.loadDecor("src/test/resources/contain/decor_contain_2.xml");

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

@@ -22,6 +22,7 @@ import net.ihe.gazelle.tempmodel.org.decor.art.model.*;
 import net.ihe.gazelle.tempmodel.org.decor.art.utils.*;
 import net.ihe.gazelle.validation.Notification;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,6 +95,8 @@ public class RuleDefinitionAnalyzerIT extends RuleDefinitionAnalyzer {
         assertTrue(lor.size() == 0);
     }
 
+    // Wrong test to be reviewed
+    @Ignore
     @Test
     public void testProcess() throws FileNotFoundException, JAXBException {
         Decor dec = DecorMarshaller.loadDecor("src/test/resources/decor_choice.xml");

hl7templates/hl7templates-packager-jar/pom.xml

@@ -193,12 +193,12 @@
         <dependency>
             <groupId>net.ihe.gazelle.model</groupId>
             <artifactId>cda-model</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>net.ihe.gazelle.model</groupId>
             <artifactId>cdaepsos-model</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

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

@@ -22,7 +22,7 @@ public class ArchetypeInstantiatorMaven implements ArchetypeInstantiator {
 
     private static org.slf4j.Logger log = LoggerFactory.getLogger(ArchetypeInstantiatorMaven.class);
     //this is supposed to be the version of the packager artifact. It is for now used as artifact version. See what we will use
-    private static final String gocVersion = "3.0.4-SNAPSHOT";
+    private static final String gocVersion = "3.1.0";
     private static final String CD_COMMAND = "cd \"";
     private static final String REPOSITORY = "https://gazelle.ihe.net/nexus/content/groups/public/";
 

hl7templates/hl7templates-packager-jar/src/main/resources/sequoia-db-hack/pom.xml

@@ -244,7 +244,7 @@
         <dependency>
             <groupId>net.ihe.gazelle.common.code</groupId>
             <artifactId>common-operations-jar</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>