Replaced loops with Java8 idioms

dilipkrish · dilipkrish · commit 90b98b58b79a · 2018-08-12T15:03:49.000-05:00
Cleaned up unescessary casting

(1773)
diff --git a/springfox-spring-webflux/src/main/java/springfox/documentation/spring/web/WebFluxNameValueExpressionWrapper.java b/springfox-spring-webflux/src/main/java/springfox/documentation/spring/web/WebFluxNameValueExpressionWrapper.java
@@ -27,15 +27,14 @@
 public class WebFluxNameValueExpressionWrapper<T> implements NameValueExpression {
     private org.springframework.web.reactive.result.condition.NameValueExpression<T> e;
 
-    public static <T> Set<NameValueExpression<T>> from(Set<org.springframework.web.reactive.result.condition.NameValueExpression<T>> springSet) {
-        Set<NameValueExpression<T>> wrapped = new HashSet<NameValueExpression<T>>();
 
-        for (org.springframework.web.reactive.result.condition.NameValueExpression e: springSet) {
-            wrapped.add(new WebFluxNameValueExpressionWrapper<T>(e));
-        }
+  public static <T> Set<NameValueExpression<T>> from(
+      Set<org.springframework.web.reactive.result.condition.NameValueExpression<T>> springSet) {
 
-        return wrapped;
-    }
+    return springSet.stream()
+        .map(WebFluxNameValueExpressionWrapper::new)
+        .collect(Collectors.toSet());
+  }
 
     public WebFluxNameValueExpressionWrapper(org.springframework.web.reactive.result.condition.NameValueExpression<T> e) {
         this.e = e;
diff --git a/springfox-spring-webflux/src/main/java/springfox/documentation/spring/web/plugins/WebFluxRequestHandlerProvider.java b/springfox-spring-webflux/src/main/java/springfox/documentation/spring/web/plugins/WebFluxRequestHandlerProvider.java
@@ -63,25 +63,15 @@ public List<RequestHandler> requestHandlers() {
         .collect(toList());
   }
 
-  private Function<? super RequestMappingInfoHandlerMapping,
-        Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>> toMappingEntries() {
-    return new Function<RequestMappingInfoHandlerMapping, Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>>() {
-      @Override
-      public Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>> apply(RequestMappingInfoHandlerMapping input) {
-        return input.getHandlerMethods().entrySet();
-      }
-    };
+  private Function<RequestMappingInfoHandlerMapping,
+      Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>> toMappingEntries() {
+    return input -> input.getHandlerMethods().entrySet();
   }
 
   private Function<Map.Entry<RequestMappingInfo, HandlerMethod>, RequestHandler> toRequestHandler() {
-    return new Function<Map.Entry<RequestMappingInfo, HandlerMethod>, RequestHandler>() {
-      @Override
-      public WebFluxRequestHandler apply(Map.Entry<RequestMappingInfo, HandlerMethod> input) {
-        return new WebFluxRequestHandler(
-            methodResolver,
-            input.getKey(),
-            input.getValue());
-      }
-    };
+    return input -> new WebFluxRequestHandler(
+        methodResolver,
+        input.getKey(),
+        input.getValue());
   }
 }
diff --git a/springfox-spring-webmvc/src/main/java/springfox/documentation/spring/web/WebMvcNameValueExpressionWrapper.java b/springfox-spring-webmvc/src/main/java/springfox/documentation/spring/web/WebMvcNameValueExpressionWrapper.java
@@ -27,15 +27,14 @@
 public class WebMvcNameValueExpressionWrapper<T> implements NameValueExpression {
     private org.springframework.web.servlet.mvc.condition.NameValueExpression<T> e;
 
-    public static <T> Set<NameValueExpression<T>> from(Set<org.springframework.web.servlet.mvc.condition.NameValueExpression<T>> springSet) {
-        Set<NameValueExpression<T>> wrapped = new HashSet<NameValueExpression<T>>();
 
-        for (org.springframework.web.servlet.mvc.condition.NameValueExpression e: springSet) {
-            wrapped.add(new WebMvcNameValueExpressionWrapper<T>(e));
-        }
+  public static <T> Set<NameValueExpression<T>> from(
+      Set<org.springframework.web.servlet.mvc.condition.NameValueExpression<T>> springSet) {
 
-        return wrapped;
-    }
+    return springSet.stream()
+        .map(WebMvcNameValueExpressionWrapper::new)
+        .collect(Collectors.toSet());
+  }
 
     public WebMvcNameValueExpressionWrapper(org.springframework.web.servlet.mvc.condition.NameValueExpression<T> e) {
         this.e = e;
diff --git a/springfox-spring-webmvc/src/main/java/springfox/documentation/spring/web/plugins/WebMvcRequestHandlerProvider.java b/springfox-spring-webmvc/src/main/java/springfox/documentation/spring/web/plugins/WebMvcRequestHandlerProvider.java
@@ -64,10 +64,9 @@ public List<RequestHandler> requestHandlers() {
         .collect(toList());
   }
 
-  private Function<? super RequestMappingInfoHandlerMapping,
-        Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>> toMappingEntries() {
-    return (Function<RequestMappingInfoHandlerMapping, Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>>)
-        input -> input.getHandlerMethods().entrySet();
+  private Function<RequestMappingInfoHandlerMapping,
+      Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>> toMappingEntries() {
+    return input -> input.getHandlerMethods().entrySet();
   }
 
   private Function<Map.Entry<RequestMappingInfo, HandlerMethod>, RequestHandler> toRequestHandler() {

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,9 @@ public List<RequestHandler> requestHandlers() {`
`64`	`64`	`.collect(toList());`
`65`	`65`	`}`
`66`	`66`
`67`		`- private Function<? super RequestMappingInfoHandlerMapping,`
`68`		`- Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>> toMappingEntries() {`
`69`		`- return (Function<RequestMappingInfoHandlerMapping, Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>>)`
`70`		`- input -> input.getHandlerMethods().entrySet();`
	`67`	`+ private Function<RequestMappingInfoHandlerMapping,`
	`68`	`+ Iterable<Map.Entry<RequestMappingInfo, HandlerMethod>>> toMappingEntries() {`
	`69`	`+ return input -> input.getHandlerMethods().entrySet();`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`private Function<Map.Entry<RequestMappingInfo, HandlerMethod>, RequestHandler> toRequestHandler() {`