Merge pull request #1203 from ruks/master

gracekarina · web-flow · commit b2707ac210a0 · 2019-09-25T07:07:02.000-05:00
Fixed getting null scopes issue
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
@@ -1958,9 +1958,9 @@ public OAuthFlow getOAuthFlow(String oAuthFlowType, ObjectNode node, String loca
             JsonNode scopeValue = scopesObject.get(name);
             if (scopesObject!= null){
                 scope.addString(name,scopeValue.asText());
-                oAuthFlow.setScopes(scope);
             }
         }
+        oAuthFlow.setScopes(scope);
 
         Map <String,Object> extensions = getExtensions(node);
         if(extensions != null && extensions.size() > 0) {

Original file line number	Diff line number	Diff line change
`@@ -1958,9 +1958,9 @@ public OAuthFlow getOAuthFlow(String oAuthFlowType, ObjectNode node, String loca`
`1958`	`1958`	`JsonNode scopeValue = scopesObject.get(name);`
`1959`	`1959`	`if (scopesObject!= null){`
`1960`	`1960`	`scope.addString(name,scopeValue.asText());`
`1961`		`- oAuthFlow.setScopes(scope);`
`1962`	`1961`	`}`
`1963`	`1962`	`}`
	`1963`	`+ oAuthFlow.setScopes(scope);`
`1964`	`1964`
`1965`	`1965`	`Map <String,Object> extensions = getExtensions(node);`
`1966`	`1966`	`if(extensions != null && extensions.size() > 0) {`