Harmonize ConfigurationProperties bean name
When `@EnableConfigurationProperties` is defined, Spring Boot automatically registers a bean in the context for each class specified on the annotation. Previously, the name of the bean only included the prefix which leads to conflict if two different classes use the same prefix. This commit changes the bean name structure to be <prefix>-<fqn> where prefix is the prefix used on the annotation and <fqn> the fully qualified name of the target class. Closes gh-4395
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2014 the original author or authors.
|
||||
* 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.
|
||||
@@ -25,6 +25,7 @@ import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
|
||||
import org.springframework.boot.autoconfigure.security.SecurityProperties;
|
||||
import org.springframework.boot.test.SpringApplicationConfiguration;
|
||||
import org.springframework.boot.test.TestRestTemplate;
|
||||
@@ -219,7 +220,7 @@ public class SampleActuatorApplicationTests {
|
||||
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> body = entity.getBody();
|
||||
assertThat(body).containsKey("spring.datasource.CONFIGURATION_PROPERTIES");
|
||||
assertThat(body).containsKey("spring.datasource-" + DataSourceProperties.class.getName());
|
||||
}
|
||||
|
||||
private String getPassword() {
|
||||
|
||||
Reference in New Issue
Block a user