Skip to content

[Ada] Fix GNAT project and server skeleton to avoid sending a response when an error is returned #7574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 5, 2018
Merged

[Ada] Fix GNAT project and server skeleton to avoid sending a response when an error is returned #7574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3238b2c
Fix the GNAT project for the client and server to avoid using unecess…
stcarrez Feb 2, 2018
88477dd
Define a minimal configuration for user and application definition
stcarrez Feb 2, 2018
f830115
Fix the server skeleton to emit the response only when the status cod…
stcarrez Feb 2, 2018
fff8f50
Fix the Ada petstore GNAT project
stcarrez Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public void processOpts() {
additionalProperties.put("packageConfig", configBaseName);
additionalProperties.put("packageDir", "client");
additionalProperties.put("mainName", "client");
additionalProperties.put("isServer", false);
additionalProperties.put(CodegenConstants.PROJECT_NAME, projectName);

String names[] = this.modelPackage.split("\\.");
Expand Down
1 change: 1 addition & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public void processOpts() {
additionalProperties.put("packageConfig", configBaseName);
additionalProperties.put("packageDir", "server");
additionalProperties.put("mainName", "server");
additionalProperties.put("isServer", "true");
additionalProperties.put(CodegenConstants.PROJECT_NAME, projectName);

String names[] = this.modelPackage.split("\\.");
Expand Down
5 changes: 3 additions & 2 deletions modules/swagger-codegen/src/main/resources/Ada/gnat-project.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
with "config";
with "util";
with "util_http";
with "asf";
with "security";
with "swagger";
with "swagger";{{#isServer}}
with "servlet";
with "swagger_server";{{/isServer}}
project {{{projectName}}} is

Mains := ("{{{packageName}}}-{{{mainName}}}.adb");
Expand Down
17 changes: 16 additions & 1 deletion modules/swagger-codegen/src/main/resources/Ada/server-properties.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
swagger.dir=web
swagger.web.enable=false
swagger.ui.enable=true
swagger.port=8080
swagger.apps=app
swagger.users=users
swagger.key=NTk4YzEyODNhMjM4IDJjMjNkOGFiNThkYSBkZWExOTQ1MTQ2YjkgZmIxNGM4NWY4OGQzCg

app.list=1
app.1.client_id=test-app
app.1.client_secret=test-app-secret
app.1.scope=none

users.list=1,2
users.1.username=admin
users.1.password=admin
users.2.username=test
users.2.password=test

# Configuration for log4j
log4j.rootCategory=DEBUG,console,result
Expand All @@ -15,7 +30,7 @@ log4j.logger.log=WARN
log4j.logger.Util.Properties=DEBUG
log4j.logger.Util.Log=WARN
log4j.logger.Util=DEBUG
log4j.logger.ASF=DEBUG
log4j.logger.Servlet=DEBUG
log4j.logger.Util.Serialize.Mappers=WARN
log4j.logger.Util.Serialize.IO=INFO

Expand Down
24 changes: 14 additions & 10 deletions modules/swagger-codegen/src/main/resources/Ada/server-skeleton-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ package body {{package}}.Skeletons is
{{/returnType}}
{{/hasParams}}
{{#returnType}}
Stream.Start_Document;{{#vendorExtensions.x-codegen-response.isString}}
Swagger.Streams.Serialize (Stream, "", Result);{{/vendorExtensions.x-codegen-response.isString}}{{^vendorExtensions.x-codegen-response.isString}}{{#returnTypeIsPrimitive}}
Swagger.Streams.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}
{{package}}.Models.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{/vendorExtensions.x-codegen-response.isString}}
Stream.End_Document;{{/returnType}}
if Context.Get_Status = 200 then
Stream.Start_Document;{{#vendorExtensions.x-codegen-response.isString}}
Swagger.Streams.Serialize (Stream, "", Result);{{/vendorExtensions.x-codegen-response.isString}}{{^vendorExtensions.x-codegen-response.isString}}{{#returnTypeIsPrimitive}}
Swagger.Streams.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}
{{package}}.Models.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{/vendorExtensions.x-codegen-response.isString}}
Stream.End_Document;
end if;{{/returnType}}
end {{operationId}};
{{/operation}}
{{/operations}}
Expand Down Expand Up @@ -171,11 +173,13 @@ package body {{package}}.Skeletons is
{{/returnType}}
{{/hasParams}}
{{#returnType}}
Stream.Start_Document;{{#vendorExtensions.x-codegen-response.isString}}
Swagger.Streams.Serialize (Stream, "", Result);{{/vendorExtensions.x-codegen-response.isString}}{{^vendorExtensions.x-codegen-response.isString}}{{#returnTypeIsPrimitive}}
Swagger.Streams.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}
{{package}}.Models.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{/vendorExtensions.x-codegen-response.isString}}
Stream.End_Document;{{/returnType}}
if Context.Get_Status = 200 then
Stream.Start_Document;{{#vendorExtensions.x-codegen-response.isString}}
Swagger.Streams.Serialize (Stream, "", Result);{{/vendorExtensions.x-codegen-response.isString}}{{^vendorExtensions.x-codegen-response.isString}}{{#returnTypeIsPrimitive}}
Swagger.Streams.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}
{{package}}.Models.Serialize (Stream, "", Result);{{/returnTypeIsPrimitive}}{{/vendorExtensions.x-codegen-response.isString}}
Stream.End_Document;
end if;{{/returnType}}
end {{operationId}};

package API_{{operationId}} is
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ada/petstore.gpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
with "config";
with "util";
with "util_http";
with "asf";
with "security";
with "swagger";
project Petstore is
Expand Down