Modele : ajout d'une méthode getUseCaseName

.github/workflows/generate-model.yaml

@@ -33,10 +33,14 @@ jobs:
               - 'nomenclature_parser/**'
               - 'csv_parser/json_schema2xsd/**'
               - 'src/main/resources/sample/examples/**'
+              - 'automatic-schema-generator/templates/**'
+              - 'automatic-schema-generator/automatic-generator.sh'
+              - 'generator/templates/**'
+              - 'generator/config/manual/**'
             test_case_parsing_required:
               - 'csv_parser/test_case_generator.py'
               - 'csv_parser/workflow.py'
-              - 'csv_parser/test-cases-sources/**'
+              - 'csv_parser/test-case-sources/**'
 
       - name: Install Graphviz
         if: steps.filter.outputs.parsing_required == 'true'

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

@@ -4,6 +4,7 @@
 
 package com.hubsante.model.edxl;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
@@ -42,6 +43,11 @@ public class ContentMessage {
         return 0;
     }
 
+    @JsonIgnore
+    public String getUseCaseName() {
+        return "unknown";
+    }
+
     public static class UseCaseHelper {
         public static final Map<String,String> useCases = Stream.of(new String[][] {
                   {{ range $i, $e := (datasource "config").schemas }}{{if eq .automaticGeneration "Y"}}

automatic-schema-generator/templates/schema.wrapper.generator-config.json.tmpl

@@ -18,7 +18,8 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true{{ if .customExtendPackage}},
+    "enablePostProcessFile": true,
+    "useCaseName": "{{ .rootElement }}"{{ if .customExtendPackage }},
     "customExtend": {
       "package": "{{ .customExtendPackage }}",
       "className": "{{ .customExtendClass }}"

generator/config/generated/GEO-POS/GEO-POS.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "geoPositionsUpdate"
   }
 }

generator/config/generated/GEO-REQ/GEO-REQ.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "geoResourcesRequest"
   }
 }

generator/config/generated/GEO-RES/GEO-RES.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "geoResourcesDetails"
   }
 }

generator/config/generated/RC-DE/RC-DE.wrapper.generator-config.json

@@ -19,6 +19,7 @@
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
     "enablePostProcessFile": true,
+    "useCaseName": "distributionElement",
     "customExtend": {
       "package": "com.hubsante.model.edxl",
       "className": "ContentMessage"

generator/config/generated/RC-EDA/RC-EDA.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "createCase"
   }
 }

generator/config/generated/RC-REF/RC-REF.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "reference"
   }
 }

generator/config/generated/RC-RI/RC-RI.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "resourcesInfoCisu"
   }
 }

generator/config/generated/RS-BPV/RS-BPV.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "interventionReport"
   }
 }

generator/config/generated/RS-DR/RS-DR.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "resourcesRequest"
   }
 }

generator/config/generated/RS-EDA-MAJ/RS-EDA-MAJ.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "createCaseHealthUpdate"
   }
 }

generator/config/generated/RS-EDA/RS-EDA.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "createCaseHealth"
   }
 }

generator/config/generated/RS-ER/RS-ER.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "resourcesEngagement"
   }
 }

generator/config/generated/RS-RI/RS-RI.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "resourcesInfo"
   }
 }

generator/config/generated/RS-RPIS/RS-RPIS.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "rpis"
   }
 }

generator/config/generated/RS-RR/RS-RR.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "resourcesResponse"
   }
 }

generator/config/generated/RS-SAS-RDV/RS-SAS-RDV.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "appointment"
   }
 }

generator/config/generated/RS-SR/RS-SR.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "resourcesStatus"
   }
 }

generator/config/generated/RS-URL/RS-URL.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "documentLink"
   }
 }

generator/config/generated/TECHNICAL/TECHNICAL.wrapper.generator-config.json

@@ -18,6 +18,7 @@
     "openApiNullable": true,
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
-    "enablePostProcessFile": true
+    "enablePostProcessFile": true,
+    "useCaseName": "technical"
   }
 }

generator/config/generated/TECHNICAL_NOREQ/TECHNICAL_NOREQ.wrapper.generator-config.json

@@ -19,6 +19,7 @@
     "supportUrlQuery": false,
     "xmlns": "eda:1.9",
     "enablePostProcessFile": true,
+    "useCaseName": "technicalNoreq",
     "customExtend": {
       "package": "com.hubsante.model.edxl",
       "className": "ContentMessage"

generator/config/manual/RS-ERROR/RS-ERROR.wrapper.generator-config.json

@@ -17,7 +17,9 @@
     "serializationLibrary": "jackson",
     "openApiNullable": true,
     "supportUrlQuery": false,
+    "xmlns": "eda:1.9",
     "enablePostProcessFile": true,
+    "useCaseName": "error",
     "customExtend": {
       "package": "com.hubsante.model.edxl",
       "className": "ContentMessage"

generator/templates/wrapper/pojo.mustache

@@ -35,6 +35,11 @@ public class {{classname}}{{#vendorExtensions.x-implements}}{{#-first}}implement
 {{/serializableModel}}
     @JacksonXmlProperty(isAttribute = true)
     String xmlns = "urn:emergency:{{xmlns}}";
+
+    @Override
+    public String getUseCaseName() {
+        return "{{useCaseName}}";
+    }
 {{#vars}}
     {{#isEnum}}
         {{^isContainer}}

src/main/java/com/hubsante/model/cisu/CreateCaseWrapper.java

@@ -56,6 +56,11 @@
 public class CreateCaseWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "createCase";
+  }
   public static final String JSON_PROPERTY_CREATE_CASE = "createCase";
   private CreateCase createCase;
 

src/main/java/com/hubsante/model/cisu/resources/info/ResourcesInfoCisuWrapper.java

@@ -56,6 +56,11 @@
 public class ResourcesInfoCisuWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "resourcesInfoCisu";
+  }
   public static final String JSON_PROPERTY_RESOURCES_INFO_CISU =
       "resourcesInfoCisu";
   private ResourcesInfoCisu resourcesInfoCisu;

src/main/java/com/hubsante/model/documentlink/DocumentLinkWrapper.java

@@ -56,6 +56,11 @@
 public class DocumentLinkWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "documentLink";
+  }
   public static final String JSON_PROPERTY_DOCUMENT_LINK = "documentLink";
   private DocumentLink documentLink;
 

src/main/java/com/hubsante/model/edxl/ContentMessage.java

@@ -19,6 +19,7 @@
 
 package com.hubsante.model.edxl;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
@@ -111,6 +112,11 @@ public int hashCode() {
         return 0;
     }
 
+    @JsonIgnore
+    public String getUseCaseName() {
+        return "unknown";
+    }
+
     public static class UseCaseHelper {
         public static final Map<String,String> useCases = Stream.of(new String[][] {
 

src/main/java/com/hubsante/model/geolocation/GeoPositionsUpdateWrapper.java

@@ -57,6 +57,11 @@
 public class GeoPositionsUpdateWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "geoPositionsUpdate";
+  }
   public static final String JSON_PROPERTY_GEO_POSITIONS_UPDATE =
       "geoPositionsUpdate";
   private GeoPositionsUpdate geoPositionsUpdate;

src/main/java/com/hubsante/model/geolocation/GeoResourcesDetailsWrapper.java

@@ -57,6 +57,11 @@
 public class GeoResourcesDetailsWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "geoResourcesDetails";
+  }
   public static final String JSON_PROPERTY_GEO_RESOURCES_DETAILS =
       "geoResourcesDetails";
   private GeoResourcesDetails geoResourcesDetails;

src/main/java/com/hubsante/model/geolocation/GeoResourcesRequestWrapper.java

@@ -57,6 +57,11 @@
 public class GeoResourcesRequestWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "geoResourcesRequest";
+  }
   public static final String JSON_PROPERTY_GEO_RESOURCES_REQUEST =
       "geoResourcesRequest";
   private GeoResourcesRequest geoResourcesRequest;

src/main/java/com/hubsante/model/health/CreateCaseHealthUpdateWrapper.java

@@ -57,6 +57,11 @@
 public class CreateCaseHealthUpdateWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "createCaseHealthUpdate";
+  }
   public static final String JSON_PROPERTY_CREATE_CASE_HEALTH_UPDATE =
       "createCaseHealthUpdate";
   private CreateCaseHealthUpdate createCaseHealthUpdate;

src/main/java/com/hubsante/model/health/CreateCaseHealthWrapper.java

@@ -56,6 +56,11 @@
 public class CreateCaseHealthWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "createCaseHealth";
+  }
   public static final String JSON_PROPERTY_CREATE_CASE_HEALTH =
       "createCaseHealth";
   private CreateCaseHealth createCaseHealth;

src/main/java/com/hubsante/model/interventionreport/InterventionReportWrapper.java

@@ -57,6 +57,11 @@
 public class InterventionReportWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "interventionReport";
+  }
   public static final String JSON_PROPERTY_INTERVENTION_REPORT =
       "interventionReport";
   private InterventionReport interventionReport;

src/main/java/com/hubsante/model/reference/ReferenceWrapper.java

@@ -56,6 +56,11 @@
 public class ReferenceWrapper extends DistributionElement {
   @JacksonXmlProperty(isAttribute = true)
   String xmlns = "urn:emergency:eda:1.9";
+
+  @Override
+  public String getUseCaseName() {
+    return "reference";
+  }
   public static final String JSON_PROPERTY_REFERENCE = "reference";
   private Reference reference;