mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:03:22 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
73a45797c0
@ -37,6 +37,8 @@ import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.BeanFactoryAware;
|
||||
import org.springframework.beans.factory.BeanFactoryUtils;
|
||||
import org.springframework.beans.factory.FactoryBean;
|
||||
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
||||
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
|
||||
import org.springframework.beans.factory.config.BeanDefinition;
|
||||
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
|
||||
import org.springframework.beans.factory.config.BeanPostProcessor;
|
||||
@ -250,7 +252,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
|
||||
createSpy(registry, definition, field);
|
||||
}
|
||||
else {
|
||||
registerSpies(definition, field, existingBeans);
|
||||
registerSpies(registry, definition, field, existingBeans);
|
||||
}
|
||||
}
|
||||
|
||||
@ -307,15 +309,41 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
|
||||
registerSpy(definition, field, beanName);
|
||||
}
|
||||
|
||||
private void registerSpies(SpyDefinition definition, Field field,
|
||||
String[] existingBeans) {
|
||||
Assert.state(field == null || existingBeans.length == 1,
|
||||
"Unable to register spy bean " + definition.getTypeToSpy()
|
||||
+ " expected a single existing bean to replace but found "
|
||||
+ new TreeSet<String>(Arrays.asList(existingBeans)));
|
||||
for (String beanName : existingBeans) {
|
||||
registerSpy(definition, field, beanName);
|
||||
private void registerSpies(BeanDefinitionRegistry registry, SpyDefinition definition,
|
||||
Field field, String[] existingBeans) {
|
||||
ResolvableType type = definition.getTypeToSpy();
|
||||
try {
|
||||
if (ObjectUtils.isEmpty(existingBeans)) {
|
||||
throw new NoSuchBeanDefinitionException(type);
|
||||
}
|
||||
if (existingBeans.length > 1) {
|
||||
existingBeans = new String[] {
|
||||
determinePrimaryCandidate(registry, existingBeans, type) };
|
||||
}
|
||||
registerSpy(definition, field, existingBeans[0]);
|
||||
}
|
||||
catch (RuntimeException ex) {
|
||||
throw new IllegalStateException(
|
||||
"Unable to register spy bean " + definition.getTypeToSpy(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
private String determinePrimaryCandidate(BeanDefinitionRegistry registry,
|
||||
String[] candidateBeanNames, ResolvableType type) {
|
||||
String primaryBeanName = null;
|
||||
for (String candidateBeanName : candidateBeanNames) {
|
||||
BeanDefinition beanDefinition = registry.getBeanDefinition(candidateBeanName);
|
||||
if (beanDefinition.isPrimary()) {
|
||||
if (primaryBeanName != null) {
|
||||
throw new NoUniqueBeanDefinitionException(type.resolve(),
|
||||
candidateBeanNames.length,
|
||||
"more than one 'primary' bean found among candidates: "
|
||||
+ Arrays.asList(candidateBeanNames));
|
||||
}
|
||||
primaryBeanName = candidateBeanName;
|
||||
}
|
||||
}
|
||||
return primaryBeanName;
|
||||
}
|
||||
|
||||
private void registerSpy(SpyDefinition definition, Field field, String beanName) {
|
||||
|
@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Copyright 2012-2016 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.test.mock.mockito;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.mock.mockito.example.ExampleGenericService;
|
||||
import org.springframework.boot.test.mock.mockito.example.ExampleGenericServiceCaller;
|
||||
import org.springframework.boot.test.mock.mockito.example.SimpleExampleIntegerGenericService;
|
||||
import org.springframework.boot.test.mock.mockito.example.SimpleExampleStringGenericService;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
/**
|
||||
* Test {@link SpyBean} on a test class field can be used to replace existing beans.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
public class SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests {
|
||||
|
||||
// gh-7625
|
||||
|
||||
@SpyBean
|
||||
private ExampleGenericService<String> exampleService;
|
||||
|
||||
@Autowired
|
||||
private ExampleGenericServiceCaller caller;
|
||||
|
||||
@Test
|
||||
public void testSpying() throws Exception {
|
||||
assertThat(this.caller.sayGreeting()).isEqualTo("I say 123 simple");
|
||||
verify(this.exampleService).greeting();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@Import({ ExampleGenericServiceCaller.class,
|
||||
SimpleExampleIntegerGenericService.class })
|
||||
static class SpyBeanOnTestFieldForExistingBeanConfig {
|
||||
|
||||
@Bean
|
||||
public ExampleGenericService<String> simpleExampleStringGenericService() {
|
||||
// In order to trigger issue we need a method signature that returns the
|
||||
// generic type not the actual implementation class
|
||||
return new SimpleExampleStringGenericService();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,73 @@
|
||||
/*
|
||||
* Copyright 2012-2016 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.test.mock.mockito;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.internal.util.MockUtil;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.mock.mockito.example.ExampleGenericStringServiceCaller;
|
||||
import org.springframework.boot.test.mock.mockito.example.SimpleExampleStringGenericService;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
/**
|
||||
* Test {@link SpyBean} on a test class field can be used to inject new spy instances.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
public class SpyBeanOnTestFieldForMultipleExistingBeansIntegrationTests {
|
||||
|
||||
@SpyBean
|
||||
private SimpleExampleStringGenericService spy;
|
||||
|
||||
@Autowired
|
||||
private ExampleGenericStringServiceCaller caller;
|
||||
|
||||
@Test
|
||||
public void testSpying() throws Exception {
|
||||
assertThat(this.caller.sayGreeting()).isEqualTo("I say two");
|
||||
assertThat(new MockUtil().getMockName(this.spy).toString()).isEqualTo("two");
|
||||
verify(this.spy).greeting();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@Import(ExampleGenericStringServiceCaller.class)
|
||||
static class Config {
|
||||
|
||||
@Bean
|
||||
public SimpleExampleStringGenericService one() {
|
||||
return new SimpleExampleStringGenericService("one");
|
||||
}
|
||||
|
||||
@Bean
|
||||
@Primary
|
||||
public SimpleExampleStringGenericService two() {
|
||||
return new SimpleExampleStringGenericService("two");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright 2012-2016 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.test.mock.mockito.example;
|
||||
|
||||
/**
|
||||
* Example bean for mocking tests that calls {@link ExampleGenericService}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
public class ExampleGenericStringServiceCaller {
|
||||
|
||||
private final ExampleGenericService<String> stringService;
|
||||
|
||||
public ExampleGenericStringServiceCaller(
|
||||
ExampleGenericService<String> stringService) {
|
||||
this.stringService = stringService;
|
||||
}
|
||||
|
||||
public ExampleGenericService<String> getStringService() {
|
||||
return this.stringService;
|
||||
}
|
||||
|
||||
public String sayGreeting() {
|
||||
return "I say " + this.stringService.greeting();
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,32 @@
|
||||
/*
|
||||
* Copyright 2012-2016 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.test.mock.mockito.example;
|
||||
|
||||
/**
|
||||
* Example generic service implementation for spy tests.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
public class SimpleExampleIntegerGenericService
|
||||
implements ExampleGenericService<Integer> {
|
||||
|
||||
@Override
|
||||
public Integer greeting() {
|
||||
return 123;
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright 2012-2016 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.test.mock.mockito.example;
|
||||
|
||||
/**
|
||||
* Example generic service implementation for spy tests.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
public class SimpleExampleStringGenericService implements ExampleGenericService<String> {
|
||||
|
||||
private final String greeting;
|
||||
|
||||
public SimpleExampleStringGenericService() {
|
||||
this("simple");
|
||||
}
|
||||
|
||||
public SimpleExampleStringGenericService(String greeting) {
|
||||
this.greeting = greeting;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String greeting() {
|
||||
return this.greeting;
|
||||
}
|
||||
|
||||
}
|
@ -316,12 +316,7 @@ public class LoggingApplicationListener implements GenericApplicationListener {
|
||||
}
|
||||
|
||||
private boolean ignoreLogConfig(String logConfig) {
|
||||
return !StringUtils.hasLength(logConfig)
|
||||
|| isDefaultAzureLoggingConfig(logConfig);
|
||||
}
|
||||
|
||||
private boolean isDefaultAzureLoggingConfig(String candidate) {
|
||||
return candidate.startsWith("-Djava.util.logging.config.file=");
|
||||
return !StringUtils.hasLength(logConfig) || logConfig.startsWith("-D");
|
||||
}
|
||||
|
||||
private void initializeFinalLoggingLevels(ConfigurableEnvironment environment,
|
||||
|
@ -16,6 +16,7 @@
|
||||
|
||||
package org.springframework.boot.logging.logback;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
import ch.qos.logback.classic.Level;
|
||||
@ -35,6 +36,7 @@ import org.springframework.boot.logging.LoggingInitializationContext;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.core.env.PropertyResolver;
|
||||
import org.springframework.core.env.PropertySourcesPropertyResolver;
|
||||
import org.springframework.util.ReflectionUtils;
|
||||
|
||||
/**
|
||||
* Default logback configuration used by Spring Boot. Uses {@link LogbackConfigurator} to
|
||||
@ -132,22 +134,36 @@ class DefaultLogbackConfiguration {
|
||||
encoder.setPattern(OptionHelper.substVars(logPattern, config.getContext()));
|
||||
appender.setEncoder(encoder);
|
||||
config.start(encoder);
|
||||
|
||||
appender.setFile(logFile);
|
||||
getRollingPolicy(appender, config, logFile);
|
||||
getMaxFileSize(appender, config);
|
||||
config.appender("FILE", appender);
|
||||
return appender;
|
||||
}
|
||||
|
||||
private void getRollingPolicy(RollingFileAppender<ILoggingEvent> appender,
|
||||
LogbackConfigurator config, String logFile) {
|
||||
FixedWindowRollingPolicy rollingPolicy = new FixedWindowRollingPolicy();
|
||||
rollingPolicy.setFileNamePattern(logFile + ".%i");
|
||||
appender.setRollingPolicy(rollingPolicy);
|
||||
rollingPolicy.setParent(appender);
|
||||
config.start(rollingPolicy);
|
||||
}
|
||||
|
||||
private void getMaxFileSize(RollingFileAppender<ILoggingEvent> appender,
|
||||
LogbackConfigurator config) {
|
||||
SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<ILoggingEvent>();
|
||||
triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
|
||||
try {
|
||||
triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
|
||||
}
|
||||
catch (NoSuchMethodError ex) {
|
||||
// Logback < 1.1.8 used String configuration
|
||||
Method method = ReflectionUtils.findMethod(SizeBasedTriggeringPolicy.class,
|
||||
"setMaxFileSize", String.class);
|
||||
ReflectionUtils.invokeMethod(method, triggeringPolicy, "10MB");
|
||||
}
|
||||
appender.setTriggeringPolicy(triggeringPolicy);
|
||||
config.start(triggeringPolicy);
|
||||
|
||||
config.appender("FILE", appender);
|
||||
return appender;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -164,6 +164,18 @@ public class LoggingApplicationListenerTests {
|
||||
assertThat(new File(tmpDir() + "/spring.log").exists()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tomcatNopLoggingConfigDoesNotCauseAFailure() throws Exception {
|
||||
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
|
||||
"logging.config: -Dnop");
|
||||
this.initializer.initialize(this.context.getEnvironment(),
|
||||
this.context.getClassLoader());
|
||||
this.logger.info("Hello world");
|
||||
String output = this.outputCapture.toString().trim();
|
||||
assertThat(output).contains("Hello world").doesNotContain("???");
|
||||
assertThat(new File(tmpDir() + "/spring.log").exists()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void overrideConfigBroken() throws Exception {
|
||||
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
|
||||
|
Loading…
Reference in New Issue
Block a user