Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12958 from Henri Tremblay

Browse Source 
* gh-12958:
  Polish "Unwrap InvocationTargetException in isLogConfigurationMessage"
  Unwrap InvocationTargetException in isLogConfigurationMessage
This commit is contained in:
Andy Wilkinson 2018-05-11 11:52:02 +01:00
commit e3f0a70df2
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -86,6 +86,9 @@ class SpringBootExceptionHandler implements UncaughtExceptionHandler {
* @return {@code true} if the exception contains a log configuration message
*/
private boolean isLogConfigurationMessage(Throwable ex) {
if (ex instanceof InvocationTargetException) {
return isLogConfigurationMessage(ex.getCause());
}
String message = ex.getMessage();
if (message != null) {
for (String candidate : LOG_CONFIGURATION_MESSAGES) {

71
spring-boot/src/test/java/org/springframework/boot/SpringBootExceptionHandlerTests.java Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot;
import java.lang.Thread.UncaughtExceptionHandler;
import java.lang.reflect.InvocationTargetException;
import org.junit.Test;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
/**
* Tests for {@link SpringBootExceptionHandler}.
*
* @author Henri Tremblay
* @author Andy Wilkinson
*/
public class SpringBootExceptionHandlerTests {
private final UncaughtExceptionHandler parent = mock(UncaughtExceptionHandler.class);
private final SpringBootExceptionHandler handler = new SpringBootExceptionHandler(
this.parent);
@Test
public void uncaughtExceptionDoesNotForwardLoggedErrorToParent() {
Thread thread = Thread.currentThread();
Exception ex = new Exception();
this.handler.registerLoggedException(ex);
this.handler.uncaughtException(thread, ex);
verifyZeroInteractions(this.parent);
}
@Test
public void uncaughtExceptionForwardsLogConfigurationErrorToParent() {
Thread thread = Thread.currentThread();
Exception ex = new Exception(
"[stuff] Logback configuration error detected [stuff]");
this.handler.registerLoggedException(ex);
this.handler.uncaughtException(thread, ex);
verify(this.parent).uncaughtException(same(thread), same(ex));
}
@Test
public void uncaughtExceptionForwardsWrappedLogConfigurationErrorToParent() {
Thread thread = Thread.currentThread();
Exception ex = new InvocationTargetException(new Exception(
"[stuff] Logback configuration error detected [stuff]", new Exception()));
this.handler.registerLoggedException(ex);
this.handler.uncaughtException(thread, ex);
verify(this.parent).uncaughtException(same(thread), same(ex));
}
}