From 9d241869421ba31c16ff64b8ab1fe0ae82aee903 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 19 Jan 2018 17:39:07 +0900 Subject: [PATCH] Use this() in EndpointRequests Closes gh-11690 --- .../security/reactive/EndpointRequest.java | 12 +++--------- .../security/servlet/EndpointRequest.java | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java index b299794feae..bd553786228 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java @@ -101,21 +101,15 @@ public final class EndpointRequest { private ServerWebExchangeMatcher delegate; private EndpointServerWebExchangeMatcher() { - super(EndpointPathProvider.class); - this.includes = Collections.emptyList(); - this.excludes = Collections.emptyList(); + this(Collections.emptyList(), Collections.emptyList()); } private EndpointServerWebExchangeMatcher(Class[] endpoints) { - super(EndpointPathProvider.class); - this.includes = Arrays.asList((Object[]) endpoints); - this.excludes = Collections.emptyList(); + this(Arrays.asList((Object[]) endpoints), Collections.emptyList()); } private EndpointServerWebExchangeMatcher(String[] endpoints) { - super(EndpointPathProvider.class); - this.includes = Arrays.asList((Object[]) endpoints); - this.excludes = Collections.emptyList(); + this(Arrays.asList((Object[]) endpoints), Collections.emptyList()); } private EndpointServerWebExchangeMatcher(List includes, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java index afcf3df8e31..a4dcbaf32a7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java @@ -99,21 +99,15 @@ public final class EndpointRequest { private RequestMatcher delegate; private EndpointRequestMatcher() { - super(EndpointPathProvider.class); - this.includes = Collections.emptyList(); - this.excludes = Collections.emptyList(); + this(Collections.emptyList(), Collections.emptyList()); } private EndpointRequestMatcher(Class[] endpoints) { - super(EndpointPathProvider.class); - this.includes = Arrays.asList((Object[]) endpoints); - this.excludes = Collections.emptyList(); + this(Arrays.asList((Object[]) endpoints), Collections.emptyList()); } private EndpointRequestMatcher(String[] endpoints) { - super(EndpointPathProvider.class); - this.includes = Arrays.asList((Object[]) endpoints); - this.excludes = Collections.emptyList(); + this(Arrays.asList((Object[]) endpoints), Collections.emptyList()); } private EndpointRequestMatcher(List includes, List excludes) {