Feature/Ajout de la propriété 'keyword' dans l'enveloppe et modification de la strategie d'identification de type de message

.github/workflows/generate-model.yaml

@@ -29,6 +29,7 @@ jobs:
               - '**/model.xlsx'
               - '**/nomenclature_parser/**'
               - '**/json_schema2xsd/**'
+              - '**/automatic-schema-generator/**'
             test_case_parsing_required:
               - '**/test_case_generator.py'
               - '**/workflow.py'
@@ -49,6 +50,7 @@ jobs:
         run: pip install -r ./requirements.txt
 
       - name: Clean up old generated schemas
+        if: steps.filter.outputs.parsing_required == 'true'
         working-directory: ./src/main/resources
         run: find ./json-schema -type f -name '*.json' ! -name 'customContent.schema.json' ! -name 'EDXL-DE-*.schema.json' -exec rm {} +
 
@@ -71,7 +73,7 @@ jobs:
         working-directory: ./csv_parser
         if: steps.filter.outputs.parsing_required == 'true'
         run: |
-          cp ./out/schemas.yaml ./json_schema2xsd/src/main/resources/schemas.yaml
+          rsync -a --remove-source-files ./out/schemas.yaml ./json_schema2xsd/src/main/resources/schemas.yaml
 
       - name: Setup gomplate
         if: steps.filter.outputs.parsing_required == 'true'
@@ -93,6 +95,7 @@ jobs:
           rsync -a --remove-source-files output/edxl ../src/main/java/com/hubsante/model
           rsync -a --remove-source-files output/json-schema ../src/main/resources
           rsync -a --remove-source-files output/xsd ../src/main/resources
+          rsync -a --remove-source-files output/deserializer/. ../src/main/java/com/hubsante/model
 
 # TODO: Reactivate test case autogeneration
 #      - name: Run test_case_generator and move the folder test-cases to src/main/resources/sample/test-cases

automatic-schema-generator/automatic-generator.sh

@@ -13,6 +13,9 @@ gomplate -f ./templates/schema.wrapper.generator-config.json.tmpl -d config=./sc
 # generate ContentMessage class
 gomplate -f ./templates/ContentMessage.java.tmpl -d config=./schemas.yaml -o ./output/edxl/ContentMessage.java
 
+# generate ContentMessageDeserializer class
+gomplate -f ./templates/ContentMessageDeserializer.java.tmpl -d config=./schemas.yaml -o ./output/deserializer/ContentMessageDeserializer.java
+
 # generate EDXL-DE json schema
 gomplate -f ./templates/EDXL-DE-full.schema.json.tmpl -d config=./schemas.yaml -o ./output/json-schema/EDXL-DE-full.schema.json
 

automatic-schema-generator/templates/ContentMessage.java.tmpl

@@ -18,7 +18,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
 @JsonSubTypes({ {{ range $i, $e := (datasource "config").schemas }}{{if eq .automaticGeneration "Y"}}
         @JsonSubTypes.Type({{ .rootElement | title }}Wrapper.class),{{end}}{{end}}
         @JsonSubTypes.Type(ErrorWrapper.class),

automatic-schema-generator/templates/EDXL-DE-full.schema.json.tmpl

@@ -145,17 +145,21 @@
     "Descriptor": {
       "type": "object",
       "properties": {
-        "explicitAddress": {
-          "$ref": "#/definitions/ExplicitAddress"
-        },
         "language": {
           "type": "string"
+        },
+        "keyword": {
+          "$ref": "#/definitions/Keyword"
+        },
+        "explicitAddress": {
+          "$ref": "#/definitions/ExplicitAddress"
         }
       },
       "additionalProperties": false,
       "required": [
-        "explicitAddress",
-        "language"
+        "language",
+        "keyword",
+        "explicitAddress"
       ]
     },
     "DistributionKind": {
@@ -190,6 +194,17 @@
         "explicitAddressScheme",
         "explicitAddressValue"
       ]
+    },
+    "Keyword": {
+      "type": "array",
+      "items": {
+        "ValueListURI" : {
+          "type": "string"
+        },
+        "Value" : {
+          "type": "string"
+        }
+      }
     }
   }
 }