Merge remote-tracking branch 'origin/master' into 6.0.x

This commit is contained in:
William Cheng
2021-09-01 14:16:17 +08:00
3893 changed files with 67761 additions and 15499 deletions

View File

@@ -405,7 +405,7 @@ No authorization required
### HTTP response details
| Status code | Description | Response headers |
|-------------|-------------|------------------|
| **200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user <br> * X-Expires-After - date in UTC when toekn expires <br> |
| **200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user <br> * X-Expires-After - date in UTC when token expires <br> |
| **400** | Invalid username/password supplied | - |

View File

@@ -9,6 +9,19 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>1.1.0</version>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.6</version>
@@ -112,7 +125,7 @@
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>

View File

@@ -20,6 +20,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.MediaType;
@@ -120,4 +121,3 @@ public interface PetApi {
@Produces({ "application/json" })
public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment fileDetail) throws ApiException, ProcessingException;
}

View File

@@ -18,6 +18,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.MediaType;
@@ -79,4 +80,3 @@ public interface StoreApi {
@Produces({ "application/xml", "application/json" })
public Order placeOrder(Order body) throws ApiException, ProcessingException;
}

View File

@@ -18,6 +18,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.MediaType;
@@ -110,4 +111,3 @@ public interface UserApi {
@Path("/{username}")
public void updateUser(@PathParam("username") String username, User body) throws ApiException, ProcessingException;
}

View File

@@ -35,7 +35,7 @@ public class Category {
@JsonbProperty("name")
private String name;
/**
* Get id
* @return id

View File

@@ -38,7 +38,7 @@ public class ModelApiResponse {
@JsonbProperty("message")
private String message;
/**
* Get code
* @return code

View File

@@ -47,7 +47,7 @@ public class Order {
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
String value;
@@ -93,7 +93,7 @@ public class Order {
@JsonbProperty("complete")
private Boolean complete = false;
/**
* Get id
* @return id

View File

@@ -53,7 +53,7 @@ public class Pet {
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
String value;
@@ -96,7 +96,7 @@ public class Pet {
**/
@JsonbProperty("status")
private StatusEnum status;
/**
* Get id
* @return id

View File

@@ -35,7 +35,7 @@ public class Tag {
@JsonbProperty("name")
private String name;
/**
* Get id
* @return id

View File

@@ -56,7 +56,7 @@ public class User {
**/
@JsonbProperty("userStatus")
private Integer userStatus;
/**
* Get id
* @return id