[Core] Fix filtering global authentication schemes

richardwhiuk · richardwhiuk · commit 664c71c4f207 · 2019-09-22T11:13:49.000+01:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -1056,14 +1056,19 @@ private void processOperation(String resourcePath, String httpMethod, Operation
                 }
 
                 Map<String, SecurityScheme> authMethods = getAuthMethods(securities, securitySchemes);
-                if (authMethods == null || authMethods.isEmpty()) {
-                    authMethods = getAuthMethods(globalSecurities, securitySchemes);
-                }
 
                 if (authMethods != null && !authMethods.isEmpty()) {
                     List<CodegenSecurity> fullAuthMethods = config.fromSecurity(authMethods);
                     codegenOperation.authMethods = filterAuthMethods(fullAuthMethods, securities);
                     codegenOperation.hasAuthMethods = true;
+                } else {
+                    authMethods = getAuthMethods(globalSecurities, securitySchemes);
+
+                    if (authMethods != null && !authMethods.isEmpty()) {
+                        List<CodegenSecurity> fullAuthMethods = config.fromSecurity(authMethods);
+                        codegenOperation.authMethods = filterAuthMethods(fullAuthMethods, globalSecurities);
+                        codegenOperation.hasAuthMethods = true;
+                    }
                 }
 
             } catch (Exception ex) {
