root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Remove redundant uses of @NestedConfigurationProperty 

Closes gh-9216
This commit is contained in:
Madhura Bhave 2017-05-12 09:09:33 -07:00
parent fa126c5c82
commit f15cf4b991
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@ -22,7 +22,6 @@ import java.util.List;
import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.AcknowledgeMode;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory.CacheMode; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory.CacheMode;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -486,10 +485,8 @@ public class RabbitProperties {
*/ */
private ContainerType type = ContainerType.SIMPLE; private ContainerType type = ContainerType.SIMPLE;
@NestedConfigurationProperty
private final SimpleContainer simple = new SimpleContainer(); private final SimpleContainer simple = new SimpleContainer();
@NestedConfigurationProperty
private final DirectContainer direct = new DirectContainer(); private final DirectContainer direct = new DirectContainer();
public ContainerType getType() { public ContainerType getType() {
@ -541,7 +538,6 @@ public class RabbitProperties {
/** /**
* Optional properties for a retry interceptor. * Optional properties for a retry interceptor.
*/ */
@NestedConfigurationProperty
private final ListenerRetry retry = new ListenerRetry(); private final ListenerRetry retry = new ListenerRetry();
public boolean isAutoStartup() { public boolean isAutoStartup() {
@ -659,7 +655,6 @@ public class RabbitProperties {
public static class Template { public static class Template {
@NestedConfigurationProperty
private final Retry retry = new Retry(); private final Retry retry = new Retry();
/** /**

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
View File

@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.couchbase;
import java.util.List; import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@ -89,13 +88,10 @@ public class CouchbaseProperties {
public static class Env { public static class Env {
@NestedConfigurationProperty
private final Endpoints endpoints = new Endpoints(); private final Endpoints endpoints = new Endpoints();
@NestedConfigurationProperty
private final Ssl ssl = new Ssl(); private final Ssl ssl = new Ssl();
@NestedConfigurationProperty
private final Timeouts timeouts = new Timeouts(); private final Timeouts timeouts = new Timeouts();
public Endpoints getEndpoints() { public Endpoints getEndpoints() {

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
View File

@ -23,7 +23,6 @@ import javax.sql.DataSource;
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConnection; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConnection;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.orm.jpa.vendor.Database; import org.springframework.orm.jpa.vendor.Database;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -159,7 +158,6 @@ public class JpaProperties {
*/ */
private Boolean useNewIdGeneratorMappings; private Boolean useNewIdGeneratorMappings;
@NestedConfigurationProperty
private final Naming naming = new Naming(); private final Naming naming = new Naming();
public String getDdlAuto() { public String getDdlAuto() {

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.context.ResourceLoaderAware; import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
@ -175,7 +174,6 @@ public class ResourceProperties implements ResourceLoaderAware {
*/ */
private boolean gzipped = false; private boolean gzipped = false;
@NestedConfigurationProperty
private final Strategy strategy = new Strategy(); private final Strategy strategy = new Strategy();
/** /**
@ -233,10 +231,8 @@ public class ResourceProperties implements ResourceLoaderAware {
*/ */
public static class Strategy { public static class Strategy {
@NestedConfigurationProperty
private final Fixed fixed = new Fixed(); private final Fixed fixed = new Fixed();
@NestedConfigurationProperty
private final Content content = new Content(); private final Content content = new Content();
public Fixed getFixed() { public Fixed getFixed() {