Merge pull request #1955 from dastoikov/master

SpecFilter does not retain "deprecated":true properties of operations #1954

modules/swagger-core/src/main/java/io/swagger/core/filter/SpecFilter.java

@@ -245,7 +245,8 @@ public Operation filterOperation(SwaggerSpecFilter filter, Operation op, ApiDesc
                 .produces(op.getProduces())
                 .tags(op.getTags())
                 .externalDocs(op.getExternalDocs())
-                .vendorExtensions(op.getVendorExtensions());
+                .vendorExtensions(op.getVendorExtensions())
+                .deprecated(op.isDeprecated());
 
         List<Parameter> clonedParams = new ArrayList<Parameter>();
         if (op.getParameters() != null) {

modules/swagger-core/src/test/java/io/swagger/filter/SpecFilterTest.java

@@ -254,6 +254,29 @@ public void removeUnreferencedModelOverride() throws IOException {
         assertNotNull(filtered.getDefinitions().get("RootModel"));
     }
 
+    @Test(description = "Retain models referenced from additonalProperties")
+    public void retainModelsReferencesFromAdditionalProperties() throws IOException {
+        final Swagger swagger = getSwagger("specFiles/additionalpropsmodel.json");
+        final RemoveUnreferencedDefinitionsFilter remover = new RemoveUnreferencedDefinitionsFilter();
+        final Swagger filtered = new SpecFilter().filter(swagger, remover, null, null, null);
+
+        assertNotNull(filtered.getDefinitions().get("A"));
+        assertNotNull(filtered.getDefinitions().get("B"));
+    }
+
+    @Test(description = "Clone should retain any 'deperecated' flags present on operations")
+    public void cloneRetainDeperecatedFlags() throws IOException {
+        final Swagger swagger = getSwagger("specFiles/deprecatedoperationmodel.json");
+        final RemoveUnreferencedDefinitionsFilter remover = new RemoveUnreferencedDefinitionsFilter();
+        final Swagger filtered = new SpecFilter().filter(swagger, remover, null, null, null);
+
+        Operation operation = filtered.getPath("/test").getOperations().get(0);
+
+        Boolean deprectedFlag = operation.isDeprecated();
+        assertNotNull(deprectedFlag);
+        assertEquals(deprectedFlag, Boolean.TRUE);
+    }
+
     @Test(description = "it should filter models where some fields have no properties")
     public void filterNoPropertiesModels() throws IOException {
         final String modelName = "Array";

modules/swagger-core/src/test/resources/specFiles/deprecatedoperationmodel.json

@@ -0,0 +1,30 @@
+{
+  "swagger" : "2.0",
+  "tags" : [ {
+    "name" : "Test Api"
+  } ],
+  "paths" : {
+    "/test" : {
+      "get" : {
+        "tags" : [ "Test Api" ],
+        "operationId" : "getA",
+        "parameters" : [ ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/EmptyModel"
+            },
+            "headers" : { }
+          }
+        },
+        "deprecated" : true
+      }
+    }
+  },
+  "definitions" : {
+    "EmptyModel" : {
+      "type" : "object"
+    }
+  }
+}