Refactor @ConfigurationProperties that only use prefix
See gh-43917 Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
This commit is contained in:
committed by
Phillip Webb
parent
7bcdb7d3ee
commit
c1d97ffe16
@@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class Dbcp2Configuration {
|
||||
|
||||
@ConfigurationProperties(prefix = "spring.datasource.dbcp2")
|
||||
@ConfigurationProperties("spring.datasource.dbcp2")
|
||||
BasicDataSource basicDataSource() {
|
||||
return new BasicDataSource();
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
|
||||
public class ChildPropertiesConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "inheritance")
|
||||
@ConfigurationProperties("inheritance")
|
||||
public ChildProperties childConfig() {
|
||||
return new ChildProperties();
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
|
||||
public class OverrideChildPropertiesConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "inheritance")
|
||||
@ConfigurationProperties("inheritance")
|
||||
public OverrideChildProperties overrideChildProperties() {
|
||||
return new OverrideChildProperties();
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
* @author Jonas Keßler
|
||||
*/
|
||||
@Data
|
||||
@ConfigurationProperties(prefix = "accesslevel.overwrite.data")
|
||||
@ConfigurationProperties("accesslevel.overwrite.data")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokAccessLevelOverwriteDataProperties {
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ConfigurationProperties(prefix = "accesslevel.overwrite.default")
|
||||
@ConfigurationProperties("accesslevel.overwrite.default")
|
||||
public class LombokAccessLevelOverwriteDefaultProperties {
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
@Getter(AccessLevel.PUBLIC)
|
||||
@Setter(AccessLevel.PUBLIC)
|
||||
@ConfigurationProperties(prefix = "accesslevel.overwrite.explicit")
|
||||
@ConfigurationProperties("accesslevel.overwrite.explicit")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokAccessLevelOverwriteExplicitProperties {
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Jonas Keßler
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "accesslevel")
|
||||
@ConfigurationProperties("accesslevel")
|
||||
public class LombokAccessLevelProperties {
|
||||
|
||||
@Getter(AccessLevel.PUBLIC)
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ConfigurationProperties(prefix = "deprecated")
|
||||
@ConfigurationProperties("deprecated")
|
||||
@Deprecated
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokDeprecatedProperties {
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "explicit")
|
||||
@ConfigurationProperties("explicit")
|
||||
public class LombokExplicitProperties {
|
||||
|
||||
@Getter
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.NestedConfigurationProperty;
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@Data
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokInnerClassProperties {
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ import lombok.Data;
|
||||
import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
|
||||
@Data
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokInnerClassWithGetterProperties {
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@Data
|
||||
@ConfigurationProperties(prefix = "data")
|
||||
@ConfigurationProperties("data")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokSimpleDataProperties {
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ConfigurationProperties(prefix = "simple")
|
||||
@ConfigurationProperties("simple")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokSimpleProperties {
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
* @author Mark Jeffrey
|
||||
*/
|
||||
@Value
|
||||
@ConfigurationProperties(prefix = "value")
|
||||
@ConfigurationProperties("value")
|
||||
@SuppressWarnings("unused")
|
||||
public class LombokSimpleValueProperties {
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
@Deprecated
|
||||
public class DeprecatedClassMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
public Foo foo() {
|
||||
return new Foo();
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class DeprecatedMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
@Deprecated
|
||||
public Foo foo() {
|
||||
return new Foo();
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "something")
|
||||
@ConfigurationProperties("something")
|
||||
public class InvalidMethodConfig {
|
||||
|
||||
private String name;
|
||||
@@ -36,7 +36,7 @@ public class InvalidMethodConfig {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@ConfigurationProperties(prefix = "invalid")
|
||||
@ConfigurationProperties("invalid")
|
||||
InvalidMethodConfig foo() {
|
||||
return new InvalidMethodConfig();
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class MethodAndClassConfig {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@ConfigurationProperties(prefix = "conflict")
|
||||
@ConfigurationProperties("conflict")
|
||||
public Foo foo() {
|
||||
return new Foo();
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class PackagePrivateMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
Foo foo() {
|
||||
return new Foo();
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class PrivateMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
private Foo foo() {
|
||||
return new Foo();
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class ProtectedMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
protected Foo foo() {
|
||||
return new Foo();
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class PublicMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
public Foo foo() {
|
||||
return new Foo();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
@SuppressWarnings("unused")
|
||||
public class SingleConstructorMethodConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "foo")
|
||||
@ConfigurationProperties("foo")
|
||||
public Foo foo() {
|
||||
return new Foo(new Object());
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class ClassWithNestedProperties {
|
||||
|
||||
}
|
||||
|
||||
@ConfigurationProperties(prefix = "nestedChildProps")
|
||||
@ConfigurationProperties("nestedChildProps")
|
||||
public static class NestedChildClass extends NestedParentClass {
|
||||
|
||||
private int childClassProperty = 20;
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
* @deprecated deprecated
|
||||
*/
|
||||
@Deprecated
|
||||
@ConfigurationProperties(prefix = "deprecated")
|
||||
@ConfigurationProperties("deprecated")
|
||||
public class DeprecatedProperties {
|
||||
|
||||
private String name;
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "hierarchical")
|
||||
@ConfigurationProperties("hierarchical")
|
||||
public class HierarchicalProperties extends HierarchicalPropertiesParent {
|
||||
|
||||
private String third = "three";
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
public class InnerClassWithPrivateConstructor {
|
||||
|
||||
private Nested nested = new Nested("whatever");
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "collection")
|
||||
@ConfigurationProperties("collection")
|
||||
public class SimpleCollectionProperties {
|
||||
|
||||
private Map<Integer, String> integersToNames;
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "simple")
|
||||
@ConfigurationProperties("simple")
|
||||
public class SimpleProperties {
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "simple.type")
|
||||
@ConfigurationProperties("simple.type")
|
||||
public class SimpleTypeProperties {
|
||||
|
||||
private String myString;
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "builder")
|
||||
@ConfigurationProperties("builder")
|
||||
public class BuilderPojo {
|
||||
|
||||
private String name;
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "excluded")
|
||||
@ConfigurationProperties("excluded")
|
||||
public class ExcludedTypesPojo {
|
||||
|
||||
private String name;
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.NestedConfigurationProperty;
|
||||
*
|
||||
* @author Madhura Bhave
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
public class InnerClassHierarchicalProperties {
|
||||
|
||||
private Foo foo;
|
||||
|
||||
@@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.NestedConfigurationProperty;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
public class InnerClassProperties {
|
||||
|
||||
private final Foo first = new Foo();
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*/
|
||||
public class InnerClassRootConfig {
|
||||
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
public static class Config {
|
||||
|
||||
private String name;
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "config")
|
||||
@ConfigurationProperties("config")
|
||||
public class InvalidAccessorProperties {
|
||||
|
||||
private String name;
|
||||
|
||||
Reference in New Issue
Block a user