Skip to content

Commit ee011f8

Browse files
author
DielN
committed
Fix feign-no-nullable config/sample
1 parent 5f96413 commit ee011f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+249
-0
lines changed

‎bin/configs/java-feign-no-nullable.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ additionalProperties:
1010
additionalModelTypeAnnotations: '@javax.annotation.concurrent.Immutable'
1111
openApiNullable: false
1212
useReflectionEqualsHashCode: true
13+
annotationLibrary: "swagger1"

‎samples/client/petstore/java/feign-no-nullable/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@
206206
</profiles>
207207

208208
<dependencies>
209+
<dependency>
210+
<groupId>io.swagger</groupId>
211+
<artifactId>swagger-annotations</artifactId>
212+
<version>${swagger-annotations-version}</version>
213+
</dependency>
209214

210215
<!-- @Nullable annotation -->
211216
<dependency>
@@ -317,6 +322,7 @@
317322
<java.version>1.8</java.version>
318323
<maven.compiler.source>${java.version}</maven.compiler.source>
319324
<maven.compiler.target>${java.version}</maven.compiler.target>
325+
<swagger-annotations-version>1.6.11</swagger-annotations-version>
320326
<feign-version>13.2.1</feign-version>
321327
<feign-form-version>3.8.0</feign-form-version>
322328
<jackson-version>2.17.1</jackson-version>

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.util.HashMap;
3032
import java.util.Map;
3133
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -59,6 +61,7 @@ public AdditionalPropertiesAnyType name(@javax.annotation.Nullable String name)
5961
* @return name
6062
*/
6163
@javax.annotation.Nullable
64+
@ApiModelProperty(value = "")
6265
@JsonProperty(JSON_PROPERTY_NAME)
6366
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6467

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.util.HashMap;
3032
import java.util.List;
3133
import java.util.Map;
@@ -60,6 +62,7 @@ public AdditionalPropertiesArray name(@javax.annotation.Nullable String name) {
6062
* @return name
6163
*/
6264
@javax.annotation.Nullable
65+
@ApiModelProperty(value = "")
6366
@JsonProperty(JSON_PROPERTY_NAME)
6467
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6568

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.util.HashMap;
3032
import java.util.Map;
3133
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -59,6 +61,7 @@ public AdditionalPropertiesBoolean name(@javax.annotation.Nullable String name)
5961
* @return name
6062
*/
6163
@javax.annotation.Nullable
64+
@ApiModelProperty(value = "")
6265
@JsonProperty(JSON_PROPERTY_NAME)
6366
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6467

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import com.fasterxml.jackson.annotation.JsonCreator;
2323
import com.fasterxml.jackson.annotation.JsonTypeName;
2424
import com.fasterxml.jackson.annotation.JsonValue;
25+
import io.swagger.annotations.ApiModel;
26+
import io.swagger.annotations.ApiModelProperty;
2527
import java.math.BigDecimal;
2628
import java.util.HashMap;
2729
import java.util.List;
@@ -114,6 +116,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
114116
* @return mapString
115117
*/
116118
@javax.annotation.Nullable
119+
@ApiModelProperty(value = "")
117120
@JsonProperty(JSON_PROPERTY_MAP_STRING)
118121
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
119122

@@ -148,6 +151,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
148151
* @return mapNumber
149152
*/
150153
@javax.annotation.Nullable
154+
@ApiModelProperty(value = "")
151155
@JsonProperty(JSON_PROPERTY_MAP_NUMBER)
152156
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
153157

@@ -182,6 +186,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
182186
* @return mapInteger
183187
*/
184188
@javax.annotation.Nullable
189+
@ApiModelProperty(value = "")
185190
@JsonProperty(JSON_PROPERTY_MAP_INTEGER)
186191
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
187192

@@ -216,6 +221,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
216221
* @return mapBoolean
217222
*/
218223
@javax.annotation.Nullable
224+
@ApiModelProperty(value = "")
219225
@JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
220226
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
221227

@@ -250,6 +256,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
250256
* @return mapArrayInteger
251257
*/
252258
@javax.annotation.Nullable
259+
@ApiModelProperty(value = "")
253260
@JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
254261
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
255262

@@ -284,6 +291,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
284291
* @return mapArrayAnytype
285292
*/
286293
@javax.annotation.Nullable
294+
@ApiModelProperty(value = "")
287295
@JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
288296
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
289297

@@ -318,6 +326,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
318326
* @return mapMapString
319327
*/
320328
@javax.annotation.Nullable
329+
@ApiModelProperty(value = "")
321330
@JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
322331
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
323332

@@ -352,6 +361,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
352361
* @return mapMapAnytype
353362
*/
354363
@javax.annotation.Nullable
364+
@ApiModelProperty(value = "")
355365
@JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
356366
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
357367

@@ -378,6 +388,7 @@ public AdditionalPropertiesClass anytype1(@javax.annotation.Nullable Object anyt
378388
* @return anytype1
379389
*/
380390
@javax.annotation.Nullable
391+
@ApiModelProperty(value = "")
381392
@JsonProperty(JSON_PROPERTY_ANYTYPE1)
382393
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
383394

@@ -404,6 +415,7 @@ public AdditionalPropertiesClass anytype2(@javax.annotation.Nullable Object anyt
404415
* @return anytype2
405416
*/
406417
@javax.annotation.Nullable
418+
@ApiModelProperty(value = "")
407419
@JsonProperty(JSON_PROPERTY_ANYTYPE2)
408420
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
409421

@@ -430,6 +442,7 @@ public AdditionalPropertiesClass anytype3(@javax.annotation.Nullable Object anyt
430442
* @return anytype3
431443
*/
432444
@javax.annotation.Nullable
445+
@ApiModelProperty(value = "")
433446
@JsonProperty(JSON_PROPERTY_ANYTYPE3)
434447
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
435448

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.util.HashMap;
3032
import java.util.Map;
3133
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -59,6 +61,7 @@ public AdditionalPropertiesInteger name(@javax.annotation.Nullable String name)
5961
* @return name
6062
*/
6163
@javax.annotation.Nullable
64+
@ApiModelProperty(value = "")
6265
@JsonProperty(JSON_PROPERTY_NAME)
6366
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6467

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.math.BigDecimal;
3032
import java.util.HashMap;
3133
import java.util.Map;
@@ -60,6 +62,7 @@ public AdditionalPropertiesNumber name(@javax.annotation.Nullable String name) {
6062
* @return name
6163
*/
6264
@javax.annotation.Nullable
65+
@ApiModelProperty(value = "")
6366
@JsonProperty(JSON_PROPERTY_NAME)
6467
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6568

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.util.HashMap;
3032
import java.util.Map;
3133
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -59,6 +61,7 @@ public AdditionalPropertiesObject name(@javax.annotation.Nullable String name) {
5961
* @return name
6062
*/
6163
@javax.annotation.Nullable
64+
@ApiModelProperty(value = "")
6265
@JsonProperty(JSON_PROPERTY_NAME)
6366
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6467

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonValue;
29+
import io.swagger.annotations.ApiModel;
30+
import io.swagger.annotations.ApiModelProperty;
2931
import java.util.HashMap;
3032
import java.util.Map;
3133
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -59,6 +61,7 @@ public AdditionalPropertiesString name(@javax.annotation.Nullable String name) {
5961
* @return name
6062
*/
6163
@javax.annotation.Nullable
64+
@ApiModelProperty(value = "")
6265
@JsonProperty(JSON_PROPERTY_NAME)
6366
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
6467

0 commit comments

Comments
 (0)