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,21 @@
README.md
pom.xml
src/main/java/org/openapitools/server/api/MainApiException.java
src/main/java/org/openapitools/server/api/MainApiVerticle.java
src/main/java/org/openapitools/server/api/model/Category.java
src/main/java/org/openapitools/server/api/model/ModelApiResponse.java
src/main/java/org/openapitools/server/api/model/Order.java
src/main/java/org/openapitools/server/api/model/Pet.java
src/main/java/org/openapitools/server/api/model/Tag.java
src/main/java/org/openapitools/server/api/model/User.java
src/main/java/org/openapitools/server/api/verticle/PetApi.java
src/main/java/org/openapitools/server/api/verticle/PetApiException.java
src/main/java/org/openapitools/server/api/verticle/PetApiVerticle.java
src/main/java/org/openapitools/server/api/verticle/StoreApi.java
src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
src/main/java/org/openapitools/server/api/verticle/StoreApiVerticle.java
src/main/java/org/openapitools/server/api/verticle/UserApi.java
src/main/java/org/openapitools/server/api/verticle/UserApiException.java
src/main/java/org/openapitools/server/api/verticle/UserApiVerticle.java
src/main/resources/openapi.json
src/main/resources/vertx-default-jul-logging.properties

View File

@@ -1 +1 @@
4.2.3-SNAPSHOT
5.0.0-SNAPSHOT

View File

@@ -1,32 +1,32 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId>
<artifactId>openapi-java-vertx-server</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId>
<artifactId>openapi-java-vertx-server</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Swagger Petstore</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<junit.version>4.13</junit.version>
<vertx.version>3.4.1</vertx.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
</properties>
<name>OpenAPI Petstore</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<junit.version>4.13</junit.version>
<vertx.version>3.4.1</vertx.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
@@ -35,7 +35,7 @@
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>com.github.phiz71</groupId>
<artifactId>vertx-swagger-router</artifactId>
<version>${vertx-swagger-router.version}</version>
@@ -47,45 +47,45 @@
<version>${jackson-datatype-jsr310.version}</version>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>io.vertx.core.Starter</Main-Class>
<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
</manifestEntries>
</transformer>
</transformers>
<artifactSet />
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>io.vertx.core.Starter</Main-Class>
<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
</manifestEntries>
</transformer>
</transformers>
<artifactSet />
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -12,14 +12,18 @@ public final class PetApiException extends MainApiException {
public static final PetApiException Pet_addPet_405_Exception = new PetApiException(405, "Invalid input");
public static final PetApiException Pet_deletePet_400_Exception = new PetApiException(400, "Invalid pet value");
public static final PetApiException Pet_findPetsByStatus_200_Exception = new PetApiException(200, "successful operation");
public static final PetApiException Pet_findPetsByStatus_400_Exception = new PetApiException(400, "Invalid status value");
public static final PetApiException Pet_findPetsByTags_200_Exception = new PetApiException(200, "successful operation");
public static final PetApiException Pet_findPetsByTags_400_Exception = new PetApiException(400, "Invalid tag value");
public static final PetApiException Pet_getPetById_200_Exception = new PetApiException(200, "successful operation");
public static final PetApiException Pet_getPetById_400_Exception = new PetApiException(400, "Invalid ID supplied");
public static final PetApiException Pet_getPetById_404_Exception = new PetApiException(404, "Pet not found");
public static final PetApiException Pet_updatePet_400_Exception = new PetApiException(400, "Invalid ID supplied");
public static final PetApiException Pet_updatePet_404_Exception = new PetApiException(404, "Pet not found");
public static final PetApiException Pet_updatePet_405_Exception = new PetApiException(405, "Validation exception");
public static final PetApiException Pet_updatePetWithForm_405_Exception = new PetApiException(405, "Invalid input");
public static final PetApiException Pet_uploadFile_200_Exception = new PetApiException(200, "successful operation");
}

View File

@@ -10,8 +10,11 @@ public final class StoreApiException extends MainApiException {
public static final StoreApiException Store_deleteOrder_400_Exception = new StoreApiException(400, "Invalid ID supplied");
public static final StoreApiException Store_deleteOrder_404_Exception = new StoreApiException(404, "Order not found");
public static final StoreApiException Store_getInventory_200_Exception = new StoreApiException(200, "successful operation");
public static final StoreApiException Store_getOrderById_200_Exception = new StoreApiException(200, "successful operation");
public static final StoreApiException Store_getOrderById_400_Exception = new StoreApiException(400, "Invalid ID supplied");
public static final StoreApiException Store_getOrderById_404_Exception = new StoreApiException(404, "Order not found");
public static final StoreApiException Store_placeOrder_200_Exception = new StoreApiException(200, "successful operation");
public static final StoreApiException Store_placeOrder_400_Exception = new StoreApiException(400, "Invalid Order");

View File

@@ -10,8 +10,10 @@ public final class UserApiException extends MainApiException {
public static final UserApiException User_deleteUser_400_Exception = new UserApiException(400, "Invalid username supplied");
public static final UserApiException User_deleteUser_404_Exception = new UserApiException(404, "User not found");
public static final UserApiException User_getUserByName_200_Exception = new UserApiException(200, "successful operation");
public static final UserApiException User_getUserByName_400_Exception = new UserApiException(400, "Invalid username supplied");
public static final UserApiException User_getUserByName_404_Exception = new UserApiException(404, "User not found");
public static final UserApiException User_loginUser_200_Exception = new UserApiException(200, "successful operation");
public static final UserApiException User_loginUser_400_Exception = new UserApiException(400, "Invalid username/password supplied");
public static final UserApiException User_updateUser_400_Exception = new UserApiException(400, "Invalid user supplied");
public static final UserApiException User_updateUser_404_Exception = new UserApiException(404, "User not found");

View File

@@ -0,0 +1,21 @@
README.md
pom.xml
src/main/java/org/openapitools/server/api/MainApiException.java
src/main/java/org/openapitools/server/api/MainApiVerticle.java
src/main/java/org/openapitools/server/api/model/Category.java
src/main/java/org/openapitools/server/api/model/ModelApiResponse.java
src/main/java/org/openapitools/server/api/model/Order.java
src/main/java/org/openapitools/server/api/model/Pet.java
src/main/java/org/openapitools/server/api/model/Tag.java
src/main/java/org/openapitools/server/api/model/User.java
src/main/java/org/openapitools/server/api/verticle/PetApi.java
src/main/java/org/openapitools/server/api/verticle/PetApiException.java
src/main/java/org/openapitools/server/api/verticle/PetApiVerticle.java
src/main/java/org/openapitools/server/api/verticle/StoreApi.java
src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
src/main/java/org/openapitools/server/api/verticle/StoreApiVerticle.java
src/main/java/org/openapitools/server/api/verticle/UserApi.java
src/main/java/org/openapitools/server/api/verticle/UserApiException.java
src/main/java/org/openapitools/server/api/verticle/UserApiVerticle.java
src/main/resources/openapi.json
src/main/resources/vertx-default-jul-logging.properties

View File

@@ -1 +1 @@
4.2.3-SNAPSHOT
5.0.0-SNAPSHOT

View File

@@ -1,32 +1,32 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId>
<artifactId>java-vertx-rx-server</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId>
<artifactId>java-vertx-rx-server</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Swagger Petstore</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<junit.version>4.13</junit.version>
<vertx.version>3.4.1</vertx.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
</properties>
<name>OpenAPI Petstore</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<junit.version>4.13</junit.version>
<vertx.version>3.4.1</vertx.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
@@ -35,7 +35,7 @@
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>com.github.phiz71</groupId>
<artifactId>vertx-swagger-router</artifactId>
<version>${vertx-swagger-router.version}</version>
@@ -47,45 +47,45 @@
<version>${jackson-datatype-jsr310.version}</version>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>io.vertx.core.Starter</Main-Class>
<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
</manifestEntries>
</transformer>
</transformers>
<artifactSet />
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>io.vertx.core.Starter</Main-Class>
<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
</manifestEntries>
</transformer>
</transformers>
<artifactSet />
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -12,14 +12,18 @@ public final class PetApiException extends MainApiException {
public static final PetApiException Pet_addPet_405_Exception = new PetApiException(405, "Invalid input");
public static final PetApiException Pet_deletePet_400_Exception = new PetApiException(400, "Invalid pet value");
public static final PetApiException Pet_findPetsByStatus_200_Exception = new PetApiException(200, "successful operation");
public static final PetApiException Pet_findPetsByStatus_400_Exception = new PetApiException(400, "Invalid status value");
public static final PetApiException Pet_findPetsByTags_200_Exception = new PetApiException(200, "successful operation");
public static final PetApiException Pet_findPetsByTags_400_Exception = new PetApiException(400, "Invalid tag value");
public static final PetApiException Pet_getPetById_200_Exception = new PetApiException(200, "successful operation");
public static final PetApiException Pet_getPetById_400_Exception = new PetApiException(400, "Invalid ID supplied");
public static final PetApiException Pet_getPetById_404_Exception = new PetApiException(404, "Pet not found");
public static final PetApiException Pet_updatePet_400_Exception = new PetApiException(400, "Invalid ID supplied");
public static final PetApiException Pet_updatePet_404_Exception = new PetApiException(404, "Pet not found");
public static final PetApiException Pet_updatePet_405_Exception = new PetApiException(405, "Validation exception");
public static final PetApiException Pet_updatePetWithForm_405_Exception = new PetApiException(405, "Invalid input");
public static final PetApiException Pet_uploadFile_200_Exception = new PetApiException(200, "successful operation");
}

View File

@@ -10,8 +10,11 @@ public final class StoreApiException extends MainApiException {
public static final StoreApiException Store_deleteOrder_400_Exception = new StoreApiException(400, "Invalid ID supplied");
public static final StoreApiException Store_deleteOrder_404_Exception = new StoreApiException(404, "Order not found");
public static final StoreApiException Store_getInventory_200_Exception = new StoreApiException(200, "successful operation");
public static final StoreApiException Store_getOrderById_200_Exception = new StoreApiException(200, "successful operation");
public static final StoreApiException Store_getOrderById_400_Exception = new StoreApiException(400, "Invalid ID supplied");
public static final StoreApiException Store_getOrderById_404_Exception = new StoreApiException(404, "Order not found");
public static final StoreApiException Store_placeOrder_200_Exception = new StoreApiException(200, "successful operation");
public static final StoreApiException Store_placeOrder_400_Exception = new StoreApiException(400, "Invalid Order");

View File

@@ -10,8 +10,10 @@ public final class UserApiException extends MainApiException {
public static final UserApiException User_deleteUser_400_Exception = new UserApiException(400, "Invalid username supplied");
public static final UserApiException User_deleteUser_404_Exception = new UserApiException(404, "User not found");
public static final UserApiException User_getUserByName_200_Exception = new UserApiException(200, "successful operation");
public static final UserApiException User_getUserByName_400_Exception = new UserApiException(400, "Invalid username supplied");
public static final UserApiException User_getUserByName_404_Exception = new UserApiException(404, "User not found");
public static final UserApiException User_loginUser_200_Exception = new UserApiException(200, "successful operation");
public static final UserApiException User_loginUser_400_Exception = new UserApiException(400, "Invalid username/password supplied");
public static final UserApiException User_updateUser_400_Exception = new UserApiException(400, "Invalid user supplied");
public static final UserApiException User_updateUser_404_Exception = new UserApiException(404, "User not found");