diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaCodegen.java
index 84e5443ce6c..7e84f498abf 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaCodegen.java
@@ -66,6 +66,7 @@ public class AdaCodegen extends AbstractAdaCodegen implements CodegenConfig {
         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("\\.");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaServerCodegen.java
index 951ebec0f6c..b2ed41e157a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AdaServerCodegen.java
@@ -69,6 +69,7 @@ public class AdaServerCodegen extends AbstractAdaCodegen implements CodegenConfi
         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("\\.");
diff --git a/modules/swagger-codegen/src/main/resources/Ada/gnat-project.mustache b/modules/swagger-codegen/src/main/resources/Ada/gnat-project.mustache
index 5bc6621e968..71376d13649 100644
--- a/modules/swagger-codegen/src/main/resources/Ada/gnat-project.mustache
+++ b/modules/swagger-codegen/src/main/resources/Ada/gnat-project.mustache
@@ -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");
diff --git a/modules/swagger-codegen/src/main/resources/Ada/server-properties.mustache b/modules/swagger-codegen/src/main/resources/Ada/server-properties.mustache
index 654383c72f3..028837de4fc 100644
--- a/modules/swagger-codegen/src/main/resources/Ada/server-properties.mustache
+++ b/modules/swagger-codegen/src/main/resources/Ada/server-properties.mustache
@@ -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
@@ -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
 
diff --git a/modules/swagger-codegen/src/main/resources/Ada/server-skeleton-body.mustache b/modules/swagger-codegen/src/main/resources/Ada/server-skeleton-body.mustache
index a4e0d8d53c7..b14dd242d5d 100644
--- a/modules/swagger-codegen/src/main/resources/Ada/server-skeleton-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/Ada/server-skeleton-body.mustache
@@ -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}}
@@ -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
diff --git a/samples/client/petstore/ada/petstore.gpr b/samples/client/petstore/ada/petstore.gpr
index 8d28dc71535..4c8ce69b930 100644
--- a/samples/client/petstore/ada/petstore.gpr
+++ b/samples/client/petstore/ada/petstore.gpr
@@ -8,7 +8,6 @@
 with "config";
 with "util";
 with "util_http";
-with "asf";
 with "security";
 with "swagger";
 project Petstore is