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

Remove some compiler warnings

This commit is contained in:
Dave Syer 2014-05-07 14:05:10 -07:00
parent 8fbd8f3138
commit f04f265515
3 changed files with 6 additions and 6 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/data/AbstractRepositoryConfigurationSourceSupport.java
View File

@ -55,8 +55,9 @@ public abstract class AbstractRepositoryConfigurationSourceSupport implements
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
BeanDefinitionRegistry registry) {
new RepositoryConfigurationDelegate(getConfigurationSource(), this.resourceLoader)
.registerRepositoriesIn(registry, getRepositoryConfigurationExtension());
new RepositoryConfigurationDelegate(getConfigurationSource(),
this.resourceLoader, this.environment).registerRepositoriesIn(registry,
getRepositoryConfigurationExtension());
}
private AnnotationRepositoryConfigurationSource getConfigurationSource() {

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
View File

@ -22,7 +22,6 @@ import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties;
import com.mongodb.DBPort;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
import com.mongodb.MongoClientOptions.Builder;
@ -42,7 +41,7 @@ public class MongoProperties {
private String host;
private int port = DBPort.PORT;
private int port = 27017;
private String uri = "mongodb://localhost/test";
@ -153,14 +152,12 @@ public class MongoProperties {
Builder builder = MongoClientOptions.builder();
if (options != null) {
builder.alwaysUseMBeans(options.isAlwaysUseMBeans());
builder.autoConnectRetry(options.isAutoConnectRetry());
builder.connectionsPerHost(options.getConnectionsPerHost());
builder.connectTimeout(options.getConnectTimeout());
builder.cursorFinalizerEnabled(options.isCursorFinalizerEnabled());
builder.dbDecoderFactory(options.getDbDecoderFactory());
builder.dbEncoderFactory(options.getDbEncoderFactory());
builder.description(options.getDescription());
builder.maxAutoConnectRetryTime(options.getMaxAutoConnectRetryTime());
builder.maxWaitTime(options.getMaxWaitTime());
builder.readPreference(options.getReadPreference());
builder.socketFactory(options.getSocketFactory());

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
View File

@ -52,6 +52,7 @@ public class MongoAutoConfigurationTests {
assertEquals(1, this.context.getBeanNamesForType(Mongo.class).length);
}
@SuppressWarnings("deprecation")
@Test
public void optionsAdded() {
this.context = new AnnotationConfigApplicationContext();
@ -64,6 +65,7 @@ public class MongoAutoConfigurationTests {
.getSocketTimeout());
}
@SuppressWarnings("deprecation")
@Test
public void optionsAddedButNoHost() {
this.context = new AnnotationConfigApplicationContext();