Fix usage of javax.annotation (#6645)

* Fix usage of javax.annotation:javax.annotation-api

* Regenerate samples

```
bin/generate-samples.sh bin/configs/java-* bin/configs/jaxrs-* bin/configs/spring-* bin/configs/kotlin-* bin/configs/other/java-* bin/configs/other/jaxrs-* bin/configs/other/kotlin-* bin/configs/other/openapi3/jaxrs-cxf-client.yaml bin/configs/other/openapi3/kotlin-*
```
This commit is contained in:
Jochen Schalanda
2020-06-14 11:01:18 +02:00
committed by GitHub
parent e07f084e2a
commit 32adeddd8f
3075 changed files with 6183 additions and 4573 deletions

View File

@@ -0,0 +1,58 @@
README.md
inflector.yaml
pom.xml
src/gen/java/org/openapitools/controllers/StringUtil.java
src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
src/gen/java/org/openapitools/model/Animal.java
src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
src/gen/java/org/openapitools/model/ArrayTest.java
src/gen/java/org/openapitools/model/BigCat.java
src/gen/java/org/openapitools/model/BigCatAllOf.java
src/gen/java/org/openapitools/model/Capitalization.java
src/gen/java/org/openapitools/model/Cat.java
src/gen/java/org/openapitools/model/CatAllOf.java
src/gen/java/org/openapitools/model/Category.java
src/gen/java/org/openapitools/model/ClassModel.java
src/gen/java/org/openapitools/model/Client.java
src/gen/java/org/openapitools/model/Dog.java
src/gen/java/org/openapitools/model/DogAllOf.java
src/gen/java/org/openapitools/model/EnumArrays.java
src/gen/java/org/openapitools/model/EnumClass.java
src/gen/java/org/openapitools/model/EnumTest.java
src/gen/java/org/openapitools/model/FileSchemaTestClass.java
src/gen/java/org/openapitools/model/FormatTest.java
src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
src/gen/java/org/openapitools/model/MapTest.java
src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
src/gen/java/org/openapitools/model/Model200Response.java
src/gen/java/org/openapitools/model/ModelApiResponse.java
src/gen/java/org/openapitools/model/ModelReturn.java
src/gen/java/org/openapitools/model/Name.java
src/gen/java/org/openapitools/model/NumberOnly.java
src/gen/java/org/openapitools/model/Order.java
src/gen/java/org/openapitools/model/OuterComposite.java
src/gen/java/org/openapitools/model/OuterEnum.java
src/gen/java/org/openapitools/model/Pet.java
src/gen/java/org/openapitools/model/ReadOnlyFirst.java
src/gen/java/org/openapitools/model/SpecialModelName.java
src/gen/java/org/openapitools/model/Tag.java
src/gen/java/org/openapitools/model/TypeHolderDefault.java
src/gen/java/org/openapitools/model/TypeHolderExample.java
src/gen/java/org/openapitools/model/User.java
src/gen/java/org/openapitools/model/XmlItem.java
src/main/java/org/openapitools/controllers/AnotherFakeController.java
src/main/java/org/openapitools/controllers/FakeClassnameTestController.java
src/main/java/org/openapitools/controllers/FakeController.java
src/main/java/org/openapitools/controllers/PetController.java
src/main/java/org/openapitools/controllers/StoreController.java
src/main/java/org/openapitools/controllers/UserController.java
src/main/openapi/openapi.yaml
src/main/webapp/WEB-INF/web.xml

View File

@@ -126,6 +126,12 @@
<artifactId>swagger-inflector</artifactId>
<version>${swagger-inflector-version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<repositories>
<repository>
@@ -142,6 +148,7 @@
<swagger-inflector-version>1.0.14</swagger-inflector-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<logback-version>1.0.1</logback-version>
<javax-annotation-version>1.3.2</javax-annotation-version>
<junit-version>4.8.2</junit-version>
<slf4j-version>1.6.3</slf4j-version>
</properties>

View File

@@ -1,6 +1,6 @@
package org.openapitools.controllers;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

View File

@@ -12,7 +12,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
@JsonProperty("name")
private String name;

View File

@@ -13,7 +13,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesArray extends HashMap<String, List> {
@JsonProperty("name")
private String name;

View File

@@ -12,7 +12,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
@JsonProperty("name")
private String name;

View File

@@ -14,7 +14,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesClass {
@JsonProperty("map_string")
private Map<String, String> mapString = null;

View File

@@ -12,7 +12,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
@JsonProperty("name")
private String name;

View File

@@ -13,7 +13,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
@JsonProperty("name")
private String name;

View File

@@ -12,7 +12,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesObject extends HashMap<String, Map> {
@JsonProperty("name")
private String name;

View File

@@ -12,7 +12,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AdditionalPropertiesString extends HashMap<String, String> {
@JsonProperty("name")
private String name;

View File

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Animal {
@JsonProperty("className")
private String className;

View File

@@ -13,7 +13,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ArrayOfArrayOfNumberOnly {
@JsonProperty("ArrayArrayNumber")
private List<List<BigDecimal>> arrayArrayNumber = null;

View File

@@ -13,7 +13,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ArrayOfNumberOnly {
@JsonProperty("ArrayNumber")
private List<BigDecimal> arrayNumber = null;

View File

@@ -13,7 +13,7 @@ import org.openapitools.model.ReadOnlyFirst;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ArrayTest {
@JsonProperty("array_of_string")
private List<String> arrayOfString = null;

View File

@@ -13,7 +13,7 @@ import org.openapitools.model.Cat;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class BigCat extends Cat {
/**
* Gets or Sets kind

View File

@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class BigCatAllOf {
/**
* Gets or Sets kind

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Capitalization {
@JsonProperty("smallCamel")
private String smallCamel;

View File

@@ -12,7 +12,7 @@ import org.openapitools.model.CatAllOf;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Cat extends Animal {
@JsonProperty("declawed")
private Boolean declawed;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class CatAllOf {
@JsonProperty("declawed")
private Boolean declawed;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Category {
@JsonProperty("id")
private Long id;

View File

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model with \"_class\" property")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ClassModel {
@JsonProperty("_class")
private String propertyClass;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Client {
@JsonProperty("client")
private String client;

View File

@@ -12,7 +12,7 @@ import org.openapitools.model.DogAllOf;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Dog extends Animal {
@JsonProperty("breed")
private String breed;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class DogAllOf {
@JsonProperty("breed")
private String breed;

View File

@@ -13,7 +13,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class EnumArrays {
/**
* Gets or Sets justSymbol

View File

@@ -12,7 +12,7 @@ import org.openapitools.model.OuterEnum;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class EnumTest {
/**
* Gets or Sets enumString

View File

@@ -12,7 +12,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class FileSchemaTestClass {
@JsonProperty("file")
private java.io.File file;

View File

@@ -14,7 +14,7 @@ import java.util.UUID;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class FormatTest {
@JsonProperty("integer")
private Integer integer;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class HasOnlyReadOnly {
@JsonProperty("bar")
private String bar;

View File

@@ -14,7 +14,7 @@ import java.util.Map;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class MapTest {
@JsonProperty("map_map_of_string")
private Map<String, Map<String, String>> mapMapOfString = null;

View File

@@ -16,7 +16,7 @@ import org.openapitools.model.Animal;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class MixedPropertiesAndAdditionalPropertiesClass {
@JsonProperty("uuid")
private UUID uuid;

View File

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model name starting with number")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Model200Response {
@JsonProperty("name")
private Integer name;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ModelApiResponse {
@JsonProperty("code")
private Integer code;

View File

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing reserved words")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ModelReturn {
@JsonProperty("return")
private Integer _return;

View File

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model name same as property name")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Name {
@JsonProperty("name")
private Integer name;

View File

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class NumberOnly {
@JsonProperty("JustNumber")
private BigDecimal justNumber;

View File

@@ -12,7 +12,7 @@ import java.util.Date;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Order {
@JsonProperty("id")
private Long id;

View File

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class OuterComposite {
@JsonProperty("my_number")
private BigDecimal myNumber;

View File

@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.openapitools.model.Category;
import org.openapitools.model.Tag;
@@ -15,7 +17,7 @@ import org.openapitools.model.Tag;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Pet {
@JsonProperty("id")
private Long id;
@@ -27,7 +29,7 @@ public class Pet {
private String name;
@JsonProperty("photoUrls")
private List<String> photoUrls = new ArrayList<String>();
private Set<String> photoUrls = new LinkedHashSet<String>();
@JsonProperty("tags")
private List<Tag> tags = null;
@@ -121,7 +123,7 @@ public class Pet {
/**
**/
public Pet photoUrls(List<String> photoUrls) {
public Pet photoUrls(Set<String> photoUrls) {
this.photoUrls = photoUrls;
return this;
}
@@ -129,10 +131,10 @@ public class Pet {
@ApiModelProperty(required = true, value = "")
@JsonProperty("photoUrls")
public List<String> getPhotoUrls() {
public Set<String> getPhotoUrls() {
return photoUrls;
}
public void setPhotoUrls(List<String> photoUrls) {
public void setPhotoUrls(Set<String> photoUrls) {
this.photoUrls = photoUrls;
}

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class ReadOnlyFirst {
@JsonProperty("bar")
private String bar;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class SpecialModelName {
@JsonProperty("$special[property.name]")
private Long $specialPropertyName;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class Tag {
@JsonProperty("id")
private Long id;

View File

@@ -13,7 +13,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class TypeHolderDefault {
@JsonProperty("string_item")
private String stringItem = "what";

View File

@@ -13,7 +13,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class TypeHolderExample {
@JsonProperty("string_item")
private String stringItem;

View File

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class User {
@JsonProperty("id")
private Long id;

View File

@@ -13,7 +13,7 @@ import java.util.List;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class XmlItem {
@JsonProperty("attribute_string")
private String attributeString;

View File

@@ -12,7 +12,7 @@ import org.openapitools.model.*;
import org.openapitools.model.Client;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class AnotherFakeController {
/**
* Uncomment and implement as you see fit. These operations will map

View File

@@ -12,7 +12,7 @@ import org.openapitools.model.*;
import org.openapitools.model.Client;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class FakeClassnameTestController {
/**
* Uncomment and implement as you see fit. These operations will map

View File

@@ -21,7 +21,7 @@ import org.openapitools.model.OuterComposite;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class FakeController {
/**
* Uncomment and implement as you see fit. These operations will map

View File

@@ -13,8 +13,9 @@ import org.openapitools.model.*;
import java.io.File;
import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import java.util.Set;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class PetController {
/**
* Uncomment and implement as you see fit. These operations will map
@@ -41,7 +42,7 @@ public class PetController {
*/
/*
public ResponseContext findPetsByTags(RequestContext request , List<String> tags) {
public ResponseContext findPetsByTags(RequestContext request , Set<String> tags) {
return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
}
*/

View File

@@ -13,7 +13,7 @@ import org.openapitools.model.*;
import java.util.Map;
import org.openapitools.model.Order;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class StoreController {
/**
* Uncomment and implement as you see fit. These operations will map

View File

@@ -13,7 +13,7 @@ import org.openapitools.model.*;
import java.util.List;
import org.openapitools.model.User;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
public class UserController {
/**
* Uncomment and implement as you see fit. These operations will map

View File

@@ -144,6 +144,7 @@ paths:
items:
type: string
type: array
uniqueItems: true
style: form
responses:
"200":
@@ -153,11 +154,13 @@ paths:
items:
$ref: '#/components/schemas/Pet'
type: array
uniqueItems: true
application/json:
schema:
items:
$ref: '#/components/schemas/Pet'
type: array
uniqueItems: true
description: successful operation
"400":
content: {}
@@ -1384,6 +1387,7 @@ components:
items:
type: string
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true