Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-03-30 09:57:07 +08:00
125 changed files with 164 additions and 158 deletions

View File

@@ -16,6 +16,12 @@
## How to contribute
### git
If you're new to git, you may find the following FAQs useful:
https://github.com/swagger-api/swagger-codegen/wiki/FAQ#git
### Code generators
All the code generators can be found in [modules/swagger-codegen/src/main/java/io/swagger/codegen/languages](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages)

View File

@@ -26,7 +26,7 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey1 -DhideGenerationTimestamp=true --library=jersey1 --artifact-id=swagger-jaxrs-jersey1-server"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey1 -DhideGenerationTimestamp=true,serverPort=8080 --library=jersey1 --artifact-id=swagger-jaxrs-jersey1-server"
echo "Removing files and folders under samples/server/petstore/jaxrs/jersey1/src/main"
rm -rf samples/server/petstore/jaxrs/jersey1/src/main

View File

@@ -26,7 +26,7 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey2 -DhideGenerationTimestamp=true"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey2 -DhideGenerationTimestamp=true,serverPort=8080"
echo "Removing files and folders under samples/server/petstore/jaxrs/jersey2/src/main"
rm -rf samples/server/petstore/jaxrs/jersey2/src/main

View File

@@ -45,6 +45,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen
cliOptions.add(new CliOption("title", "a title describing the application"));
cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
cliOptions.add(new CliOption("serverPort", "The port on which the server should be started"));
}
@@ -83,7 +84,8 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen
swagger.setBasePath("");
}
String host = swagger.getHost();
if(!this.additionalProperties.containsKey("serverPort")) {
final String host = swagger.getHost();
String port = "8080"; // Default value for a JEE Server
if ( host != null ) {
String[] parts = host.split(":");
@@ -91,7 +93,10 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen
port = parts[1];
}
}
this.additionalProperties.put("serverPort", port);
}
if ( swagger.getPaths() != null ) {
for ( String pathname : swagger.getPaths().keySet() ) {
Path path = swagger.getPath(pathname);

View File

@@ -92,6 +92,7 @@ public class JavaCXFServerOptionsProvider extends JavaOptionsProvider {
builder.put(JavaCXFServerCodegen.USE_ANNOTATED_BASE_PATH, USE_ANNOTATED_BASE_PATH);
builder.put(JavaCXFServerCodegen.GENERATE_NON_SPRING_APPLICATION, GENERATE_NON_SPRING_APPLICATION);
builder.put("serverPort", "3456");
return builder.build();

View File

@@ -43,6 +43,7 @@ public class JavaResteasyEapServerOptionsProvider extends JavaOptionsProvider {
builder.put(JavaCXFServerCodegen.GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR, GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR);
builder.put(JavaResteasyServerCodegen.USE_BEANVALIDATION, USE_BEANVALIDATION);
builder.put(JavaResteasyEapServerCodegen.USE_SWAGGER_FEATURE, USE_SWAGGER_FEATURE);
builder.put("serverPort", "1234");
return builder.build();

View File

@@ -39,6 +39,7 @@ public class JavaResteasyServerOptionsProvider extends JavaOptionsProvider {
builder.put(JavaCXFServerCodegen.GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR, GENERATE_JBOSS_DEPLOYMENT_DESCRIPTOR);
builder.put(JavaResteasyServerCodegen.USE_BEANVALIDATION, USE_BEANVALIDATION);
builder.put("serverPort", "1234");
return builder.build();

View File

@@ -84,6 +84,7 @@ public class JaxRSServerOptionsProvider implements OptionsProvider {
//.put(JavaClientCodegen.DATE_LIBRARY, "joda")
.put("hideGenerationTimestamp", "true")
.put(JavaCXFServerCodegen.USE_BEANVALIDATION, USE_BEANVALIDATION)
.put("serverPort", "2345")
.put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE);
return builder.build();

View File

@@ -769,7 +769,7 @@ echo " $ops" | column -t -s ';'
echo -e " -V,--version\t\t\t\tPrint API version"
echo -e " --about\t\t\t\tPrint the information about service"
echo -e " --host $(tput setaf 6)<url>$(tput sgr0)\t\t\t\tSpecify the host URL "
echo -e " \t\t\t\t(e.g. 'https://petstore.swagger.io')"
echo -e " \t\t\t\t(e.g. 'https://petstore.swagger.io:80')"
echo -e " --force\t\t\t\tForce command invocation in spite of missing"
echo -e " \t\t\t\trequired parameters or wrong content type"

View File

@@ -89,7 +89,7 @@ namespace Example
<a name="documentation-for-api-endpoints"></a>
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -48,17 +48,17 @@ namespace IO.Swagger.Client
/// <summary>
/// Initializes a new instance of the <see cref="ApiClient" /> class
/// with default configuration and base path (http://petstore.swagger.io/v2).
/// with default configuration and base path (http://petstore.swagger.io:80/v2).
/// </summary>
public ApiClient()
{
Configuration = Configuration.Default;
RestClient = new RestClient("http://petstore.swagger.io/v2");
RestClient = new RestClient("http://petstore.swagger.io:80/v2");
}
/// <summary>
/// Initializes a new instance of the <see cref="ApiClient" /> class
/// with default base path (http://petstore.swagger.io/v2).
/// with default base path (http://petstore.swagger.io:80/v2).
/// </summary>
/// <param name="config">An instance of Configuration.</param>
public ApiClient(Configuration config = null)
@@ -68,7 +68,7 @@ namespace IO.Swagger.Client
else
Configuration = config;
RestClient = new RestClient("http://petstore.swagger.io/v2");
RestClient = new RestClient("http://petstore.swagger.io:80/v2");
}
/// <summary>
@@ -76,7 +76,7 @@ namespace IO.Swagger.Client
/// with default configuration.
/// </summary>
/// <param name="basePath">The base path.</param>
public ApiClient(String basePath = "http://petstore.swagger.io/v2")
public ApiClient(String basePath = "http://petstore.swagger.io:80/v2")
{
if (String.IsNullOrEmpty(basePath))
throw new ArgumentException("basePath cannot be empty");

View File

@@ -89,7 +89,7 @@ namespace Example
<a name="documentation-for-api-endpoints"></a>
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# IO.Swagger.Api.UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -48,17 +48,17 @@ namespace IO.Swagger.Client
/// <summary>
/// Initializes a new instance of the <see cref="ApiClient" /> class
/// with default configuration and base path (http://petstore.swagger.io/v2).
/// with default configuration and base path (http://petstore.swagger.io:80/v2).
/// </summary>
public ApiClient()
{
Configuration = Configuration.Default;
RestClient = new RestClient("http://petstore.swagger.io/v2");
RestClient = new RestClient("http://petstore.swagger.io:80/v2");
}
/// <summary>
/// Initializes a new instance of the <see cref="ApiClient" /> class
/// with default base path (http://petstore.swagger.io/v2).
/// with default base path (http://petstore.swagger.io:80/v2).
/// </summary>
/// <param name="config">An instance of Configuration.</param>
public ApiClient(Configuration config = null)
@@ -68,7 +68,7 @@ namespace IO.Swagger.Client
else
Configuration = config;
RestClient = new RestClient("http://petstore.swagger.io/v2");
RestClient = new RestClient("http://petstore.swagger.io:80/v2");
}
/// <summary>
@@ -76,7 +76,7 @@ namespace IO.Swagger.Client
/// with default configuration.
/// </summary>
/// <param name="basePath">The base path.</param>
public ApiClient(String basePath = "http://petstore.swagger.io/v2")
public ApiClient(String basePath = "http://petstore.swagger.io:80/v2")
{
if (String.IsNullOrEmpty(basePath))
throw new ArgumentException("basePath cannot be empty");

View File

@@ -5,7 +5,7 @@ defmodule SwaggerPetstore.Api.Fake do
use Tesla
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io/v2"
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io:80/v2"
plug Tesla.Middleware.JSON
def test_client_model(body) do

View File

@@ -5,7 +5,7 @@ defmodule SwaggerPetstore.Api.Pet do
use Tesla
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io/v2"
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io:80/v2"
plug Tesla.Middleware.JSON
def add_pet(body) do

View File

@@ -5,7 +5,7 @@ defmodule SwaggerPetstore.Api.Store do
use Tesla
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io/v2"
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io:80/v2"
plug Tesla.Middleware.JSON
def delete_order(order_id) do

View File

@@ -5,7 +5,7 @@ defmodule SwaggerPetstore.Api.User do
use Tesla
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io/v2"
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io:80/v2"
plug Tesla.Middleware.JSON
def create_user(body) do

View File

@@ -17,7 +17,7 @@ Put the package under your project folder and add the following in import:
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -38,7 +38,7 @@ type Configuration struct {
func NewConfiguration() *Configuration {
cfg := &Configuration{
BasePath: "http://petstore.swagger.io/v2",
BasePath: "http://petstore.swagger.io:80/v2",
DefaultHeader: make(map[string]string),
APIKey: make(map[string]string),
APIKeyPrefix: make(map[string]string),

View File

@@ -1,6 +1,6 @@
# \FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# \PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# \StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# \UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -26,7 +26,7 @@ public class ApiClient {
public interface Api {}
protected ObjectMapper objectMapper;
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private Map<String, RequestInterceptor> apiAuthorizations;
private Feign.Builder feignBuilder;

View File

@@ -29,7 +29,7 @@ public class PetApiTest {
@Test
public void testApiClient() {
// the default api client is used
assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
ApiClient newClient = new ApiClient();
newClient.setBasePath("http://example.com");

View File

@@ -1,6 +1,6 @@
# FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -58,7 +58,7 @@ import io.swagger.client.auth.OAuth;
public class ApiClient {
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private boolean debugging = false;
private int connectionTimeout = 0;

View File

@@ -9,7 +9,7 @@ public class ConfigurationTest {
public void testDefaultApiClient() {
ApiClient apiClient = Configuration.getDefaultApiClient();
assertNotNull(apiClient);
assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
assertFalse(apiClient.isDebugging());
}
}

View File

@@ -34,7 +34,7 @@ public class PetApiTest {
// the default api client is used
assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
assertNotNull(api.getApiClient());
assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
assertFalse(api.getApiClient().isDebugging());
ApiClient oldClient = api.getApiClient();
@@ -52,7 +52,7 @@ public class PetApiTest {
// set api client via setter method
api.setApiClient(oldClient);
assertNotNull(api.getApiClient());
assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
assertFalse(api.getApiClient().isDebugging());
}

View File

@@ -1,6 +1,6 @@
# FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -51,7 +51,7 @@ import io.swagger.client.auth.OAuth;
public class ApiClient {
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private boolean debugging = false;
private int connectionTimeout = 0;

View File

@@ -1,6 +1,6 @@
# FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -51,7 +51,7 @@ import io.swagger.client.auth.OAuth;
public class ApiClient {
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private boolean debugging = false;
private int connectionTimeout = 0;

View File

@@ -1,6 +1,6 @@
# FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -51,7 +51,7 @@ import io.swagger.client.auth.OAuth;
public class ApiClient {
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private boolean debugging = false;
private int connectionTimeout = 0;

View File

@@ -9,7 +9,7 @@ public class ConfigurationTest {
public void testDefaultApiClient() {
ApiClient apiClient = Configuration.getDefaultApiClient();
assertNotNull(apiClient);
assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
assertFalse(apiClient.isDebugging());
}
}

View File

@@ -36,7 +36,7 @@ public class PetApiTest {
// the default api client is used
assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
assertNotNull(api.getApiClient());
assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
assertFalse(api.getApiClient().isDebugging());
ApiClient oldClient = api.getApiClient();
@@ -54,7 +54,7 @@ public class PetApiTest {
// set api client via setter method
api.setApiClient(oldClient);
assertNotNull(api.getApiClient());
assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
assertFalse(api.getApiClient().isDebugging());
}

View File

@@ -1,6 +1,6 @@
# FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# FakeClassnameTags123Api
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -52,7 +52,7 @@ import io.swagger.client.auth.OAuth;
public class ApiClient {
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private boolean debugging = false;
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
private String tempFolderPath = null;
@@ -76,16 +76,7 @@ public class ApiClient {
verifyingSsl = true;
json = new JSON(this);
/*
* Use RFC3339 format for date and datetime.
* See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
*/
this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
// Always use UTC as the default time zone when dealing with date (without time).
this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
initDatetimeFormat();
json = new JSON();
// Set default User-Agent.
setUserAgent("Swagger-Codegen/1.0.0/java");
@@ -111,7 +102,7 @@ public class ApiClient {
/**
* Set base path
*
* @param basePath Base path of the URL (e.g http://petstore.swagger.io/v2
* @param basePath Base path of the URL (e.g http://petstore.swagger.io:80/v2
* @return An instance of OkHttpClient
*/
public ApiClient setBasePath(String basePath) {

View File

@@ -1,6 +1,6 @@
# FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# FakeClassnameTags123Api
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -52,7 +52,7 @@ import io.swagger.client.auth.OAuth;
public class ApiClient {
private String basePath = "http://petstore.swagger.io/v2";
private String basePath = "http://petstore.swagger.io:80/v2";
private boolean debugging = false;
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
private String tempFolderPath = null;
@@ -102,7 +102,7 @@ public class ApiClient {
/**
* Set base path
*
* @param basePath Base path of the URL (e.g http://petstore.swagger.io/v2
* @param basePath Base path of the URL (e.g http://petstore.swagger.io:80/v2
* @return An instance of OkHttpClient
*/
public ApiClient setBasePath(String basePath) {

View File

@@ -9,7 +9,7 @@ public class ConfigurationTest {
public void testDefaultApiClient() {
ApiClient apiClient = Configuration.getDefaultApiClient();
assertNotNull(apiClient);
assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
assertFalse(apiClient.isDebugging());
}
}

View File

@@ -35,7 +35,7 @@ public class PetApiTest {
// the default api client is used
assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
assertNotNull(api.getApiClient());
assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
assertFalse(api.getApiClient().isDebugging());
ApiClient oldClient = api.getApiClient();
@@ -53,7 +53,7 @@ public class PetApiTest {
// set api client via setter method
api.setApiClient(oldClient);
assertNotNull(api.getApiClient());
assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
assertEquals("http://petstore.swagger.io:80/v2", api.getApiClient().getBasePath());
assertFalse(api.getApiClient().isDebugging());
}

View File

@@ -126,7 +126,7 @@ public class ApiClient {
adapterBuilder = new RestAdapter
.Builder()
.setEndpoint("http://petstore.swagger.io/v2")
.setEndpoint("http://petstore.swagger.io:80/v2")
.setClient(new OkClient(okClient))
.setConverter(new GsonConverterWrapper(gson));
}

View File

@@ -67,7 +67,7 @@ api.testClientModel(body).then(function(data) {
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -44,9 +44,9 @@
/**
* The base URL against which to resolve every API call's (relative) path.
* @type {String}
* @default http://petstore.swagger.io/v2
* @default http://petstore.swagger.io:80/v2
*/
this.basePath = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
this.basePath = 'http://petstore.swagger.io:80/v2'.replace(/\/+$/, '');
/**
* The authentication methods to be included for all API calls.

View File

@@ -70,7 +70,7 @@ api.testClientModel(body, callback);
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# SwaggerPetstore.UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -44,9 +44,9 @@
/**
* The base URL against which to resolve every API call's (relative) path.
* @type {String}
* @default http://petstore.swagger.io/v2
* @default http://petstore.swagger.io:80/v2
*/
this.basePath = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
this.basePath = 'http://petstore.swagger.io:80/v2'.replace(/\/+$/, '');
/**
* The authentication methods to be included for all API calls.

View File

@@ -10,7 +10,7 @@ describe('ApiClient', function() {
describe('defaults', function() {
it('should have correct default values with the default API client', function() {
expect(apiClient).to.be.ok();
expect(apiClient.basePath).to.be('http://petstore.swagger.io/v2');
expect(apiClient.basePath).to.be('http://petstore.swagger.io:80/v2');
expect(apiClient.authentications).to.eql({
petstore_auth: {type: 'oauth2'},
http_basic_test: {type: 'basic'},
@@ -45,8 +45,8 @@ describe('ApiClient', function() {
it('should have correct default values with new API client and can customize it', function() {
var newClient = new SwaggerPetstore.ApiClient;
expect(newClient.basePath).to.be('http://petstore.swagger.io/v2');
expect(newClient.buildUrl('/abc', {})).to.be('http://petstore.swagger.io/v2/abc');
expect(newClient.basePath).to.be('http://petstore.swagger.io:80/v2');
expect(newClient.buildUrl('/abc', {})).to.be('http://petstore.swagger.io:80/v2/abc');
newClient.basePath = 'http://example.com';
expect(newClient.basePath).to.be('http://example.com');
@@ -102,16 +102,16 @@ describe('ApiClient', function() {
describe('#buildUrl', function() {
it('should work without path parameters in the path', function() {
expect(apiClient.buildUrl('/abc', {})).to
.be('http://petstore.swagger.io/v2/abc');
.be('http://petstore.swagger.io:80/v2/abc');
expect(apiClient.buildUrl('/abc/def?ok', {id: 123})).to
.be('http://petstore.swagger.io/v2/abc/def?ok');
.be('http://petstore.swagger.io:80/v2/abc/def?ok');
});
it('should work with path parameters in the path', function() {
expect(apiClient.buildUrl('/{id}', {id: 123})).to
.be('http://petstore.swagger.io/v2/123');
.be('http://petstore.swagger.io:80/v2/123');
expect(apiClient.buildUrl('/abc/{id}/{name}?ok', {id: 456, name: 'a b'})).to.
be('http://petstore.swagger.io/v2/abc/456/a%20b?ok');
be('http://petstore.swagger.io:80/v2/abc/456/a%20b?ok');
});
});

View File

@@ -335,7 +335,7 @@ if ($@) {
# DOCUMENTATION FOR API ENDPOINTS
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -5,7 +5,7 @@
use WWW::SwaggerClient::Object::FakeApi;
```
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -5,7 +5,7 @@
use WWW::SwaggerClient::Object::PetApi;
```
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -5,7 +5,7 @@
use WWW::SwaggerClient::Object::StoreApi;
```
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -5,7 +5,7 @@
use WWW::SwaggerClient::Object::UserApi;
```
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -46,7 +46,7 @@ sub _new_instance
my $class = shift;
my (%args) = (
'ua' => LWP::UserAgent->new,
'base_url' => 'http://petstore.swagger.io/v2',
'base_url' => 'http://petstore.swagger.io:80/v2',
@_
);

View File

@@ -71,7 +71,7 @@ try {
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# Swagger\Client\FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# Swagger\Client\PetApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# Swagger\Client\StoreApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# Swagger\Client\UserApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -88,7 +88,7 @@ class Configuration
*
* @var string
*/
protected $host = 'http://petstore.swagger.io/v2';
protected $host = 'http://petstore.swagger.io:80/v2';
/**
* Timeout (second) of the HTTP request, by default set to 0, no timeout

View File

@@ -65,7 +65,7 @@ except ApiException as e:
## Documentation for API Endpoints
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------
@@ -104,6 +104,7 @@ Class | Method | HTTP request | Description
- [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
- [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
- [ArrayTest](docs/ArrayTest.md)
- [Capitalization](docs/Capitalization.md)
- [Cat](docs/Cat.md)
- [Category](docs/Category.md)
- [ClassModel](docs/ClassModel.md)

View File

@@ -1,6 +1,6 @@
# petstore_api.FakeApi
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

View File

@@ -1,6 +1,6 @@
# petstore_api.FakeClassnameTags123Api
All URIs are relative to *http://petstore.swagger.io/v2*
All URIs are relative to *http://petstore.swagger.io:80/v2*
Method | HTTP request | Description
------------- | ------------- | -------------

Some files were not shown because too many files have changed in this diff Show More