Test for NPE when calling getClass() in RefreshScope
fixes gh-297
This commit is contained in:
@@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright 2006-2017 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.cloud.context.scope.refresh;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
|
||||
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest(classes = {RefreshScopeNullBeanIntegrationTests.TestConfiguration.class})
|
||||
public class RefreshScopeNullBeanIntegrationTests {
|
||||
|
||||
@Autowired
|
||||
private MyCustomComponent myCustomComponent;
|
||||
|
||||
@Autowired
|
||||
private org.springframework.cloud.context.scope.refresh.RefreshScope scope;
|
||||
|
||||
@Test
|
||||
@DirtiesContext
|
||||
public void testRefreshBean() {
|
||||
assertThat(this.myCustomComponent).isNotNull();
|
||||
// ...and then refresh, so the bean is re-initialized:
|
||||
// this.scope.refreshAll();
|
||||
}
|
||||
|
||||
protected static class OptionalService { }
|
||||
|
||||
public static class MyCustomComponent {
|
||||
|
||||
private final OptionalService optionalService;
|
||||
|
||||
public MyCustomComponent(OptionalService optionalService) {
|
||||
this.optionalService = optionalService;
|
||||
}
|
||||
}
|
||||
|
||||
@Configuration
|
||||
protected static class OptionalConfiguration {
|
||||
|
||||
@Bean
|
||||
@RefreshScope
|
||||
public OptionalService service() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, OptionalConfiguration.class })
|
||||
protected static class TestConfiguration {
|
||||
|
||||
@Autowired(required = false)
|
||||
private OptionalService optionalService;
|
||||
|
||||
@Bean
|
||||
public MyCustomComponent myCustomComponent() {
|
||||
return new MyCustomComponent(optionalService);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user