From a81159bc2ee87a90b1909d6ffb031452d6d005a8 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Sun, 17 Mar 2019 08:06:36 +0000 Subject: [PATCH 1/2] rebase --- .../autoconfigure/web/servlet/WebMvcAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index 465b805997f6..0bb83b8e24c5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -449,10 +449,10 @@ private List resolveFaviconLocations() { } - private static final class FaviconRequestHandler + static final class FaviconRequestHandler extends ResourceHttpRequestHandler { - private FaviconRequestHandler(List locations) { + FaviconRequestHandler(List locations) { setLocations(locations); } From 39d14230178b5848affddcb43b74deef951628dc Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Sun, 17 Mar 2019 08:20:07 +0000 Subject: [PATCH 2/2] removed private keyword from class and method --- .../autoconfigure/web/servlet/WebMvcAutoConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index 0bb83b8e24c5..547a1081f8bf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -449,8 +449,7 @@ private List resolveFaviconLocations() { } - static final class FaviconRequestHandler - extends ResourceHttpRequestHandler { + static final class FaviconRequestHandler extends ResourceHttpRequestHandler { FaviconRequestHandler(List locations) { setLocations(locations);