[Investigation] Correction de la version d'OpenAPI pour rétablir les changements dans les classes Java générées

.github/workflows/generate-model.yaml

@@ -150,7 +150,7 @@ jobs:
 
       - name: Install openapi-generator-cli
         if: steps.filter.outputs.parsing_required == 'true'
-        run: npm install -g @openapitools/openapi-generator-cli
+        run: npm install -g @openapitools/openapi-generator-cli@2.9.0
 
       - name: Install linter
         if: steps.filter.outputs.parsing_required == 'true'
@@ -160,15 +160,17 @@ jobs:
         if: steps.filter.outputs.parsing_required == 'true'
         working-directory: ./generator
         run: |
+          # Setup OpenAPI version
+          npx openapi-generator-cli version-manager set 7.4.0
           # Iterate over each file in the ./config directory, including the entire subfolder structure
           # and then run @openapitools/openapi-generator-cli generate for each file found
           # Important notice:          
           # Results of the find command are sorted in an alphabetic order before being passed to xargs
           # This means that since the order of class generation is important, it's necessary to maintain an adequately 
           # named file structure in the ./config/** directories
           # generator-config.json (if exists) -> usecase.generator-config.json -> wrapper.generator-config.json
-          find ./config/ -type f | sort -n | while read -r file; do npx @openapitools/openapi-generator-cli generate -c "$file" --skip-validate-spec; done
-          
+          find ./config/ -type f | sort -n | while read -r file; do npx @openapitools/openapi-generator-cli@2.9.0 generate -c "$file" --skip-validate-spec; done
+
       - name: Replace src/ with generated classes
         if: steps.filter.outputs.parsing_required == 'true'
         run: |

.gitignore

@@ -8,7 +8,8 @@ coveragereport/**
 web_specs/generated/**
 bin/
 
-**/openapitools.json
+# À versionner pour suivre la version d'OpenAPI utilisé pour la génération
+# **/openapitools.json
 
 # Generated libraries packages
 # Python

generator/openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.4.0"
+  }
+}

generator_csharp/openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.10.0"
+  }
+}

generator_python/openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.10.0"
+  }
+}

generator_ruby/openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.10.0"
+  }
+}

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 /*
- * OpenAPI
- * OpenAPI
  *
- * The version of the OpenAPI document: 0.0.1
+ *
+ *
+ *
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator
@@ -63,7 +63,7 @@ public class Access {
   private String interphone;
 
   public static final String JSON_PROPERTY_ACCESS_CODE = "accessCode";
-  private List<String> accessCode = new ArrayList<>();
+  private List<String> accessCode;
 
   public static final String JSON_PROPERTY_ELEVATOR = "elevator";
   private String elevator;
@@ -158,7 +158,7 @@ public Access accessCode(List<String> accessCode) {
     return this;
   }
 
-  public Access addaccessCodeItem(String accessCodeItem) {
+  public Access addAccessCodeItem(String accessCodeItem) {
     if (this.accessCode == null) {
       this.accessCode = new ArrayList<>();
     }

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 /*
- * OpenAPI
- * OpenAPI
  *
- * The version of the OpenAPI document: 0.0.1
+ *
+ *
+ *
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator
@@ -50,7 +50,7 @@
 
 public class AdditionalInformation {
   public static final String JSON_PROPERTY_CUSTOM_MAP = "customMap";
-  private List<CustomMap> customMap = new ArrayList<>();
+  private List<CustomMap> customMap;
 
   public AdditionalInformation() {}
 
@@ -60,7 +60,7 @@ public AdditionalInformation customMap(List<CustomMap> customMap) {
     return this;
   }
 
-  public AdditionalInformation addcustomMapItem(CustomMap customMapItem) {
+  public AdditionalInformation addCustomMapItem(CustomMap customMapItem) {
     if (this.customMap == null) {
       this.customMap = new ArrayList<>();
     }

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 /*
- * OpenAPI
- * OpenAPI
  *
- * The version of the OpenAPI document: 0.0.1
+ *
+ *
+ *
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator
@@ -75,9 +75,9 @@ public class Alert {
    * fonctionnalités faisant ressortir les dossiers avec le libellé ATTENTION
    */
   public enum ReportingEnum {
-    STANDARD(String.valueOf("STANDARD")),
+    STANDARD("STANDARD"),
 
-    ATTENTION(String.valueOf("ATTENTION"));
+    ATTENTION("ATTENTION");
 
     private String value;
 
@@ -108,7 +108,7 @@ public static ReportingEnum fromValue(String value) {
   private ReportingEnum reporting;
 
   public static final String JSON_PROPERTY_NOTES = "notes";
-  private List<Notes> notes = new ArrayList<>();
+  private List<Notes> notes;
 
   public static final String JSON_PROPERTY_CALLER = "caller";
   private Caller caller;
@@ -123,7 +123,7 @@ public static ReportingEnum fromValue(String value) {
   private CallTaker callTaker;
 
   public static final String JSON_PROPERTY_ATTACHMENT = "attachment";
-  private List<Attachment> attachment = new ArrayList<>();
+  private List<Attachment> attachment;
 
   public Alert() {}
 
@@ -221,7 +221,7 @@ public Alert notes(List<Notes> notes) {
     return this;
   }
 
-  public Alert addnotesItem(Notes notesItem) {
+  public Alert addNotesItem(Notes notesItem) {
     if (this.notes == null) {
       this.notes = new ArrayList<>();
     }
@@ -352,7 +352,7 @@ public Alert attachment(List<Attachment> attachment) {
     return this;
   }
 
-  public Alert addattachmentItem(Attachment attachmentItem) {
+  public Alert addAttachmentItem(Attachment attachmentItem) {
     if (this.attachment == null) {
       this.attachment = new ArrayList<>();
     }

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 /*
- * OpenAPI
- * OpenAPI
  *
- * The version of the OpenAPI document: 0.0.1
+ *
+ *
+ *
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 /*
- * OpenAPI
- * OpenAPI
  *
- * The version of the OpenAPI document: 0.0.1
+ *
+ *
+ *
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator