Skip to content

Commit 91683b4

Browse files
HugoMarioHugoMario
authored
Merge branch 'master' into springfox.3
2 parents c65c456 + e2e3818 commit 91683b4

Some content is hidden

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

42 files changed

+3590
-28
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>io.swagger.codegen.v3</groupId>
1414
<artifactId>swagger-codegen-generators</artifactId>
15-
<version>1.0.22-SNAPSHOT</version>
15+
<version>1.0.23-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717

1818
<build>
@@ -252,8 +252,8 @@
252252
</dependency>
253253
</dependencies>
254254
<properties>
255-
<swagger-codegen-version>3.0.22-SNAPSHOT</swagger-codegen-version>
256-
<swagger-parser-version>2.0.22-SNAPSHOT</swagger-parser-version>
255+
<swagger-codegen-version>3.0.23-SNAPSHOT</swagger-codegen-version>
256+
<swagger-parser-version>2.0.22</swagger-parser-version>
257257
<swagger-core-version>2.1.4</swagger-core-version>
258258
<jackson-version>2.10.3</jackson-version>
259259
<scala-version>2.11.1</scala-version>

‎src/main/java/io/swagger/codegen/v3/generators/ruby/RubyClientCodegen.java

Lines changed: 747 additions & 0 deletions
Large diffs are not rendered by default.

‎src/main/resources/META-INF/services/io.swagger.codegen.v3.CodegenConfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ io.swagger.codegen.v3.generators.php.PhpClientCodegen
2828
io.swagger.codegen.v3.generators.python.PythonClientCodegen
2929
io.swagger.codegen.v3.generators.python.PythonFlaskConnexionCodegen
3030
io.swagger.codegen.v3.generators.r.RClientCodegen
31+
io.swagger.codegen.v3.generators.ruby.RubyClientCodegen
3132
io.swagger.codegen.v3.generators.scala.ScalaClientCodegen
3233
io.swagger.codegen.v3.generators.scala.AkkaHttpServerCodegen
3334
io.swagger.codegen.v3.generators.swift.Swift3Codegen

‎src/main/resources/handlebars/JavaMicronaut/beanValidationHeaderParams.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{#required}}@NotNull {{/required}}{{^required}}@Nullable {{/required}}{{>beanValidationCore}}

‎src/main/resources/handlebars/JavaMicronaut/beanValidationQueryParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#required}}@NotNull {{/required}}{{>beanValidationCore}}
1+
{{#required}}@NotNull {{/required}}{{^required}}@Nullable {{/required}}{{>beanValidationCore}}

‎src/main/resources/handlebars/JavaMicronaut/headerParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isHeaderParam}}@Parameter(description = "{{{description}}}" {{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @Header(value = "{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}
1+
{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}" {{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{/useBeanValidation}}@Header(value = "{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}

‎src/main/resources/handlebars/JavaMicronaut/queryParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{#required}}@NotNull {{/required}}{{/useBeanValidation}}@QueryValue(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
1+
{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{/useBeanValidation}}@QueryValue(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}

‎src/main/resources/handlebars/aspnetcore/Solution.mustache

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26114.2
4+
VisualStudioVersion = 15.0.27428.2043
45
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "{{packageName}}", "src{{backslash}}{{packageName}}{{backslash}}{{packageName}}.csproj", "{{packageGuid}}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{packageName}}", "{{sourceFolder}}{{backslash}}{{packageName}}{{backslash}}{{packageName}}.csproj", "{{packageGuid}}"
67
EndProject
78
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Any CPU = Debug|Any CPU
10-
Release|Any CPU = Release|Any CPU
11-
EndGlobalSection
12-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{{packageGuid}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{{packageGuid}}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{{packageGuid}}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{{packageGuid}}.Release|Any CPU.Build.0 = Release|Any CPU
17-
EndGlobalSection
18-
GlobalSection(SolutionProperties) = preSolution
19-
HideSolutionNode = FALSE
20-
EndGlobalSection
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{{packageGuid}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{{packageGuid}}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{{packageGuid}}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{{packageGuid}}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
2122
EndGlobal

‎src/main/resources/handlebars/kotlin-client/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(base
3434
"{{path}}"{{#pathParams}}.replace("{" + "{{baseName}}" + "}", "${{paramName}}"){{/pathParams}}{{#hasQueryParams}}, query = localVariableQuery{{/hasQueryParams}}{{#or hasFormParams hasHeaderParams}}, headers = localVariableHeaders{{/or}}
3535
)
3636
val response = request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Any?{{/returnType}}>(
37-
localVariableConfig{{#or hasFormParams hasHeaderParams}}, localVariableBody{{/or}}
37+
localVariableConfig{{#or hasFormParams hasBodyParam}}, localVariableBody{{/or}}
3838
)
3939

4040
return when (response.responseType) {

‎src/main/resources/handlebars/ruby/Gemfile.mustache

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec
4+
5+
group :development, :test do
6+
gem 'rake', '~> 13.0.1'
7+
gem 'pry-byebug'
8+
gem 'rubocop', '~> 0.66.0'
9+
end

0 commit comments

Comments
 (0)