Merge pull request #950 from swagger-api/revert-923-branch_test

Revert "Fix for issue 922"

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -766,11 +766,6 @@ public String getString(String key, ObjectNode node, boolean required, String lo
         return getString(key, node, required, location, result, null);
     }
 
-    public String getStringWithDefaultValueSet(String key, ObjectNode node, boolean required, String location, ParseResult result) {
-
-        return getString(key, node, required, location, result, null);
-    }
-
     public Set<String> getKeys(ObjectNode node) {
         Set<String> keys = new LinkedHashSet<>();
         if (node == null) {
@@ -1325,23 +1320,6 @@ public Boolean getBoolean(String key, ObjectNode node, boolean required, String
         return value;
     }
 
-    public Boolean getBooleanWithDefaultValue(String key, ObjectNode node, String location) {
-        Boolean value = null;
-        JsonNode v = node.get(key);
-        if (node == null || v == null) {
-            return false;
-        } else {
-            if (v.getNodeType().equals(JsonNodeType.BOOLEAN)) {
-                value = v.asBoolean();
-            } else if (v.getNodeType().equals(JsonNodeType.STRING)) {
-                String stringValue = v.textValue();
-                return Boolean.parseBoolean(stringValue);
-            }
-        }
-        return value;
-    }
-
-
     public BigDecimal getBigDecimal(String key, ObjectNode node, boolean required, String location, ParseResult result) {
         BigDecimal value = null;
         JsonNode v = node.get(key);
@@ -1496,7 +1474,7 @@ public Parameter getParameter(ObjectNode obj, String location, ParseResult resul
             parameter.setDescription(value);
         }
 
-        Boolean required = getBooleanWithDefaultValue("required", obj, location);
+        Boolean required = getBoolean("required", obj, false, location, result);
         if (required != null) {
             parameter.setRequired(required);
         }else {
@@ -2256,7 +2234,6 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result){
             schema.setDefault(value);
         }
 
-
         //discriminator
 
         bool = getBoolean("nullable", node, false, location, result);
@@ -2295,12 +2272,11 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result){
             schema.setExample(example);
         }
 
-        bool = getBooleanWithDefaultValue("deprecated", node, location);
+        bool = getBoolean("deprecated", node, false, location, result);
         if(bool != null){
             schema.setDeprecated(bool);
         }
 
-
         Map <String,Object> extensions = getExtensions(node);
         if(extensions != null && extensions.size() > 0) {
             schema.setExtensions(extensions);
@@ -2621,7 +2597,7 @@ public Operation getOperation(ObjectNode obj, String location, ParseResult resul
             operation.setCallbacks(callbacks);
         }
 
-        Boolean deprecated = getBooleanWithDefaultValue("deprecated", obj, location);
+        Boolean deprecated = getBoolean("deprecated", obj, false, location, result);
         if (deprecated != null) {
             operation.setDeprecated(deprecated);
         }

modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java

@@ -2,8 +2,6 @@
 
 
 
-
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -24,7 +22,10 @@
 
 import java.util.List;
 
-import static org.testng.Assert.*;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 public class OpenAPIParserTest {
     @Test
@@ -461,14 +462,4 @@ public void testIssue879() {
         assertEquals(ref, "#/components/callbacks/callbackEvent");
     }
 
-    @Test
-    public void testIssue922() {
-       OpenAPIParser openAPIParser = new OpenAPIParser();
-       ParseOptions options = new ParseOptions();
-       OpenAPI openAPI = openAPIParser.readLocation("petstore.json",null,null).getOpenAPI();
-       assertNotNull(openAPI);
-       assertEquals(openAPI.getComponents().getSchemas().get("Pet").getDeprecated(),Boolean.FALSE);
-
-    }
-
 }