diff --git a/multiapi-engine/src/main/resources/templates/openapi/templateSchema.ftlh b/multiapi-engine/src/main/resources/templates/openapi/templateSchema.ftlh index 094f380d..8ba8e1a6 100644 --- a/multiapi-engine/src/main/resources/templates/openapi/templateSchema.ftlh +++ b/multiapi-engine/src/main/resources/templates/openapi/templateSchema.ftlh @@ -277,15 +277,12 @@ public class ${schema.className} { } <#list schema.fieldObjectList as field> - /** - * Get ${field.baseName?uncap_first} - * @return ${field.baseName?uncap_first} - */ @Schema(name = "${field.baseName?uncap_first}", required = <#if field.required?has_content && field.required == true>true<#else>false) <#if field.dataType.baseType == "array"> public ${field.dataType} get${field.baseName?cap_first}() { return ${field.baseName?uncap_first}; } + <#if field.required == false> public void set${field.baseName?cap_first}(${field.dataType} ${field.baseName?uncap_first}) { this.${field.baseName?uncap_first} = ${field.baseName?uncap_first}; @@ -358,10 +355,6 @@ public class ${schema.className} { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -384,9 +377,8 @@ public class ${schema.className} { } } - <#list schema.fieldObjectList as field> - <#if field.required> + <#if field.required> private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testAdditionalPropertiesWithUnnamedObject/assets/EnumSchemaDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testAdditionalPropertiesWithUnnamedObject/assets/EnumSchemaDTO.java index a29b5c17..d7b71d79 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testAdditionalPropertiesWithUnnamedObject/assets/EnumSchemaDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testAdditionalPropertiesWithUnnamedObject/assets/EnumSchemaDTO.java @@ -35,7 +35,6 @@ public String toString() { } } - @Builder @Jacksonized private EnumSchemaDTO(EnumSchema enumSchema) { diff --git a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiErrorDTO.java index 74cdfc4a..84e6cfd5 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiErrorDTO.java @@ -59,19 +59,11 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +96,6 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +103,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestAllOfDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestAllOfDTO.java index 48101299..39aebe6c 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestAllOfDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestAllOfDTO.java @@ -63,10 +63,7 @@ public ApiTestAllOfDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -75,10 +72,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = false) public String getTestName() { return testName; @@ -114,10 +108,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -126,5 +117,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestDTO.java index 25b95615..8698cb78 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestDTO.java @@ -69,19 +69,13 @@ public ApiTestDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = true) public List getTesters() { return testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -114,10 +108,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -125,7 +116,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestInfoDTO.java index 221288ad..e96573a1 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestsDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestsDTO.java index 94cc1f96..d9c4790d 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestsDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testAllOf/assets/testApi/ApiTestsDTO.java @@ -35,10 +35,7 @@ public ApiTestsDTO build() { } } - /** - * Get apiTestDTO - * @return apiTestDTO - */ + @Schema(name = "apiTestDTO", required = false) public ApiTestDTO getApiTestDTO() { return apiTestDTO; @@ -73,10 +70,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -85,5 +79,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiErrorDTO.java index b8f5ee6d..7e8c4b99 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiErrorDTO.java @@ -59,19 +59,13 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestDTO.java index 1d659209..4a49cae7 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestDTO.java @@ -152,37 +152,24 @@ public ApiTestDTO build() { } } - /** - * Get unionEnum - * @return unionEnum - */ + @Schema(name = "unionEnum", required = true) public UnionEnum getUnionEnum() { return unionEnum; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; } - /** - * Get unionIntegerEnum - * @return unionIntegerEnum - */ @Schema(name = "unionIntegerEnum", required = false) public UnionIntegerEnum getUnionIntegerEnum() { return unionIntegerEnum; @@ -191,10 +178,7 @@ public void setUnionIntegerEnum(UnionIntegerEnum unionIntegerEnum) { this.unionIntegerEnum = unionIntegerEnum; } - /** - * Get unionNumberEnum - * @return unionNumberEnum - */ + @Schema(name = "unionNumberEnum", required = false) public UnionNumberEnum getUnionNumberEnum() { return unionNumberEnum; @@ -233,10 +217,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -244,7 +225,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestInfoDTO.java index 7fae36ec..ccf6d617 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsGeneration/assets/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsLombokGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsLombokGeneration/assets/ApiTestDTO.java index 0688d92a..cb5f2140 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsLombokGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiEnumsLombokGeneration/assets/ApiTestDTO.java @@ -96,7 +96,6 @@ public String toString() { } } - @Builder @Jacksonized private ApiTestDTO(UnionEnum unionEnum, @NonNull String name, @NonNull Integer id, UnionIntegerEnum unionIntegerEnum, UnionNumberEnum unionNumberEnum) { diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiErrorDTO.java index 8b096b09..30fd87ea 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiErrorDTO.java @@ -59,19 +59,13 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiInlineParameterTestIdDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiInlineParameterTestIdDTO.java index 86cc1d23..6a957e41 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiInlineParameterTestIdDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiInlineParameterTestIdDTO.java @@ -43,10 +43,7 @@ public ApiInlineParameterTestIdDTO build() { } } - /** - * Get email - * @return email - */ + @Schema(name = "email", required = false) public String getEmail() { return email; @@ -81,10 +78,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -93,5 +87,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestDTO.java index 9632956d..f588f5f3 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestDTO.java @@ -59,19 +59,13 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestInfoDTO.java index 25000915..a80440cc 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiParametersWithContentGeneration/assets/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/ErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/ErrorDTO.java index f136cc30..c7d0e0b1 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/ErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/ErrorDTO.java @@ -59,19 +59,13 @@ public ErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestDTO.java index d6d8fdeb..793450ee 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestDTO.java @@ -59,19 +59,13 @@ public TestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestInfoDTO.java index f4e57673..b184ccb3 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathParameterGeneration/assets/TestInfoDTO.java @@ -68,10 +68,7 @@ public TestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiErrorDTO.java index ce3a6203..eea4e7cb 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiErrorDTO.java @@ -59,19 +59,13 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestDTO.java index 03ba36ea..0eb64872 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestDTO.java @@ -59,19 +59,13 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestInfoDTO.java index d0522b6d..456365f7 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/TestSchemaApi.java b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/TestSchemaApi.java index d7eb0f81..13f8f456 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/TestSchemaApi.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiPathWithSpecialCharGeneration/assets/TestSchemaApi.java @@ -21,10 +21,7 @@ public interface TestSchemaApi { - /** - * GET /test_schema: List all available test - * @return A paged array of tests; (status code 200) - */ + @Operation( operationId = "listTest", diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/ErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/ErrorDTO.java index f136cc30..c7d0e0b1 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/ErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/ErrorDTO.java @@ -59,19 +59,13 @@ public ErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestDTO.java index d6d8fdeb..793450ee 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestDTO.java @@ -59,19 +59,13 @@ public TestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestInfoDTO.java index f4e57673..b184ccb3 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiQueryParameterGeneration/assets/TestInfoDTO.java @@ -68,10 +68,7 @@ public TestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiErrorDTO.java index f0866014..749d5b91 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiErrorDTO.java @@ -59,19 +59,13 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestDTO.java index 50ece870..f3525ddb 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestDTO.java @@ -59,19 +59,13 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestInfoDTO.java index 587da259..396626cb 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiReactiveGeneration/assets/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/ErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/ErrorDTO.java index 7ffe9a6d..1e78fe15 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/ErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/ErrorDTO.java @@ -59,19 +59,13 @@ public ErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestDTO.java index 90cf5752..86f902a8 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestDTO.java @@ -59,19 +59,13 @@ public TestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestInfoDTO.java index bc883f7e..b5340214 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestInfoDTO.java @@ -68,10 +68,7 @@ public TestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagFirstApi.java b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagFirstApi.java index 07e1e549..5fdb988d 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagFirstApi.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagFirstApi.java @@ -21,10 +21,7 @@ public interface TestTagFirstApi { - /** - * GET /test: List all available testServer - * @return A paged array of tests; (status code 200) - */ + @Operation( operationId = "listTestServer", diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagSecondApi.java b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagSecondApi.java index 9cec25f9..e1174913 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagSecondApi.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testApiTagsGeneration/assets/TestTagSecondApi.java @@ -21,11 +21,7 @@ public interface TestTagSecondApi { - /** - * GET /test/{testId}: Info for a specific test - * @param testId The id of the test to retrieve true - * @return Expected response to a valid request; (status code 200) - */ + @Operation( operationId = "showTestById", diff --git a/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/ErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/ErrorDTO.java index 81b93faa..9586eaf3 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/ErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/ErrorDTO.java @@ -52,19 +52,13 @@ public ErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -97,10 +91,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -108,7 +99,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestDTO.java index 043bc15f..4f4ef911 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestDTO.java @@ -52,19 +52,13 @@ public TestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -97,10 +91,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -108,7 +99,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestInfoDTO.java index 5e83374b..ba8d44b5 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testClientPackageWebClientApiGeneration/assets/TestInfoDTO.java @@ -62,10 +62,7 @@ public TestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -74,10 +71,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -110,10 +104,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -121,7 +112,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiArrayFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiArrayFieldDTO.java index c6788015..013736f2 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiArrayFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiArrayFieldDTO.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import com.sngular.multifileplugin.testcomplexanyof.model.ApiTypeArrayDTO; import java.util.List; import java.util.ArrayList; @@ -131,10 +132,6 @@ public ApiArrayFieldDTO build() { } } - /** - * Get uniqueItems - * @return uniqueItems - */ @Schema(name = "uniqueItems", required = false) public Boolean getUniqueItems() { return uniqueItems; @@ -143,10 +140,6 @@ public void setUniqueItems(Boolean uniqueItems) { this.uniqueItems = uniqueItems; } - /** - * Get type - * @return type - */ @Schema(name = "type", required = false) public String getType() { return type; @@ -155,10 +148,6 @@ public void setType(String type) { this.type = type; } - /** - * Get defaultValues - * @return defaultValues - */ @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -167,10 +156,6 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ @Schema(name = "name", required = false) public String getName() { return name; @@ -179,10 +164,6 @@ public void setName(String name) { this.name = name; } - /** - * Get arraySize - * @return arraySize - */ @Schema(name = "arraySize", required = false) public Integer getArraySize() { return arraySize; @@ -191,10 +172,6 @@ public void setArraySize(Integer arraySize) { this.arraySize = arraySize; } - /** - * Get regex - * @return regex - */ @Schema(name = "regex", required = false) public String getRegex() { return regex; @@ -203,10 +180,6 @@ public void setRegex(String regex) { this.regex = regex; } - /** - * Get minItems - * @return minItems - */ @Schema(name = "minItems", required = false) public Integer getMinItems() { return minItems; @@ -215,10 +188,6 @@ public void setMinItems(Integer minItems) { this.minItems = minItems; } - /** - * Get values - * @return values - */ @Schema(name = "values", required = false) public List getValues() { return values; @@ -260,10 +229,6 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -272,5 +237,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiBooleanFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiBooleanFieldDTO.java index a786a977..15c13b0a 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiBooleanFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiBooleanFieldDTO.java @@ -63,10 +63,6 @@ public ApiBooleanFieldDTO build() { } } - /** - * Get type - * @return type - */ @Schema(name = "type", required = false) public String getType() { return type; @@ -75,10 +71,6 @@ public void setType(String type) { this.type = type; } - /** - * Get name - * @return name - */ @Schema(name = "name", required = false) public String getName() { return name; @@ -87,10 +79,6 @@ public void setName(String name) { this.name = name; } - /** - * Get defaultValue - * @return defaultValue - */ @Schema(name = "defaultValue", required = false) public Boolean getDefaultValue() { return defaultValue; @@ -127,10 +115,6 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -139,5 +123,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDateFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDateFieldDTO.java index 39c63509..b7462da6 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDateFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDateFieldDTO.java @@ -73,10 +73,6 @@ public ApiDateFieldDTO build() { } } - /** - * Get type - * @return type - */ @Schema(name = "type", required = false) public String getType() { return type; @@ -85,10 +81,6 @@ public void setType(String type) { this.type = type; } - /** - * Get defaultValues - * @return defaultValues - */ @Schema(name = "defaultValues", required = false) public Object getDefaultValues() { return defaultValues; @@ -97,10 +89,6 @@ public void setDefaultValues(Object defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ @Schema(name = "name", required = false) public String getName() { return name; @@ -109,10 +97,6 @@ public void setName(String name) { this.name = name; } - /** - * Get format - * @return format - */ @Schema(name = "format", required = false) public String getFormat() { return format; @@ -150,10 +134,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -162,5 +143,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDefaultItemDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDefaultItemDTO.java index aba43bc8..1b3dfc06 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDefaultItemDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiDefaultItemDTO.java @@ -134,10 +134,7 @@ public ApiDefaultItemDTO build() { } } - /** - * Get stringField - * @return stringField - */ + @Schema(name = "stringField", required = false) public StringField getStringField() { return stringField; @@ -146,10 +143,7 @@ public void setStringField(StringField stringField) { this.stringField = stringField; } - /** - * Get sequenceField - * @return sequenceField - */ + @Schema(name = "sequenceField", required = false) public ApiSequenceFieldDTO getSequenceField() { return sequenceField; @@ -158,10 +152,7 @@ public void setSequenceField(ApiSequenceFieldDTO sequenceField) { this.sequenceField = sequenceField; } - /** - * Get dateField - * @return dateField - */ + @Schema(name = "dateField", required = false) public DateField getDateField() { return dateField; @@ -170,10 +161,7 @@ public void setDateField(DateField dateField) { this.dateField = dateField; } - /** - * Get enumField - * @return enumField - */ + @Schema(name = "enumField", required = false) public EnumField getEnumField() { return enumField; @@ -182,10 +170,7 @@ public void setEnumField(EnumField enumField) { this.enumField = enumField; } - /** - * Get booleanField - * @return booleanField - */ + @Schema(name = "booleanField", required = false) public BooleanField getBooleanField() { return booleanField; @@ -194,10 +179,7 @@ public void setBooleanField(BooleanField booleanField) { this.booleanField = booleanField; } - /** - * Get arrayField - * @return arrayField - */ + @Schema(name = "arrayField", required = false) public ArrayField getArrayField() { return arrayField; @@ -206,10 +188,7 @@ public void setArrayField(ArrayField arrayField) { this.arrayField = arrayField; } - /** - * Get numberField - * @return numberField - */ + @Schema(name = "numberField", required = false) public NumberField getNumberField() { return numberField; @@ -218,10 +197,7 @@ public void setNumberField(NumberField numberField) { this.numberField = numberField; } - /** - * Get objectField - * @return objectField - */ + @Schema(name = "objectField", required = false) public ObjectField getObjectField() { return objectField; @@ -230,10 +206,7 @@ public void setObjectField(ObjectField objectField) { this.objectField = objectField; } - /** - * Get mapField - * @return mapField - */ + @Schema(name = "mapField", required = false) public MapField getMapField() { return mapField; @@ -242,10 +215,7 @@ public void setMapField(MapField mapField) { this.mapField = mapField; } - /** - * Get unionField - * @return unionField - */ + @Schema(name = "unionField", required = false) public ApiUnionFieldDTO getUnionField() { return unionField; @@ -289,10 +259,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -330,5 +297,4 @@ private void validatePartialCombinations() { } } - } \ No newline at end of file diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiEnumFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiEnumFieldDTO.java index 917472ca..8ec743a9 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiEnumFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiEnumFieldDTO.java @@ -101,10 +101,7 @@ public ApiEnumFieldDTO build() { } } - /** - * Get enumValues - * @return enumValues - */ + @Schema(name = "enumValues", required = false) public List getEnumValues() { return enumValues; @@ -113,10 +110,7 @@ public void setEnumValues(List enumValues) { this.enumValues = enumValues; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -125,10 +119,7 @@ public void setType(String type) { this.type = type; } - /** - * Get defaultValues - * @return defaultValues - */ + @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -137,10 +128,7 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -149,10 +137,7 @@ public void setName(String name) { this.name = name; } - /** - * Get defaultValue - * @return defaultValue - */ + @Schema(name = "defaultValue", required = false) public String getDefaultValue() { return defaultValue; @@ -191,10 +176,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -203,5 +185,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiMapFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiMapFieldDTO.java index c0f930b3..2a6d5e34 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiMapFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiMapFieldDTO.java @@ -111,10 +111,7 @@ public ApiMapFieldDTO build() { } } - /** - * Get keyType - * @return keyType - */ + @Schema(name = "keyType", required = false) public String getKeyType() { return keyType; @@ -123,10 +120,7 @@ public void setKeyType(String keyType) { this.keyType = keyType; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -135,10 +129,7 @@ public void setType(String type) { this.type = type; } - /** - * Get defaultValues - * @return defaultValues - */ + @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -147,10 +138,7 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -159,10 +147,7 @@ public void setName(String name) { this.name = name; } - /** - * Get mapSize - * @return mapSize - */ + @Schema(name = "mapSize", required = false) public Integer getMapSize() { return mapSize; @@ -171,10 +156,7 @@ public void setMapSize(Integer mapSize) { this.mapSize = mapSize; } - /** - * Get mapTypes - * @return mapTypes - */ + @Schema(name = "mapTypes", required = false) public List getMapTypes() { return mapTypes; @@ -214,10 +196,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -226,5 +205,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiNumberFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiNumberFieldDTO.java index f3b519b8..61f489fc 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiNumberFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiNumberFieldDTO.java @@ -183,10 +183,7 @@ public ApiNumberFieldDTO build() { } } - /** - * Get precision - * @return precision - */ + @Schema(name = "precision", required = false) public Integer getPrecision() { return precision; @@ -195,10 +192,7 @@ public void setPrecision(Integer precision) { this.precision = precision; } - /** - * Get maximum - * @return maximum - */ + @Schema(name = "maximum", required = false) public Integer getMaximum() { return maximum; @@ -207,10 +201,7 @@ public void setMaximum(Integer maximum) { this.maximum = maximum; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -219,10 +210,7 @@ public void setType(String type) { this.type = type; } - /** - * Get defaultValues - * @return defaultValues - */ + @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -231,10 +219,7 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -243,10 +228,7 @@ public void setName(String name) { this.name = name; } - /** - * Get multipleOf - * @return multipleOf - */ + @Schema(name = "multipleOf", required = false) public Integer getMultipleOf() { return multipleOf; @@ -255,10 +237,7 @@ public void setMultipleOf(Integer multipleOf) { this.multipleOf = multipleOf; } - /** - * Get scale - * @return scale - */ + @Schema(name = "scale", required = false) public Integer getScale() { return scale; @@ -267,10 +246,7 @@ public void setScale(Integer scale) { this.scale = scale; } - /** - * Get minimum - * @return minimum - */ + @Schema(name = "minimum", required = false) public Integer getMinimum() { return minimum; @@ -279,10 +255,7 @@ public void setMinimum(Integer minimum) { this.minimum = minimum; } - /** - * Get flagExclusiveMinimum - * @return flagExclusiveMinimum - */ + @Schema(name = "flagExclusiveMinimum", required = false) public Boolean getFlagExclusiveMinimum() { return flagExclusiveMinimum; @@ -291,10 +264,7 @@ public void setFlagExclusiveMinimum(Boolean flagExclusiveMinimum) { this.flagExclusiveMinimum = flagExclusiveMinimum; } - /** - * Get flagExclusiveMaximum - * @return flagExclusiveMaximum - */ + @Schema(name = "flagExclusiveMaximum", required = false) public Boolean getFlagExclusiveMaximum() { return flagExclusiveMaximum; @@ -303,10 +273,7 @@ public void setFlagExclusiveMaximum(Boolean flagExclusiveMaximum) { this.flagExclusiveMaximum = flagExclusiveMaximum; } - /** - * Get numberEnum - * @return numberEnum - */ + @Schema(name = "numberEnum", required = false) public NumberEnum getNumberEnum() { return numberEnum; @@ -315,10 +282,7 @@ public void setNumberEnum(NumberEnum numberEnum) { this.numberEnum = numberEnum; } - /** - * Get defaultValue - * @return defaultValue - */ + @Schema(name = "defaultValue", required = false) public Long getDefaultValue() { return defaultValue; @@ -364,10 +328,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -376,5 +337,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiObjectFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiObjectFieldDTO.java index 5e2ad61f..f25b7b79 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiObjectFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiObjectFieldDTO.java @@ -109,10 +109,7 @@ public ApiObjectFieldDTO build() { } } - /** - * Get requiredValues - * @return requiredValues - */ + @Schema(name = "requiredValues", required = false) public List getRequiredValues() { return requiredValues; @@ -121,10 +118,7 @@ public void setRequiredValues(List requiredValues) { this.requiredValues = requiredValues; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -133,10 +127,7 @@ public void setType(String type) { this.type = type; } - /** - * Get properties - * @return properties - */ + @Schema(name = "properties", required = false) public List getProperties() { return properties; @@ -145,10 +136,7 @@ public void setProperties(List properties) { this.properties = properties; } - /** - * Get defaultValues - * @return defaultValues - */ + @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -157,10 +145,7 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -199,10 +184,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -211,5 +193,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSchemaDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSchemaDTO.java index 39c3c999..63851fb0 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSchemaDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSchemaDTO.java @@ -120,19 +120,13 @@ public ApiSchemaDTO build() { } } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = true) public String getType() { return type; } - /** - * Get properties - * @return properties - */ + @Schema(name = "properties", required = false) public List getProperties() { return properties; @@ -141,37 +135,25 @@ public void setProperties(List properties) { this.properties = properties; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public String getId() { return id; } - /** - * Get subjectName - * @return subjectName - */ + @Schema(name = "subjectName", required = true) public String getSubjectName() { return subjectName; } - /** - * Get requiredFields - * @return requiredFields - */ + @Schema(name = "requiredFields", required = false) public List getRequiredFields() { return requiredFields; @@ -211,10 +193,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -222,7 +201,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSequenceFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSequenceFieldDTO.java index dc2b0189..12c091c8 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSequenceFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiSequenceFieldDTO.java @@ -156,10 +156,7 @@ public ApiSequenceFieldDTO build() { } } - /** - * Get elements - * @return elements - */ + @Schema(name = "elements", required = false) public Integer getElements() { return elements; @@ -168,10 +165,7 @@ public void setElements(Integer elements) { this.elements = elements; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -180,10 +174,7 @@ public void setType(String type) { this.type = type; } - /** - * Get properties - * @return properties - */ + @Schema(name = "properties", required = false) public List getProperties() { return properties; @@ -192,10 +183,7 @@ public void setProperties(List properties) { this.properties = properties; } - /** - * Get defaultValues - * @return defaultValues - */ + @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -204,10 +192,7 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get seqEnum - * @return seqEnum - */ + @Schema(name = "seqEnum", required = false) public SeqEnum getSeqEnum() { return seqEnum; @@ -216,10 +201,7 @@ public void setSeqEnum(SeqEnum seqEnum) { this.seqEnum = seqEnum; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -228,10 +210,7 @@ public void setName(String name) { this.name = name; } - /** - * Get initialValue - * @return initialValue - */ + @Schema(name = "initialValue", required = false) public String getInitialValue() { return initialValue; @@ -240,10 +219,7 @@ public void setInitialValue(String initialValue) { this.initialValue = initialValue; } - /** - * Get increment - * @return increment - */ + @Schema(name = "increment", required = false) public Integer getIncrement() { return increment; @@ -285,10 +261,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -297,5 +270,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiStringFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiStringFieldDTO.java index dffa5795..5249555c 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiStringFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiStringFieldDTO.java @@ -141,10 +141,7 @@ public ApiStringFieldDTO build() { } } - /** - * Get maxLength - * @return maxLength - */ + @Schema(name = "maxLength", required = false) public Integer getMaxLength() { return maxLength; @@ -153,10 +150,7 @@ public void setMaxLength(Integer maxLength) { this.maxLength = maxLength; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -165,10 +159,7 @@ public void setType(String type) { this.type = type; } - /** - * Get properties - * @return properties - */ + @Schema(name = "properties", required = false) public List getProperties() { return properties; @@ -177,10 +168,7 @@ public void setProperties(List properties) { this.properties = properties; } - /** - * Get defaultValues - * @return defaultValues - */ + @Schema(name = "defaultValues", required = false) public List getDefaultValues() { return defaultValues; @@ -189,10 +177,7 @@ public void setDefaultValues(List defaultValues) { this.defaultValues = defaultValues; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -201,10 +186,7 @@ public void setName(String name) { this.name = name; } - /** - * Get regex - * @return regex - */ + @Schema(name = "regex", required = false) public String getRegex() { return regex; @@ -213,10 +195,7 @@ public void setRegex(String regex) { this.regex = regex; } - /** - * Get minLength - * @return minLength - */ + @Schema(name = "minLength", required = false) public Integer getMinLength() { return minLength; @@ -225,10 +204,7 @@ public void setMinLength(Integer minLength) { this.minLength = minLength; } - /** - * Get format - * @return format - */ + @Schema(name = "format", required = false) public Integer getFormat() { return format; @@ -237,10 +213,7 @@ public void setFormat(Integer format) { this.format = format; } - /** - * Get valueLength - * @return valueLength - */ + @Schema(name = "valueLength", required = false) public Integer getValueLength() { return valueLength; @@ -283,10 +256,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -295,5 +265,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiTypeArrayDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiTypeArrayDTO.java index e389c02b..38f83ce0 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiTypeArrayDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiTypeArrayDTO.java @@ -5,59 +5,227 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.ArrayList; import com.sngular.multifileplugin.testcomplexanyof.model.exception.ModelClassException; @JsonDeserialize(builder = ApiTypeArrayDTO.ApiTypeArrayDTOBuilder.class) public class ApiTypeArrayDTO { - @JsonProperty(value ="stringField") - private ApiStringFieldDTO stringField; - @JsonProperty(value ="sequenceField") - private ApiSequenceFieldDTO sequenceField; - @JsonProperty(value ="dateField") - private ApiDateFieldDTO dateField; - @JsonProperty(value ="enumField") - private ApiEnumFieldDTO enumField; - @JsonProperty(value ="booleanField") - private ApiBooleanFieldDTO booleanField; - @JsonProperty(value ="arrayField") - private ApiArrayFieldDTO arrayField; - @JsonProperty(value ="numberField") - private ApiNumberFieldDTO numberField; - @JsonProperty(value ="objectField") - private ApiObjectFieldDTO objectField; - @JsonProperty(value ="mapField") - private ApiMapFieldDTO mapField; - @JsonProperty(value ="unionField") - private ApiUnionFieldDTO unionField; - - private ApiTypeArrayDTO(ApiStringFieldDTO stringField, ApiSequenceFieldDTO sequenceField, ApiDateFieldDTO dateField, ApiEnumFieldDTO enumField, ApiBooleanFieldDTO booleanField, ApiArrayFieldDTO arrayField, ApiNumberFieldDTO numberField, ApiObjectFieldDTO objectField, ApiMapFieldDTO mapField, ApiUnionFieldDTO unionField) { - this.stringField = stringField; - this.sequenceField = sequenceField; - this.dateField = dateField; - this.enumField = enumField; - this.booleanField = booleanField; - this.arrayField = arrayField; - this.numberField = numberField; - this.objectField = objectField; - this.mapField = mapField; - this.unionField = unionField; + @JsonProperty(value ="precision") + private Integer precision; + @JsonProperty(value ="defaultItem") + private defaultItem; + @JsonProperty(value ="maximum") + private Integer maximum; + @JsonProperty(value ="type") + private String type; + @JsonProperty(value ="scale") + private Integer scale; + @JsonProperty(value ="minLength") + private Integer minLength; + @JsonProperty(value ="increment") + private Integer increment; + @JsonProperty(value ="keyType") + private String keyType; + @JsonProperty(value ="requiredValues") + private List requiredValues = new ArrayList(); + @JsonProperty(value ="optionalUnion") + private Boolean optionalUnion; + @JsonProperty(value ="initialValue") + private String initialValue; + @JsonProperty(value ="flagExclusiveMinimum") + private Boolean flagExclusiveMinimum; + @JsonProperty(value ="flagExclusiveMaximum") + private Boolean flagExclusiveMaximum; + @JsonProperty(value ="defaultValue") + private Boolean defaultValue; + @JsonProperty(value ="enumValues") + private List enumValues = new ArrayList(); + @JsonProperty(value ="properties") + private List properties = new ArrayList(); + @JsonProperty(value ="defaultValues") + private List defaultValues = new ArrayList(); + @JsonProperty(value ="unionEnum") + private UnionEnum unionEnum; + public enum UnionEnum { + ONEOF("oneof"), + ANYOF("anyof"), + ALLOF("allof"); + + private String value; + + UnionEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + } + @JsonProperty(value ="seqEnum") + private SeqEnum seqEnum; + public enum SeqEnum { + MONTH("MONTH"), + YEAR("YEAR"), + HOUR("HOUR"), + MINUTE("MINUTE"), + SECOND("SECOND"), + DAY("DAY"); + + private String value; + + SeqEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + } + @JsonProperty(value ="arraySize") + private Integer arraySize; + @JsonProperty(value ="multipleOf") + private Integer multipleOf; + @JsonProperty(value ="mapSize") + private Integer mapSize; + @JsonProperty(value ="mapTypes") + private List mapTypes = new ArrayList(); + @JsonProperty(value ="format") + private Integer format; + @JsonProperty(value ="generatedFlag") + private Boolean generatedFlag; + @JsonProperty(value ="maxLength") + private Integer maxLength; + @JsonProperty(value ="uniqueItems") + private Boolean uniqueItems; + @JsonProperty(value ="elements") + private Integer elements; + @JsonProperty(value ="name") + private String name; + @JsonProperty(value ="regex") + private String regex; + @JsonProperty(value ="minItems") + private Integer minItems; + @JsonProperty(value ="values") + private List values = new ArrayList(); + @JsonProperty(value ="minimum") + private Integer minimum; + @JsonProperty(value ="numberEnum") + private NumberEnum numberEnum; + public enum NumberEnum { + FLOAT("float"), + INTEGER("integer"); + + private String value; + + NumberEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + } + @JsonProperty(value ="valueLength") + private Integer valueLength; + + private ApiTypeArrayDTO(Integer precision, defaultItem, Integer maximum, String type, Integer scale, Integer minLength, Integer increment, String keyType, List requiredValues, Boolean optionalUnion, String initialValue, Boolean flagExclusiveMinimum, Boolean flagExclusiveMaximum, Boolean defaultValue, List enumValues, List properties, List defaultValues, UnionEnum unionEnum, SeqEnum seqEnum, Integer arraySize, Integer multipleOf, Integer mapSize, List mapTypes, Integer format, Boolean generatedFlag, Integer maxLength, Boolean uniqueItems, Integer elements, String name, String regex, Integer minItems, List values, Integer minimum, NumberEnum numberEnum, Integer valueLength) { + this.precision = precision; + this.defaultItem = defaultItem; + this.maximum = maximum; + this.type = type; + this.scale = scale; + this.minLength = minLength; + this.increment = increment; + this.keyType = keyType; + this.requiredValues = requiredValues; + this.optionalUnion = optionalUnion; + this.initialValue = initialValue; + this.flagExclusiveMinimum = flagExclusiveMinimum; + this.flagExclusiveMaximum = flagExclusiveMaximum; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + this.properties = properties; + this.defaultValues = defaultValues; + this.unionEnum = unionEnum; + this.seqEnum = seqEnum; + this.arraySize = arraySize; + this.multipleOf = multipleOf; + this.mapSize = mapSize; + this.mapTypes = mapTypes; + this.format = format; + this.generatedFlag = generatedFlag; + this.maxLength = maxLength; + this.uniqueItems = uniqueItems; + this.elements = elements; + this.name = name; + this.regex = regex; + this.minItems = minItems; + this.values = values; + this.minimum = minimum; + this.numberEnum = numberEnum; + this.valueLength = valueLength; validatePartialCombinations(); } private ApiTypeArrayDTO(ApiTypeArrayDTOBuilder builder) { - this.stringField = builder.stringField; - this.sequenceField = builder.sequenceField; - this.dateField = builder.dateField; - this.enumField = builder.enumField; - this.booleanField = builder.booleanField; - this.arrayField = builder.arrayField; - this.numberField = builder.numberField; - this.objectField = builder.objectField; - this.mapField = builder.mapField; - this.unionField = builder.unionField; + this.precision = builder.precision; + this.defaultItem = builder.defaultItem; + this.maximum = builder.maximum; + this.type = builder.type; + this.scale = builder.scale; + this.minLength = builder.minLength; + this.increment = builder.increment; + this.keyType = builder.keyType; + this.requiredValues = builder.requiredValues; + this.optionalUnion = builder.optionalUnion; + this.initialValue = builder.initialValue; + this.flagExclusiveMinimum = builder.flagExclusiveMinimum; + this.flagExclusiveMaximum = builder.flagExclusiveMaximum; + this.defaultValue = builder.defaultValue; + this.enumValues = builder.enumValues; + this.properties = builder.properties; + this.defaultValues = builder.defaultValues; + this.unionEnum = builder.unionEnum; + this.seqEnum = builder.seqEnum; + this.arraySize = builder.arraySize; + this.multipleOf = builder.multipleOf; + this.mapSize = builder.mapSize; + this.mapTypes = builder.mapTypes; + this.format = builder.format; + this.generatedFlag = builder.generatedFlag; + this.maxLength = builder.maxLength; + this.uniqueItems = builder.uniqueItems; + this.elements = builder.elements; + this.name = builder.name; + this.regex = builder.regex; + this.minItems = builder.minItems; + this.values = builder.values; + this.minimum = builder.minimum; + this.numberEnum = builder.numberEnum; + this.valueLength = builder.valueLength; validatePartialCombinations(); } @@ -69,54 +237,259 @@ public static ApiTypeArrayDTO.ApiTypeArrayDTOBuilder builder() { @JsonPOJOBuilder(buildMethodName = "build", withPrefix = "") public static class ApiTypeArrayDTOBuilder { - private ApiStringFieldDTO stringField; - private ApiSequenceFieldDTO sequenceField; - private ApiDateFieldDTO dateField; - private ApiEnumFieldDTO enumField; - private ApiBooleanFieldDTO booleanField; - private ApiArrayFieldDTO arrayField; - private ApiNumberFieldDTO numberField; - private ApiObjectFieldDTO objectField; - private ApiMapFieldDTO mapField; - private ApiUnionFieldDTO unionField; - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder stringField(ApiStringFieldDTO stringField) { - this.stringField = stringField; + private Integer precision; + private defaultItem; + private Integer maximum; + private String type; + private Integer scale; + private Integer minLength; + private Integer increment; + private String keyType; + private List requiredValues = new ArrayList(); + private Boolean optionalUnion; + private String initialValue; + private Boolean flagExclusiveMinimum; + private Boolean flagExclusiveMaximum; + private Boolean defaultValue; + private List enumValues = new ArrayList(); + private List properties = new ArrayList(); + private List defaultValues = new ArrayList(); + private UnionEnum unionEnum; + private SeqEnum seqEnum; + private Integer arraySize; + private Integer multipleOf; + private Integer mapSize; + private List mapTypes = new ArrayList(); + private Integer format; + private Boolean generatedFlag; + private Integer maxLength; + private Boolean uniqueItems; + private Integer elements; + private String name; + private String regex; + private Integer minItems; + private List values = new ArrayList(); + private Integer minimum; + private NumberEnum numberEnum; + private Integer valueLength; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder precision(Integer precision) { + this.precision = precision; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder defaultItem( defaultItem) { + this.defaultItem = defaultItem; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder maximum(Integer maximum) { + this.maximum = maximum; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder type(String type) { + this.type = type; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder sequenceField(ApiSequenceFieldDTO sequenceField) { - this.sequenceField = sequenceField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder scale(Integer scale) { + this.scale = scale; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder minLength(Integer minLength) { + this.minLength = minLength; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder dateField(ApiDateFieldDTO dateField) { - this.dateField = dateField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder increment(Integer increment) { + this.increment = increment; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder enumField(ApiEnumFieldDTO enumField) { - this.enumField = enumField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder keyType(String keyType) { + this.keyType = keyType; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder booleanField(ApiBooleanFieldDTO booleanField) { - this.booleanField = booleanField; + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder requiredValues(List requiredValues) { + if (!requiredValues.isEmpty()) { + this.requiredValues.addAll(requiredValues); + } return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder arrayField(ApiArrayFieldDTO arrayField) { - this.arrayField = arrayField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder requiredValues(String requiredValues) { + if (requiredValues != null) { + this.requiredValues.add(requiredValues); + } return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder numberField(ApiNumberFieldDTO numberField) { - this.numberField = numberField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder optionalUnion(Boolean optionalUnion) { + this.optionalUnion = optionalUnion; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder objectField(ApiObjectFieldDTO objectField) { - this.objectField = objectField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder initialValue(String initialValue) { + this.initialValue = initialValue; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder mapField(ApiMapFieldDTO mapField) { - this.mapField = mapField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder flagExclusiveMinimum(Boolean flagExclusiveMinimum) { + this.flagExclusiveMinimum = flagExclusiveMinimum; return this; } - public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder unionField(ApiUnionFieldDTO unionField) { - this.unionField = unionField; + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder flagExclusiveMaximum(Boolean flagExclusiveMaximum) { + this.flagExclusiveMaximum = flagExclusiveMaximum; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder defaultValue(Boolean defaultValue) { + this.defaultValue = defaultValue; + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder enumValues(List enumValues) { + if (!enumValues.isEmpty()) { + this.enumValues.addAll(enumValues); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder enumValues(String enumValues) { + if (enumValues != null) { + this.enumValues.add(enumValues); + } + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder properties(List properties) { + if (!properties.isEmpty()) { + this.properties.addAll(properties); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder properties(String properties) { + if (properties != null) { + this.properties.add(properties); + } + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder defaultValues(List defaultValues) { + if (!defaultValues.isEmpty()) { + this.defaultValues.addAll(defaultValues); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder defaultValues(String defaultValues) { + if (defaultValues != null) { + this.defaultValues.add(defaultValues); + } + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder unionEnum(UnionEnum unionEnum) { + this.unionEnum = unionEnum; + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder seqEnum(SeqEnum seqEnum) { + this.seqEnum = seqEnum; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder arraySize(Integer arraySize) { + this.arraySize = arraySize; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder multipleOf(Integer multipleOf) { + this.multipleOf = multipleOf; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder mapSize(Integer mapSize) { + this.mapSize = mapSize; + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder mapTypes(List mapTypes) { + if (!mapTypes.isEmpty()) { + this.mapTypes.addAll(mapTypes); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder mapTypes(ApiTypeArrayDTO mapTypes) { + if (mapTypes != null) { + this.mapTypes.add(mapTypes); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder format(Integer format) { + this.format = format; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder generatedFlag(Boolean generatedFlag) { + this.generatedFlag = generatedFlag; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder maxLength(Integer maxLength) { + this.maxLength = maxLength; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder uniqueItems(Boolean uniqueItems) { + this.uniqueItems = uniqueItems; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder elements(Integer elements) { + this.elements = elements; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder name(String name) { + this.name = name; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder regex(String regex) { + this.regex = regex; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder minItems(Integer minItems) { + this.minItems = minItems; + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder values(List values) { + if (!values.isEmpty()) { + this.values.addAll(values); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder values(ApiTypeArrayDTO values) { + if (values != null) { + this.values.add(values); + } + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder minimum(Integer minimum) { + this.minimum = minimum; + return this; + } + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder numberEnum(NumberEnum numberEnum) { + this.numberEnum = numberEnum; + return this; + } + + public ApiTypeArrayDTO.ApiTypeArrayDTOBuilder valueLength(Integer valueLength) { + this.valueLength = valueLength; return this; } @@ -127,123 +500,423 @@ public ApiTypeArrayDTO build() { } /** - * Get stringField - * @return stringField - */ - @Schema(name = "stringField", required = false) - public ApiStringFieldDTO getStringField() { - return stringField; + * Get precision + * @return precision + */ + @Schema(name = "precision", required = false) + public Integer getPrecision() { + return precision; + } + public void setPrecision(Integer precision) { + this.precision = precision; + } + + /** + * Get defaultItem + * @return defaultItem + */ + @Schema(name = "defaultItem", required = false) + public getDefaultItem() { + return defaultItem; } - public void setStringField(ApiStringFieldDTO stringField) { - this.stringField = stringField; + public void setDefaultItem( defaultItem) { + this.defaultItem = defaultItem; } /** - * Get sequenceField - * @return sequenceField - */ - @Schema(name = "sequenceField", required = false) - public ApiSequenceFieldDTO getSequenceField() { - return sequenceField; + * Get maximum + * @return maximum + */ + @Schema(name = "maximum", required = false) + public Integer getMaximum() { + return maximum; } - public void setSequenceField(ApiSequenceFieldDTO sequenceField) { - this.sequenceField = sequenceField; + public void setMaximum(Integer maximum) { + this.maximum = maximum; } /** - * Get dateField - * @return dateField - */ - @Schema(name = "dateField", required = false) - public ApiDateFieldDTO getDateField() { - return dateField; + * Get type + * @return type + */ + @Schema(name = "type", required = false) + public String getType() { + return type; } - public void setDateField(ApiDateFieldDTO dateField) { - this.dateField = dateField; + public void setType(String type) { + this.type = type; } /** - * Get enumField - * @return enumField - */ - @Schema(name = "enumField", required = false) - public ApiEnumFieldDTO getEnumField() { - return enumField; + * Get scale + * @return scale + */ + @Schema(name = "scale", required = false) + public Integer getScale() { + return scale; } - public void setEnumField(ApiEnumFieldDTO enumField) { - this.enumField = enumField; + public void setScale(Integer scale) { + this.scale = scale; } /** - * Get booleanField - * @return booleanField - */ - @Schema(name = "booleanField", required = false) - public ApiBooleanFieldDTO getBooleanField() { - return booleanField; + * Get minLength + * @return minLength + */ + @Schema(name = "minLength", required = false) + public Integer getMinLength() { + return minLength; } - public void setBooleanField(ApiBooleanFieldDTO booleanField) { - this.booleanField = booleanField; + public void setMinLength(Integer minLength) { + this.minLength = minLength; } /** - * Get arrayField - * @return arrayField - */ - @Schema(name = "arrayField", required = false) - public ApiArrayFieldDTO getArrayField() { - return arrayField; + * Get increment + * @return increment + */ + @Schema(name = "increment", required = false) + public Integer getIncrement() { + return increment; } - public void setArrayField(ApiArrayFieldDTO arrayField) { - this.arrayField = arrayField; + public void setIncrement(Integer increment) { + this.increment = increment; } /** - * Get numberField - * @return numberField - */ - @Schema(name = "numberField", required = false) - public ApiNumberFieldDTO getNumberField() { - return numberField; + * Get keyType + * @return keyType + */ + @Schema(name = "keyType", required = false) + public String getKeyType() { + return keyType; } - public void setNumberField(ApiNumberFieldDTO numberField) { - this.numberField = numberField; + public void setKeyType(String keyType) { + this.keyType = keyType; } /** - * Get objectField - * @return objectField - */ - @Schema(name = "objectField", required = false) - public ApiObjectFieldDTO getObjectField() { - return objectField; + * Get requiredValues + * @return requiredValues + */ + @Schema(name = "requiredValues", required = false) + public List getRequiredValues() { + return requiredValues; } - public void setObjectField(ApiObjectFieldDTO objectField) { - this.objectField = objectField; + public void setRequiredValues(List requiredValues) { + this.requiredValues = requiredValues; } /** - * Get mapField - * @return mapField - */ - @Schema(name = "mapField", required = false) - public ApiMapFieldDTO getMapField() { - return mapField; + * Get optionalUnion + * @return optionalUnion + */ + @Schema(name = "optionalUnion", required = false) + public Boolean getOptionalUnion() { + return optionalUnion; } - public void setMapField(ApiMapFieldDTO mapField) { - this.mapField = mapField; + public void setOptionalUnion(Boolean optionalUnion) { + this.optionalUnion = optionalUnion; } /** - * Get unionField - * @return unionField - */ - @Schema(name = "unionField", required = false) - public ApiUnionFieldDTO getUnionField() { - return unionField; + * Get initialValue + * @return initialValue + */ + @Schema(name = "initialValue", required = false) + public String getInitialValue() { + return initialValue; } - public void setUnionField(ApiUnionFieldDTO unionField) { - this.unionField = unionField; + public void setInitialValue(String initialValue) { + this.initialValue = initialValue; + } + + /** + * Get flagExclusiveMinimum + * @return flagExclusiveMinimum + */ + @Schema(name = "flagExclusiveMinimum", required = false) + public Boolean getFlagExclusiveMinimum() { + return flagExclusiveMinimum; + } + public void setFlagExclusiveMinimum(Boolean flagExclusiveMinimum) { + this.flagExclusiveMinimum = flagExclusiveMinimum; + } + + /** + * Get flagExclusiveMaximum + * @return flagExclusiveMaximum + */ + @Schema(name = "flagExclusiveMaximum", required = false) + public Boolean getFlagExclusiveMaximum() { + return flagExclusiveMaximum; + } + public void setFlagExclusiveMaximum(Boolean flagExclusiveMaximum) { + this.flagExclusiveMaximum = flagExclusiveMaximum; + } + + /** + * Get defaultValue + * @return defaultValue + */ + @Schema(name = "defaultValue", required = false) + public Boolean getDefaultValue() { + return defaultValue; + } + public void setDefaultValue(Boolean defaultValue) { + this.defaultValue = defaultValue; + } + + /** + * Get enumValues + * @return enumValues + */ + @Schema(name = "enumValues", required = false) + public List getEnumValues() { + return enumValues; + } + public void setEnumValues(List enumValues) { + this.enumValues = enumValues; + } + + /** + * Get properties + * @return properties + */ + @Schema(name = "properties", required = false) + public List getProperties() { + return properties; + } + public void setProperties(List properties) { + this.properties = properties; + } + + /** + * Get defaultValues + * @return defaultValues + */ + @Schema(name = "defaultValues", required = false) + public List getDefaultValues() { + return defaultValues; + } + public void setDefaultValues(List defaultValues) { + this.defaultValues = defaultValues; + } + + /** + * Get unionEnum + * @return unionEnum + */ + @Schema(name = "unionEnum", required = false) + public UnionEnum getUnionEnum() { + return unionEnum; + } + public void setUnionEnum(UnionEnum unionEnum) { + this.unionEnum = unionEnum; + } + + /** + * Get seqEnum + * @return seqEnum + */ + @Schema(name = "seqEnum", required = false) + public SeqEnum getSeqEnum() { + return seqEnum; + } + public void setSeqEnum(SeqEnum seqEnum) { + this.seqEnum = seqEnum; + } + + /** + * Get arraySize + * @return arraySize + */ + @Schema(name = "arraySize", required = false) + public Integer getArraySize() { + return arraySize; + } + public void setArraySize(Integer arraySize) { + this.arraySize = arraySize; + } + + /** + * Get multipleOf + * @return multipleOf + */ + @Schema(name = "multipleOf", required = false) + public Integer getMultipleOf() { + return multipleOf; + } + public void setMultipleOf(Integer multipleOf) { + this.multipleOf = multipleOf; + } + + /** + * Get mapSize + * @return mapSize + */ + @Schema(name = "mapSize", required = false) + public Integer getMapSize() { + return mapSize; + } + public void setMapSize(Integer mapSize) { + this.mapSize = mapSize; + } + + /** + * Get mapTypes + * @return mapTypes + */ + @Schema(name = "mapTypes", required = false) + public List getMapTypes() { + return mapTypes; + } + public void setMapTypes(List mapTypes) { + this.mapTypes = mapTypes; + } + + /** + * Get format + * @return format + */ + @Schema(name = "format", required = false) + public Integer getFormat() { + return format; + } + public void setFormat(Integer format) { + this.format = format; + } + + /** + * Get generatedFlag + * @return generatedFlag + */ + @Schema(name = "generatedFlag", required = false) + public Boolean getGeneratedFlag() { + return generatedFlag; + } + public void setGeneratedFlag(Boolean generatedFlag) { + this.generatedFlag = generatedFlag; + } + + /** + * Get maxLength + * @return maxLength + */ + @Schema(name = "maxLength", required = false) + public Integer getMaxLength() { + return maxLength; + } + public void setMaxLength(Integer maxLength) { + this.maxLength = maxLength; + } + + /** + * Get uniqueItems + * @return uniqueItems + */ + @Schema(name = "uniqueItems", required = false) + public Boolean getUniqueItems() { + return uniqueItems; + } + public void setUniqueItems(Boolean uniqueItems) { + this.uniqueItems = uniqueItems; + } + + /** + * Get elements + * @return elements + */ + @Schema(name = "elements", required = false) + public Integer getElements() { + return elements; + } + public void setElements(Integer elements) { + this.elements = elements; + } + + /** + * Get name + * @return name + */ + @Schema(name = "name", required = false) + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + /** + * Get regex + * @return regex + */ + @Schema(name = "regex", required = false) + public String getRegex() { + return regex; + } + public void setRegex(String regex) { + this.regex = regex; + } + + /** + * Get minItems + * @return minItems + */ + @Schema(name = "minItems", required = false) + public Integer getMinItems() { + return minItems; + } + public void setMinItems(Integer minItems) { + this.minItems = minItems; + } + + /** + * Get values + * @return values + */ + @Schema(name = "values", required = false) + public List getValues() { + return values; + } + public void setValues(List values) { + this.values = values; + } + + /** + * Get minimum + * @return minimum + */ + @Schema(name = "minimum", required = false) + public Integer getMinimum() { + return minimum; + } + public void setMinimum(Integer minimum) { + this.minimum = minimum; + } + + /** + * Get numberEnum + * @return numberEnum + */ + @Schema(name = "numberEnum", required = false) + public NumberEnum getNumberEnum() { + return numberEnum; + } + public void setNumberEnum(NumberEnum numberEnum) { + this.numberEnum = numberEnum; + } + + /** + * Get valueLength + * @return valueLength + */ + @Schema(name = "valueLength", required = false) + public Integer getValueLength() { + return valueLength; + } + public void setValueLength(Integer valueLength) { + this.valueLength = valueLength; } @Override @@ -255,36 +928,57 @@ public boolean equals(Object o) { return false; } ApiTypeArrayDTO apiTypeArrayDTO = (ApiTypeArrayDTO) o; - return Objects.equals(this.stringField, apiTypeArrayDTO.stringField) && Objects.equals(this.sequenceField, apiTypeArrayDTO.sequenceField) && Objects.equals(this.dateField, apiTypeArrayDTO.dateField) && Objects.equals(this.enumField, apiTypeArrayDTO.enumField) && Objects.equals(this.booleanField, apiTypeArrayDTO.booleanField) && Objects.equals(this.arrayField, apiTypeArrayDTO.arrayField) && Objects.equals(this.numberField, apiTypeArrayDTO.numberField) && Objects.equals(this.objectField, apiTypeArrayDTO.objectField) && Objects.equals(this.mapField, apiTypeArrayDTO.mapField) && Objects.equals(this.unionField, apiTypeArrayDTO.unionField); + return Objects.equals(this.precision, apiTypeArrayDTO.precision) && Objects.equals(this.defaultItem, apiTypeArrayDTO.defaultItem) && Objects.equals(this.maximum, apiTypeArrayDTO.maximum) && Objects.equals(this.type, apiTypeArrayDTO.type) && Objects.equals(this.scale, apiTypeArrayDTO.scale) && Objects.equals(this.minLength, apiTypeArrayDTO.minLength) && Objects.equals(this.increment, apiTypeArrayDTO.increment) && Objects.equals(this.keyType, apiTypeArrayDTO.keyType) && Objects.equals(this.requiredValues, apiTypeArrayDTO.requiredValues) && Objects.equals(this.optionalUnion, apiTypeArrayDTO.optionalUnion) && Objects.equals(this.initialValue, apiTypeArrayDTO.initialValue) && Objects.equals(this.flagExclusiveMinimum, apiTypeArrayDTO.flagExclusiveMinimum) && Objects.equals(this.flagExclusiveMaximum, apiTypeArrayDTO.flagExclusiveMaximum) && Objects.equals(this.defaultValue, apiTypeArrayDTO.defaultValue) && Objects.equals(this.enumValues, apiTypeArrayDTO.enumValues) && Objects.equals(this.properties, apiTypeArrayDTO.properties) && Objects.equals(this.defaultValues, apiTypeArrayDTO.defaultValues) && Objects.equals(this.unionEnum, apiTypeArrayDTO.unionEnum) && Objects.equals(this.seqEnum, apiTypeArrayDTO.seqEnum) && Objects.equals(this.arraySize, apiTypeArrayDTO.arraySize) && Objects.equals(this.multipleOf, apiTypeArrayDTO.multipleOf) && Objects.equals(this.mapSize, apiTypeArrayDTO.mapSize) && Objects.equals(this.mapTypes, apiTypeArrayDTO.mapTypes) && Objects.equals(this.format, apiTypeArrayDTO.format) && Objects.equals(this.generatedFlag, apiTypeArrayDTO.generatedFlag) && Objects.equals(this.maxLength, apiTypeArrayDTO.maxLength) && Objects.equals(this.uniqueItems, apiTypeArrayDTO.uniqueItems) && Objects.equals(this.elements, apiTypeArrayDTO.elements) && Objects.equals(this.name, apiTypeArrayDTO.name) && Objects.equals(this.regex, apiTypeArrayDTO.regex) && Objects.equals(this.minItems, apiTypeArrayDTO.minItems) && Objects.equals(this.values, apiTypeArrayDTO.values) && Objects.equals(this.minimum, apiTypeArrayDTO.minimum) && Objects.equals(this.numberEnum, apiTypeArrayDTO.numberEnum) && Objects.equals(this.valueLength, apiTypeArrayDTO.valueLength); } @Override public int hashCode() { - return Objects.hash(stringField, sequenceField, dateField, enumField, booleanField, arrayField, numberField, objectField, mapField, unionField); + return Objects.hash(precision, defaultItem, maximum, type, scale, minLength, increment, keyType, requiredValues, optionalUnion, initialValue, flagExclusiveMinimum, flagExclusiveMaximum, defaultValue, enumValues, properties, defaultValues, unionEnum, seqEnum, arraySize, multipleOf, mapSize, mapTypes, format, generatedFlag, maxLength, uniqueItems, elements, name, regex, minItems, values, minimum, numberEnum, valueLength); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ApiTypeArrayDTO {\n"); - sb.append(" stringField: ").append(toIndentedString(stringField)).append("\n"); - sb.append(" sequenceField: ").append(toIndentedString(sequenceField)).append("\n"); - sb.append(" dateField: ").append(toIndentedString(dateField)).append("\n"); - sb.append(" enumField: ").append(toIndentedString(enumField)).append("\n"); - sb.append(" booleanField: ").append(toIndentedString(booleanField)).append("\n"); - sb.append(" arrayField: ").append(toIndentedString(arrayField)).append("\n"); - sb.append(" numberField: ").append(toIndentedString(numberField)).append("\n"); - sb.append(" objectField: ").append(toIndentedString(objectField)).append("\n"); - sb.append(" mapField: ").append(toIndentedString(mapField)).append("\n"); - sb.append(" unionField: ").append(toIndentedString(unionField)).append("\n"); + sb.append(" precision: ").append(toIndentedString(precision)).append("\n"); + sb.append(" defaultItem: ").append(toIndentedString(defaultItem)).append("\n"); + sb.append(" maximum: ").append(toIndentedString(maximum)).append("\n"); + sb.append(" type: ").append(toIndentedString(type)).append("\n"); + sb.append(" scale: ").append(toIndentedString(scale)).append("\n"); + sb.append(" minLength: ").append(toIndentedString(minLength)).append("\n"); + sb.append(" increment: ").append(toIndentedString(increment)).append("\n"); + sb.append(" keyType: ").append(toIndentedString(keyType)).append("\n"); + sb.append(" requiredValues: ").append(toIndentedString(requiredValues)).append("\n"); + sb.append(" optionalUnion: ").append(toIndentedString(optionalUnion)).append("\n"); + sb.append(" initialValue: ").append(toIndentedString(initialValue)).append("\n"); + sb.append(" flagExclusiveMinimum: ").append(toIndentedString(flagExclusiveMinimum)).append("\n"); + sb.append(" flagExclusiveMaximum: ").append(toIndentedString(flagExclusiveMaximum)).append("\n"); + sb.append(" defaultValue: ").append(toIndentedString(defaultValue)).append("\n"); + sb.append(" enumValues: ").append(toIndentedString(enumValues)).append("\n"); + sb.append(" properties: ").append(toIndentedString(properties)).append("\n"); + sb.append(" defaultValues: ").append(toIndentedString(defaultValues)).append("\n"); + sb.append(" unionEnum: ").append(toIndentedString(unionEnum)).append("\n"); + sb.append(" seqEnum: ").append(toIndentedString(seqEnum)).append("\n"); + sb.append(" arraySize: ").append(toIndentedString(arraySize)).append("\n"); + sb.append(" multipleOf: ").append(toIndentedString(multipleOf)).append("\n"); + sb.append(" mapSize: ").append(toIndentedString(mapSize)).append("\n"); + sb.append(" mapTypes: ").append(toIndentedString(mapTypes)).append("\n"); + sb.append(" format: ").append(toIndentedString(format)).append("\n"); + sb.append(" generatedFlag: ").append(toIndentedString(generatedFlag)).append("\n"); + sb.append(" maxLength: ").append(toIndentedString(maxLength)).append("\n"); + sb.append(" uniqueItems: ").append(toIndentedString(uniqueItems)).append("\n"); + sb.append(" elements: ").append(toIndentedString(elements)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" regex: ").append(toIndentedString(regex)).append("\n"); + sb.append(" minItems: ").append(toIndentedString(minItems)).append("\n"); + sb.append(" values: ").append(toIndentedString(values)).append("\n"); + sb.append(" minimum: ").append(toIndentedString(minimum)).append("\n"); + sb.append(" numberEnum: ").append(toIndentedString(numberEnum)).append("\n"); + sb.append(" valueLength: ").append(toIndentedString(valueLength)).append("\n"); sb.append("}"); return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -295,25 +989,75 @@ private String toIndentedString(Object o) { private void validatePartialCombinations() { boolean satisfiedCondition = false; - if (Objects.nonNull(this.stringField)) { + if (Objects.nonNull(this.precision)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.defaultItem)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.maximum)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.type)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.scale)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.minLength)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.increment)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.keyType)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.requiredValues)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.optionalUnion)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.initialValue)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.flagExclusiveMinimum)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.sequenceField)) { + } else if (Objects.nonNull(this.flagExclusiveMaximum)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.dateField)) { + } else if (Objects.nonNull(this.defaultValue)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.enumField)) { + } else if (Objects.nonNull(this.enumValues)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.booleanField)) { + } else if (Objects.nonNull(this.properties)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.arrayField)) { + } else if (Objects.nonNull(this.defaultValues)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.numberField)) { + } else if (Objects.nonNull(this.unionEnum)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.objectField)) { + } else if (Objects.nonNull(this.seqEnum)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.mapField)) { + } else if (Objects.nonNull(this.arraySize)) { satisfiedCondition = true; - } else if (Objects.nonNull(this.unionField)) { + } else if (Objects.nonNull(this.multipleOf)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.mapSize)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.mapTypes)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.format)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.generatedFlag)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.maxLength)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.uniqueItems)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.elements)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.name)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.regex)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.minItems)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.values)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.minimum)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.numberEnum)) { + satisfiedCondition = true; + } else if (Objects.nonNull(this.valueLength)) { satisfiedCondition = true; } @@ -322,5 +1066,4 @@ private void validatePartialCombinations() { } } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiUnionFieldDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiUnionFieldDTO.java index c549ebd2..e381321b 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiUnionFieldDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testComplexAnyOf/assets/ApiUnionFieldDTO.java @@ -134,10 +134,7 @@ public ApiUnionFieldDTO build() { } } - /** - * Get defaultItem - * @return defaultItem - */ + @Schema(name = "defaultItem", required = false) public ApiDefaultItemDTO getDefaultItem() { return defaultItem; @@ -146,10 +143,7 @@ public void setDefaultItem(ApiDefaultItemDTO defaultItem) { this.defaultItem = defaultItem; } - /** - * Get generatedFlag - * @return generatedFlag - */ + @Schema(name = "generatedFlag", required = false) public Boolean getGeneratedFlag() { return generatedFlag; @@ -158,10 +152,7 @@ public void setGeneratedFlag(Boolean generatedFlag) { this.generatedFlag = generatedFlag; } - /** - * Get type - * @return type - */ + @Schema(name = "type", required = false) public String getType() { return type; @@ -170,10 +161,7 @@ public void setType(String type) { this.type = type; } - /** - * Get unionEnum - * @return unionEnum - */ + @Schema(name = "unionEnum", required = false) public UnionEnum getUnionEnum() { return unionEnum; @@ -182,10 +170,7 @@ public void setUnionEnum(UnionEnum unionEnum) { this.unionEnum = unionEnum; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -194,10 +179,7 @@ public void setName(String name) { this.name = name; } - /** - * Get optionalUnion - * @return optionalUnion - */ + @Schema(name = "optionalUnion", required = false) public Boolean getOptionalUnion() { return optionalUnion; @@ -206,10 +188,7 @@ public void setOptionalUnion(Boolean optionalUnion) { this.optionalUnion = optionalUnion; } - /** - * Get values - * @return values - */ + @Schema(name = "values", required = false) public List getValues() { return values; @@ -250,10 +229,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -262,5 +238,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testExternalRefsGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testExternalRefsGeneration/assets/ApiTestDTO.java index 99176a53..66cd8e71 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testExternalRefsGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testExternalRefsGeneration/assets/ApiTestDTO.java @@ -59,19 +59,13 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiErrorDTO.java index 73e289f2..fb431228 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiErrorDTO.java @@ -53,10 +53,7 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = false) public Integer getCode() { return code; @@ -65,10 +62,7 @@ public void setCode(Integer code) { this.code = code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = false) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -116,5 +107,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestDTO.java index a56ce0f8..ee5b963c 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestDTO.java @@ -120,10 +120,7 @@ public ApiTestDTO build() { } } - /** - * Get testProcessor - * @return testProcessor - */ + @Schema(name = "testProcessor", required = false) public ApiTestProcessorDTO getTestProcessor() { return testProcessor; @@ -132,10 +129,7 @@ public void setTestProcessor(ApiTestProcessorDTO testProcessor) { this.testProcessor = testProcessor; } - /** - * Get description - * @return description - */ + @Schema(name = "description", required = false) public String getDescription() { return description; @@ -144,10 +138,7 @@ public void setDescription(String description) { this.description = description; } - /** - * Get tags - * @return tags - */ + @Schema(name = "tags", required = false) public List getTags() { return tags; @@ -156,10 +147,7 @@ public void setTags(List tags) { this.tags = tags; } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -168,10 +156,7 @@ public void setName(String name) { this.name = name; } - /** - * Get testTypeList - * @return testTypeList - */ + @Schema(name = "testTypeList", required = false) public List getTestTypeList() { return testTypeList; @@ -180,10 +165,7 @@ public void setTestTypeList(List testTypeList) { this.testTypeList = testTypeList; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = false) public Integer getId() { return id; @@ -192,10 +174,7 @@ public void setId(Integer id) { this.id = id; } - /** - * Get priority - * @return priority - */ + @Schema(name = "priority", required = false) public Integer getPriority() { return priority; @@ -236,10 +215,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -248,5 +224,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestProcessorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestProcessorDTO.java index c6907c82..fbc7f084 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestProcessorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestProcessorDTO.java @@ -53,10 +53,7 @@ public ApiTestProcessorDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -65,10 +62,7 @@ public void setName(String name) { this.name = name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = false) public String getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -116,5 +107,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestTypeDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestTypeDTO.java index c9886f7f..dbec85d8 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestTypeDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testInlineSchemaCreation/assets/ApiTestTypeDTO.java @@ -53,10 +53,7 @@ public ApiTestTypeDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = false) public String getName() { return name; @@ -65,10 +62,7 @@ public void setName(String name) { this.name = name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = false) public String getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -116,5 +107,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/InlineResponse200CreateGameDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/InlineResponse200CreateGameDTO.java index 3576846f..92baf23d 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/InlineResponse200CreateGameDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/InlineResponse200CreateGameDTO.java @@ -62,10 +62,7 @@ public InlineResponse200CreateGameDTO build() { } } - /** - * Get description - * @return description - */ + @Schema(name = "description", required = false) public String getDescription() { return description; @@ -74,10 +71,7 @@ public void setDescription(String description) { this.description = description; } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = false) public Integer getCode() { return code; @@ -86,10 +80,7 @@ public void setCode(Integer code) { this.code = code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = false) public MessageDTO getMessage() { return message; @@ -126,10 +117,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -138,5 +126,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/MessageDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/MessageDTO.java index 0908a3ec..b3a7619a 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/MessageDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testMultipleRefGeneration/assets/MessageDTO.java @@ -52,10 +52,7 @@ public MessageDTO build() { } } - /** - * Get description - * @return description - */ + @Schema(name = "description", required = false) public String getDescription() { return description; @@ -64,10 +61,7 @@ public void setDescription(String description) { this.description = description; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = false) public MessageDTO getMessage() { return message; @@ -103,10 +97,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,5 +106,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiErrorDTO.java index c0ea4d7e..1fceb177 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiErrorDTO.java @@ -59,19 +59,11 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +96,6 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +103,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestDTO.java index 532df523..05e4f099 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestDTO.java @@ -59,19 +59,11 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +96,6 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +103,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestInfoDTO.java index 0e7afac4..2613257d 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testOverWriteModelTrue/assets/ApiTestInfoDTO.java @@ -68,10 +68,6 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +76,6 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +108,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +116,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiErrorDTO.java index ac882ad1..d913e638 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiErrorDTO.java @@ -52,19 +52,13 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -97,10 +91,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -108,7 +99,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestDTO.java index c839ae86..d25eef78 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestDTO.java @@ -52,19 +52,13 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -97,10 +91,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -108,7 +99,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestInfoDTO.java index f3f8ce32..41610414 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testRestClientApiGeneration/assets/ApiTestInfoDTO.java @@ -62,10 +62,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -74,10 +71,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -110,10 +104,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -121,7 +112,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiErrorDTO.java index 5a0b3b0a..bbc29859 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiErrorDTO.java @@ -95,28 +95,19 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; } - /** - * Get test - * @return test - */ + @Schema(name = "test", required = false) public List getTest() { return test; @@ -153,10 +144,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -164,7 +152,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestAllOfDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestAllOfDTO.java index 48101299..39aebe6c 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestAllOfDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestAllOfDTO.java @@ -63,10 +63,7 @@ public ApiTestAllOfDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -75,10 +72,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = false) public String getTestName() { return testName; @@ -114,10 +108,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -126,5 +117,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestDTO.java index 25b95615..8698cb78 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestDTO.java @@ -69,19 +69,13 @@ public ApiTestDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = true) public List getTesters() { return testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -114,10 +108,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -125,7 +116,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestInfoDTO.java index 221288ad..e96573a1 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestsDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestsDTO.java index 94cc1f96..d9c4790d 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestsDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/assets/testApi/ApiTestsDTO.java @@ -35,10 +35,7 @@ public ApiTestsDTO build() { } } - /** - * Get apiTestDTO - * @return apiTestDTO - */ + @Schema(name = "apiTestDTO", required = false) public ApiTestDTO getApiTestDTO() { return apiTestDTO; @@ -73,10 +70,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -85,5 +79,4 @@ private String toIndentedString(Object o) { } - } diff --git a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiErrorDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiErrorDTO.java index 44062482..447f3fac 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiErrorDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiErrorDTO.java @@ -59,19 +59,13 @@ public ApiErrorDTO build() { } } - /** - * Get code - * @return code - */ + @Schema(name = "code", required = true) public Integer getCode() { return code; } - /** - * Get message - * @return message - */ + @Schema(name = "message", required = true) public String getMessage() { return message; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestDTO.java index 45535b27..7d01c0a3 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestDTO.java @@ -59,19 +59,13 @@ public ApiTestDTO build() { } } - /** - * Get name - * @return name - */ + @Schema(name = "name", required = true) public String getName() { return name; } - /** - * Get id - * @return id - */ + @Schema(name = "id", required = true) public Integer getId() { return id; @@ -104,10 +98,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -115,7 +106,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestInfoDTO.java b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestInfoDTO.java index f97bfd28..2f407fa8 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestInfoDTO.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/ApiTestInfoDTO.java @@ -68,10 +68,7 @@ public ApiTestInfoDTO build() { } } - /** - * Get testers - * @return testers - */ + @Schema(name = "testers", required = false) public List getTesters() { return testers; @@ -80,10 +77,7 @@ public void setTesters(List testers) { this.testers = testers; } - /** - * Get testName - * @return testName - */ + @Schema(name = "testName", required = true) public String getTestName() { return testName; @@ -116,10 +110,7 @@ public String toString() { return sb.toString(); } - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ + private String toIndentedString(Object o) { if (o == null) { return "null"; @@ -127,7 +118,6 @@ private String toIndentedString(Object o) { return o.toString().replace("\n", "\n "); } - private void validateRequiredAttributes() { boolean satisfiedCondition = true; diff --git a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/TestApi.java b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/TestApi.java index 602278be..07d2f7bc 100644 --- a/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/TestApi.java +++ b/multiapi-engine/src/test/resources/openapigenerator/testWebClientApiGeneration/assets/TestApi.java @@ -125,5 +125,4 @@ public Mono> listTestWithHttpInfo() throws WebClientR return listTestRequestCreation().toEntity(localVarReturnType); } - } \ No newline at end of file