From a81159bc2ee87a90b1909d6ffb031452d6d005a8 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Sun, 17 Mar 2019 08:06:36 +0000 Subject: [PATCH 1/9] 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 1882c96ef0f1ae08242958da30fcbeb2ee990611 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 12:37:11 +0000 Subject: [PATCH 2/9] added log4j2.properties file --- .../boot/logging/log4j2/Log4J2LoggingSystem.java | 1 + .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index 5af086173b90..02950d583811 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -112,6 +112,7 @@ protected String[] getStandardConfigLocations() { private String[] getCurrentlySupportedConfigLocations() { List supportedConfigLocations = new ArrayList<>(); + supportedConfigLocations.add("log4j2.properties"); if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) { Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index 8312648e4f84..a74ed8f55a65 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -210,7 +210,7 @@ public void loggingThatUsesJulIsCaptured() { @Test public void configLocationsWithNoExtraDependencies() { assertThat(this.loggingSystem.getStandardConfigLocations()) - .contains("log4j2.xml"); + .contains("log4j2.properties", "log4j2.xml"); } @Test From 0428ce004c3e6dac4c081d0f876d5cb37c7e3f44 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 12:39:17 +0000 Subject: [PATCH 3/9] remove change I dont need to commit --- .../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 0bb83b8e24c5..465b805997f6 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() { } - static final class FaviconRequestHandler + private static final class FaviconRequestHandler extends ResourceHttpRequestHandler { - FaviconRequestHandler(List locations) { + private FaviconRequestHandler(List locations) { setLocations(locations); } From 699a5167c5b815780d30d24ecfee521b4a2a4776 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 13:45:23 +0000 Subject: [PATCH 4/9] test --- .../boot/logging/log4j2/Log4J2LoggingSystem.java | 1 - .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index 02950d583811..5af086173b90 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -112,7 +112,6 @@ protected String[] getStandardConfigLocations() { private String[] getCurrentlySupportedConfigLocations() { List supportedConfigLocations = new ArrayList<>(); - supportedConfigLocations.add("log4j2.properties"); if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) { Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index a74ed8f55a65..8312648e4f84 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -210,7 +210,7 @@ public void loggingThatUsesJulIsCaptured() { @Test public void configLocationsWithNoExtraDependencies() { assertThat(this.loggingSystem.getStandardConfigLocations()) - .contains("log4j2.properties", "log4j2.xml"); + .contains("log4j2.xml"); } @Test From a65c7d99ac2137653c3aa6ed6ab3ac8a4291a4b7 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 13:49:02 +0000 Subject: [PATCH 5/9] added log4j2.properties file --- .../boot/logging/log4j2/Log4J2LoggingSystem.java | 1 + .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index 5af086173b90..02950d583811 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -112,6 +112,7 @@ protected String[] getStandardConfigLocations() { private String[] getCurrentlySupportedConfigLocations() { List supportedConfigLocations = new ArrayList<>(); + supportedConfigLocations.add("log4j2.properties"); if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) { Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index 8312648e4f84..a74ed8f55a65 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -210,7 +210,7 @@ public void loggingThatUsesJulIsCaptured() { @Test public void configLocationsWithNoExtraDependencies() { assertThat(this.loggingSystem.getStandardConfigLocations()) - .contains("log4j2.xml"); + .contains("log4j2.properties", "log4j2.xml"); } @Test From cddb45845174e476064ea34742ecaae617ad49ea Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 13:53:30 +0000 Subject: [PATCH 6/9] unit test updates --- .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index a74ed8f55a65..6c7ed8228e2d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -240,7 +240,7 @@ public void configLocationsWithJacksonDatabindAndDataformatYaml() { @Test public void springConfigLocations() { String[] locations = getSpringConfigLocations(this.loggingSystem); - assertThat(locations).isEqualTo(new String[] { "log4j2-spring.xml" }); + assertThat(locations).isEqualTo(new String[] { "log4j2-spring.properties", "log4j2-spring.xml" }); } @Test From 8e2cd2ae11d37160bb7bff5107f62f0270c7a6a5 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 14:46:06 +0000 Subject: [PATCH 7/9] rerun tests --- .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index 6c7ed8228e2d..16c595917642 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -219,6 +219,7 @@ public void configLocationsWithJacksonDatabind() { assertThat(this.loggingSystem.getStandardConfigLocations()) .contains("log4j2.json", "log4j2.jsn", "log4j2.xml"); } + @Test public void configLocationsWithJacksonDataformatYaml() { From 17c38cd33c02297a36735e4eeed0ee44660019de Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 14:46:15 +0000 Subject: [PATCH 8/9] rerun tests --- .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index 16c595917642..6c7ed8228e2d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -219,7 +219,6 @@ public void configLocationsWithJacksonDatabind() { assertThat(this.loggingSystem.getStandardConfigLocations()) .contains("log4j2.json", "log4j2.jsn", "log4j2.xml"); } - @Test public void configLocationsWithJacksonDataformatYaml() { From f9e9b96d7940983237bda5858f7cdcc1f2c7d188 Mon Sep 17 00:00:00 2001 From: Mohamed Rifni Date: Tue, 19 Mar 2019 15:13:23 +0000 Subject: [PATCH 9/9] formatting --- .../boot/logging/log4j2/Log4J2LoggingSystemTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index 6c7ed8228e2d..ad5d938d9f98 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -240,7 +240,8 @@ public void configLocationsWithJacksonDatabindAndDataformatYaml() { @Test public void springConfigLocations() { String[] locations = getSpringConfigLocations(this.loggingSystem); - assertThat(locations).isEqualTo(new String[] { "log4j2-spring.properties", "log4j2-spring.xml" }); + assertThat(locations).isEqualTo( + new String[] { "log4j2-spring.properties", "log4j2-spring.xml" }); } @Test