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

Remove a nested TransactionProperties 

Remove a few nested `TransactionProperties` that should have been
deleted in commit f22744c748.

See gh-7561
Closes gh-7786
This commit is contained in:
Kazuki Shimizu 2016-12-30 00:15:40 +09:00 committed by Phillip Webb
parent 8854526c5e
commit a7b77e6f9a
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
View File

@ -16,9 +16,7 @@
package org.springframework.boot.autoconfigure.batch; package org.springframework.boot.autoconfigure.batch;
import org.springframework.boot.autoconfigure.transaction.TransactionProperties;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
/** /**
* Configuration properties for Spring Batch. * Configuration properties for Spring Batch.
@ -48,9 +46,6 @@ public class BatchProperties {
private final Job job = new Job(); private final Job job = new Job();
@NestedConfigurationProperty
private final TransactionProperties transaction = new TransactionProperties();
public String getSchema() { public String getSchema() {
return this.schema; return this.schema;
} }
@ -75,10 +70,6 @@ public class BatchProperties {
return this.job; return this.job;
} }
public TransactionProperties getTransaction() {
return this.transaction;
}
public class Initializer { public class Initializer {
/** /**

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jProperties.java
View File

@ -23,9 +23,7 @@ import org.neo4j.ogm.config.Configuration;
import org.neo4j.ogm.config.DriverConfiguration; import org.neo4j.ogm.config.DriverConfiguration;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.boot.autoconfigure.transaction.TransactionProperties;
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.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -71,9 +69,6 @@ public class Neo4jProperties implements ApplicationContextAware {
private final Embedded embedded = new Embedded(); private final Embedded embedded = new Embedded();
@NestedConfigurationProperty
private final TransactionProperties transaction = new TransactionProperties();
private ClassLoader classLoader = Neo4jProperties.class.getClassLoader(); private ClassLoader classLoader = Neo4jProperties.class.getClassLoader();
public String getUri() { public String getUri() {
@ -112,10 +107,6 @@ public class Neo4jProperties implements ApplicationContextAware {
return this.embedded; return this.embedded;
} }
public TransactionProperties getTransaction() {
return this.transaction;
}
@Override @Override
public void setApplicationContext(ApplicationContext ctx) throws BeansException { public void setApplicationContext(ApplicationContext ctx) throws BeansException {
this.classLoader = ctx.getClassLoader(); this.classLoader = ctx.getClassLoader();