diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/code_list/CodeListItem.java b/src/main/java/fr/insee/rmes/bauhaus_services/code_list/CodeListItem.java index 1e1791e43..f0a6796d5 100644 --- a/src/main/java/fr/insee/rmes/bauhaus_services/code_list/CodeListItem.java +++ b/src/main/java/fr/insee/rmes/bauhaus_services/code_list/CodeListItem.java @@ -10,13 +10,13 @@ public class CodeListItem { private static String classLink = "fr.insee.rmes.bauhaus_services.code_list.CodeListItem"; - @Schema(description = "Iri", required = true) + @Schema(description = "Iri", requiredMode = Schema.RequiredMode.REQUIRED) private String iri; - @Schema(description = "Code", required = true) + @Schema(description = "Code", requiredMode = Schema.RequiredMode.REQUIRED) private String code; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) private String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/code_list/DetailedCodeList.java b/src/main/java/fr/insee/rmes/bauhaus_services/code_list/DetailedCodeList.java index a73f32146..c8a87c5d1 100644 --- a/src/main/java/fr/insee/rmes/bauhaus_services/code_list/DetailedCodeList.java +++ b/src/main/java/fr/insee/rmes/bauhaus_services/code_list/DetailedCodeList.java @@ -9,10 +9,10 @@ public class DetailedCodeList { - @Schema(description = "Notation", required = true) + @Schema(description = "Notation", requiredMode = Schema.RequiredMode.REQUIRED) public String notation; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String codeListLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabel.java b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabel.java index dd9442b52..30afceb01 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabel.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabel.java @@ -4,10 +4,10 @@ public class IdLabel { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; } diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabel.java b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabel.java index fbf7d876e..fcc4b7fe3 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabel.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabel.java @@ -4,10 +4,10 @@ public class IdLabelAltLabel { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; @Schema(description = "Alternative label") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabelSims.java b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabelSims.java index 20a4dc03b..a08d524d2 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabelSims.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelAltLabelSims.java @@ -4,10 +4,10 @@ public class IdLabelAltLabelSims { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; @Schema(description = "Alternative label") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelTwoLangs.java b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelTwoLangs.java index 85e2f62c2..65f7449d1 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelTwoLangs.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/IdLabelTwoLangs.java @@ -8,10 +8,10 @@ public class IdLabelTwoLangs { private static String classLink = "fr.insee.rmes.config.swagger.model.IdLabelTwoLangs"; - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/LabelUrl.java b/src/main/java/fr/insee/rmes/config/swagger/model/LabelUrl.java index c817f3c8b..5b8613fb1 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/LabelUrl.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/LabelUrl.java @@ -4,10 +4,10 @@ public class LabelUrl { - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; - @Schema(description = "Url", required = true) + @Schema(description = "Url", requiredMode = Schema.RequiredMode.REQUIRED) public String url; } diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/application/Init.java b/src/main/java/fr/insee/rmes/config/swagger/model/application/Init.java index fa4c360f8..a995745b5 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/application/Init.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/application/Init.java @@ -4,25 +4,25 @@ public class Init { - @Schema(description = "Base host URL of front-end", required = true) + @Schema(description = "Base host URL of front-end", requiredMode = Schema.RequiredMode.REQUIRED) public String appHost; - @Schema(description = "Base host URL of the authorization service", required = true) + @Schema(description = "Base host URL of the authorization service", requiredMode = Schema.RequiredMode.REQUIRED) public String authorizationHost; - @Schema(description = "Default concept contributor", required = true) + @Schema(description = "Default concept contributor", requiredMode = Schema.RequiredMode.REQUIRED) public String defaultContributor; - @Schema(description = "Mail sender adress", required = true) + @Schema(description = "Mail sender adress", requiredMode = Schema.RequiredMode.REQUIRED) public String defaultMailSender; - @Schema(description = "Max length of concept scope note", required = true) + @Schema(description = "Max length of concept scope note", requiredMode = Schema.RequiredMode.REQUIRED) public String maxLengthScopeNote; - @Schema(description = "First lang of application", required = true) + @Schema(description = "First lang of application", requiredMode = Schema.RequiredMode.REQUIRED) public String lg1; - @Schema(description = "Second lang of application", required = true) + @Schema(description = "Second lang of application", requiredMode = Schema.RequiredMode.REQUIRED) public String lg2; @Schema(description = "Type of authentication", allowableValues = {"NoAuthImpl,BasicAuthImpl,OpenIDConnectAuth"}) diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/application/Persons.java b/src/main/java/fr/insee/rmes/config/swagger/model/application/Persons.java index 0dbcf6588..793a33917 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/application/Persons.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/application/Persons.java @@ -3,13 +3,13 @@ import io.swagger.v3.oas.annotations.media.Schema; public class Persons { - @Schema(description = "Id", required=true, example= "Id of Sir Toto") + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED, example= "Id of Sir Toto") public String id; - @Schema(description = "Label", required = true, example = "Sir Toto") + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED, example = "Sir Toto") public String label; - @Schema(description = "Stamps", required = true, example = "DR59-SIN") + @Schema(description = "Stamps", requiredMode = Schema.RequiredMode.REQUIRED, example = "DR59-SIN") public String stamp; } diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/classifications/FamilyClass.java b/src/main/java/fr/insee/rmes/config/swagger/model/classifications/FamilyClass.java index 47dc501d7..4b9479ac9 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/classifications/FamilyClass.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/classifications/FamilyClass.java @@ -4,7 +4,7 @@ public class FamilyClass { - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; } diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/classifications/Members.java b/src/main/java/fr/insee/rmes/config/swagger/model/classifications/Members.java index d6aeb74a7..fd6d656e9 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/classifications/Members.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/classifications/Members.java @@ -4,10 +4,10 @@ public class Members { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelList.java b/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelList.java index 95afb9fc6..6b76e5175 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelList.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelList.java @@ -3,10 +3,10 @@ import io.swagger.v3.oas.annotations.media.Schema; public class CodeLabelList { - @Schema(description = "Code", required = true) + @Schema(description = "Code", requiredMode = Schema.RequiredMode.REQUIRED) public String code; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelTwoLangs.java b/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelTwoLangs.java index a33f68bea..617b93954 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelTwoLangs.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeLabelTwoLangs.java @@ -6,10 +6,10 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class CodeLabelTwoLangs { - @Schema(description = "Code", required = true) + @Schema(description = "Code", requiredMode = Schema.RequiredMode.REQUIRED) public String code; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeList.java b/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeList.java index 3fa972237..f5fd4f929 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeList.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/code_list/CodeList.java @@ -11,7 +11,7 @@ public class CodeList { @Schema(description="Code list notation") public String notation; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionById.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionById.java index e0de30e06..31a392812 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionById.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionById.java @@ -4,10 +4,10 @@ public class CollectionById { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") @@ -19,16 +19,16 @@ public class CollectionById { @Schema(description = "Description lg2") public String descriptionLg2; - @Schema(description = "Owner", required = true) + @Schema(description = "Owner", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; - @Schema(description = "Contributor", required = true) + @Schema(description = "Contributor", requiredMode = Schema.RequiredMode.REQUIRED) public String contributor; - @Schema(description = "Is concept validated", required = true) + @Schema(description = "Is concept validated", requiredMode = Schema.RequiredMode.REQUIRED) public Boolean isValidated; - @Schema(description = "Creation date", required = true) + @Schema(description = "Creation date", requiredMode = Schema.RequiredMode.REQUIRED) public String created; @Schema(description = "Modification date") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionMembers.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionMembers.java index 21af63cf6..f1d17b38e 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionMembers.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionMembers.java @@ -4,10 +4,10 @@ public class CollectionMembers { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsDashboard.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsDashboard.java index 844eead62..b3ece9e2b 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsDashboard.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsDashboard.java @@ -4,19 +4,19 @@ public class CollectionsDashboard { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; - @Schema(description = "Owner", required = true) + @Schema(description = "Owner", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; - @Schema(description = "Is collection validated", required = true) + @Schema(description = "Is collection validated", requiredMode = Schema.RequiredMode.REQUIRED) public Boolean isValidated; - @Schema(description = "Creation date", required = true) + @Schema(description = "Creation date", requiredMode = Schema.RequiredMode.REQUIRED) public String created; @Schema(description = "Modification date") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsToValidate.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsToValidate.java index 32edba221..4b304945f 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsToValidate.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/CollectionsToValidate.java @@ -4,13 +4,13 @@ public class CollectionsToValidate { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; - @Schema(description = "Owner", required = true) + @Schema(description = "Owner", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; } diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptById.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptById.java index 8b7970da5..f4ca86af2 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptById.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptById.java @@ -5,10 +5,10 @@ public class ConceptById { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") @@ -20,16 +20,16 @@ public class ConceptById { @Schema(description = "Alternative label lg2") public String altLabelLg2; - @Schema(description = "Owner", required = true) + @Schema(description = "Owner", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; - @Schema(description = "Contributor", required = true) + @Schema(description = "Contributor", requiredMode = Schema.RequiredMode.REQUIRED) public String contributor; - @Schema(description = "Dissemination status", required = true) + @Schema(description = "Dissemination status", requiredMode = Schema.RequiredMode.REQUIRED) public DisseminationStatus disseminationStatus; - @Schema(description = "Is concept validated", required = true) + @Schema(description = "Is concept validated", requiredMode = Schema.RequiredMode.REQUIRED) public Boolean isValidated; @Schema(description = "Additional material") @@ -38,7 +38,7 @@ public class ConceptById { @Schema(description = "Concept version") public String conceptVersion; - @Schema(description = "Creation date", required = true) + @Schema(description = "Creation date", requiredMode = Schema.RequiredMode.REQUIRED) public String created; @Schema(description = "Modification date") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptLinks.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptLinks.java index 5cdc59a5c..78f0ea65a 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptLinks.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptLinks.java @@ -4,13 +4,13 @@ public class ConceptLinks { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Type of link", required = true) + @Schema(description = "Type of link", requiredMode = Schema.RequiredMode.REQUIRED) public String typeOfLink; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsSearch.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsSearch.java index 0f5817794..a895d13b4 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsSearch.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsSearch.java @@ -5,25 +5,25 @@ public class ConceptsSearch { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; - @Schema(description = "Owner", required = true) + @Schema(description = "Owner", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; - @Schema(description = "Dissemination status", required = true) + @Schema(description = "Dissemination status", requiredMode = Schema.RequiredMode.REQUIRED) public DisseminationStatus disseminationStatus; - @Schema(description = "Validation status", required = true) + @Schema(description = "Validation status", requiredMode = Schema.RequiredMode.REQUIRED) public Boolean validationStatus; @Schema(description = "Definition") public String definition; - @Schema(description = "Creation date", required = true) + @Schema(description = "Creation date", requiredMode = Schema.RequiredMode.REQUIRED) public String created; @Schema(description = "Modification date") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsToValidate.java b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsToValidate.java index a176e6516..3e51acc42 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsToValidate.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/concepts/ConceptsToValidate.java @@ -4,13 +4,13 @@ public class ConceptsToValidate { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; - @Schema(description = "Owner", required = true) + @Schema(description = "Owner", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; @Schema(description = "Expiration date") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/organizations/Organization.java b/src/main/java/fr/insee/rmes/config/swagger/model/organizations/Organization.java index 6c41add0f..2bf2e7e78 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/organizations/Organization.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/organizations/Organization.java @@ -4,10 +4,10 @@ public class Organization { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/structure/IdLabelType.java b/src/main/java/fr/insee/rmes/config/swagger/model/structure/IdLabelType.java index 6c331992d..2501a2969 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/structure/IdLabelType.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/structure/IdLabelType.java @@ -4,13 +4,13 @@ public class IdLabelType { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label", required = true) + @Schema(description = "Label", requiredMode = Schema.RequiredMode.REQUIRED) public String label; - @Schema(description = "Type", required = true) + @Schema(description = "Type", requiredMode = Schema.RequiredMode.REQUIRED) public String type; } diff --git a/src/main/java/fr/insee/rmes/config/swagger/model/structure/StructureById.java b/src/main/java/fr/insee/rmes/config/swagger/model/structure/StructureById.java index ce0ed7d3c..4e8057089 100644 --- a/src/main/java/fr/insee/rmes/config/swagger/model/structure/StructureById.java +++ b/src/main/java/fr/insee/rmes/config/swagger/model/structure/StructureById.java @@ -4,16 +4,16 @@ public class StructureById { - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; - @Schema(description = "Label lg2", required = false) + @Schema(description = "Label lg2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String labelLg2; - @Schema(description = "Description lg1", required = false) + @Schema(description = "Description lg1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String descriptionLg1; - @Schema(description = "Description lg2", required = false) + @Schema(description = "Description lg2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String descriptionLg2; } diff --git a/src/main/java/fr/insee/rmes/model/classification/Classification.java b/src/main/java/fr/insee/rmes/model/classification/Classification.java index d94874207..8f5111c7b 100644 --- a/src/main/java/fr/insee/rmes/model/classification/Classification.java +++ b/src/main/java/fr/insee/rmes/model/classification/Classification.java @@ -6,7 +6,7 @@ public class Classification { @Schema(description = "Id") public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") @@ -61,22 +61,22 @@ public class Classification { @Schema(description = "") public String idVariant; - @Schema(description = "Dissemination status", required = true) + @Schema(description = "Dissemination status", requiredMode = Schema.RequiredMode.REQUIRED) public String disseminationStatus; - @Schema(description = "Additional Material", required = true) + @Schema(description = "Additional Material", requiredMode = Schema.RequiredMode.REQUIRED) public String additionalMaterial; - @Schema(description = "Legal Material", required = true) + @Schema(description = "Legal Material", requiredMode = Schema.RequiredMode.REQUIRED) public String legalMaterial; - @Schema(description = "Homepage", required = true) + @Schema(description = "Homepage", requiredMode = Schema.RequiredMode.REQUIRED) public String homepage; - @Schema(description = "Creator", required = true) + @Schema(description = "Creator", requiredMode = Schema.RequiredMode.REQUIRED) public String creator; - @Schema(description = "Contributor", required = true) + @Schema(description = "Contributor", requiredMode = Schema.RequiredMode.REQUIRED) public String contributor; @Schema(description = "validationState") diff --git a/src/main/java/fr/insee/rmes/model/classification/ClassificationItem.java b/src/main/java/fr/insee/rmes/model/classification/ClassificationItem.java index 89477fb3a..798c77a64 100644 --- a/src/main/java/fr/insee/rmes/model/classification/ClassificationItem.java +++ b/src/main/java/fr/insee/rmes/model/classification/ClassificationItem.java @@ -8,7 +8,7 @@ public class ClassificationItem { @Schema(description = "Id") public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/model/links/OperationsLink.java b/src/main/java/fr/insee/rmes/model/links/OperationsLink.java index 648a86472..ccef025ce 100644 --- a/src/main/java/fr/insee/rmes/model/links/OperationsLink.java +++ b/src/main/java/fr/insee/rmes/model/links/OperationsLink.java @@ -9,7 +9,7 @@ public class OperationsLink { public static final String CLASS_NAME = "fr.insee.rmes.model.links.OperationsLink"; - @Schema(description = "Id of the resource linked", required = true) + @Schema(description = "Id of the resource linked", requiredMode = Schema.RequiredMode.REQUIRED) public String id; @Schema(description = "Type of object") diff --git a/src/main/java/fr/insee/rmes/model/operations/Family.java b/src/main/java/fr/insee/rmes/model/operations/Family.java index 72936ffad..073f73cfd 100644 --- a/src/main/java/fr/insee/rmes/model/operations/Family.java +++ b/src/main/java/fr/insee/rmes/model/operations/Family.java @@ -7,10 +7,10 @@ public class Family { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/model/operations/Indicator.java b/src/main/java/fr/insee/rmes/model/operations/Indicator.java index 04ec7c72f..0e657a303 100644 --- a/src/main/java/fr/insee/rmes/model/operations/Indicator.java +++ b/src/main/java/fr/insee/rmes/model/operations/Indicator.java @@ -14,10 +14,10 @@ public class Indicator { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/model/operations/Operation.java b/src/main/java/fr/insee/rmes/model/operations/Operation.java index 4db1e12ae..b99b12c98 100644 --- a/src/main/java/fr/insee/rmes/model/operations/Operation.java +++ b/src/main/java/fr/insee/rmes/model/operations/Operation.java @@ -6,10 +6,10 @@ public class Operation { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/model/operations/Series.java b/src/main/java/fr/insee/rmes/model/operations/Series.java index 7509dd984..210afb472 100644 --- a/src/main/java/fr/insee/rmes/model/operations/Series.java +++ b/src/main/java/fr/insee/rmes/model/operations/Series.java @@ -11,10 +11,10 @@ public class Series { - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String prefLabelLg1; @Schema(description = "Label lg2") diff --git a/src/main/java/fr/insee/rmes/model/organizations/Organization.java b/src/main/java/fr/insee/rmes/model/organizations/Organization.java index 2c9d149f8..c71ebeac0 100644 --- a/src/main/java/fr/insee/rmes/model/organizations/Organization.java +++ b/src/main/java/fr/insee/rmes/model/organizations/Organization.java @@ -6,10 +6,10 @@ public class Organization { private static String classLink = "fr.insee.rmes.model.organizations.Organization"; - @Schema(description = "Id", required = true) + @Schema(description = "Id", requiredMode = Schema.RequiredMode.REQUIRED) public String id; - @Schema(description = "Label lg1", required = true) + @Schema(description = "Label lg1", requiredMode = Schema.RequiredMode.REQUIRED) public String labelLg1; @Schema(description = "Label lg2") diff --git a/src/test/java/fr/insee/rmes/config/swagger/model/structure/StructureComponentById.java b/src/test/java/fr/insee/rmes/config/swagger/model/structure/StructureComponentById.java deleted file mode 100644 index c74521070..000000000 --- a/src/test/java/fr/insee/rmes/config/swagger/model/structure/StructureComponentById.java +++ /dev/null @@ -1,34 +0,0 @@ -package fr.insee.rmes.config.swagger.model.structure; - -import io.swagger.v3.oas.annotations.media.Schema; - -public class StructureComponentById { - - @Schema(description = "Label lg1", required = true) - public String labelLg1; - - @Schema(description = "Label lg2", required = false) - public String labelLg2; - - @Schema(description = "Concept label lg1", required = true) - public String conceptLabelLg1; - - @Schema(description = "Concept label lg2", required = false) - public String conceptLabelLg2; - - @Schema(description = "Range label lg1", required = true) - public String rangeLabelLg1; - - @Schema(description = "Range label lg2", required = false) - public String rangeLabelLg2; - - @Schema(description = "Code list label lg1", required = false) - public String codeListLabelLg1; - - @Schema(description = "Code list label lg2", required = false) - public String codeListLabelLg2; - - @Schema(description = "Attachment URI", required = false) - public String attachment; - -}