Add security to methods if not defined on controller class.

noboomu · May 23, 2017 · ec4fc90 · ec4fc90
1 parent f8dd4f5
commit ec4fc90
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java b/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java
@@ -1101,8 +1101,7 @@ else if (producesContentType.contains(MediaType.TEXT_HTML))
 
 			List<String> securityDefinitions = new ArrayList<>();
 
-			securityDefinitions.addAll(typeLevelSecurityDefinitions);
-
+
 			if( Optional.ofNullable(m.getAnnotation(io.swagger.annotations.ApiOperation.class)).isPresent() )
 			{
 				io.swagger.annotations.ApiOperation apiOperationAnnotation = m.getAnnotation(io.swagger.annotations.ApiOperation.class);
@@ -1119,6 +1118,11 @@ else if (producesContentType.contains(MediaType.TEXT_HTML))
 					}
 				} 
 			}
+
+			if(securityDefinitions.isEmpty())
+			{
+				securityDefinitions.addAll(typeLevelSecurityDefinitions);
+			}
 
 
 			if (wrapAnnotation.isPresent() || typeLevelHandlerWrapperMap.size() > 0 || securityDefinitions.size() > 0)