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

Polish mongo changes 

Restore formatting and fixup doc comments.
This commit is contained in:
Phillip Webb 2014-04-25 15:47:54 +01:00
parent 2adf30950e
commit a7f5cbf7d0
3 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,13 @@
package org.springframework.boot.autoconfigure.mongo; package org.springframework.boot.autoconfigure.mongo;
import java.net.UnknownHostException;
import org.springframework.boot.context.properties.ConfigurationProperties;
import com.mongodb.DBPort; import com.mongodb.DBPort;
import com.mongodb.MongoClient; import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI; import com.mongodb.MongoClientURI;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.net.UnknownHostException;
/** /**
* Configuration properties for Mongo. * Configuration properties for Mongo.
@ -43,7 +44,6 @@ public class MongoProperties {
private String gridFsDatabase; private String gridFsDatabase;
public String getHost() { public String getHost() {
return this.host; return this.host;
} }
@ -77,7 +77,7 @@ public class MongoProperties {
} }
public String getGridFsDatabase() { public String getGridFsDatabase() {
return gridFsDatabase; return this.gridFsDatabase;
} }
public void setGridFsDatabase(String gridFsDatabase) { public void setGridFsDatabase(String gridFsDatabase) {

7
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoTemplateAutoConfiguration.java
View File

@ -33,11 +33,10 @@ import org.springframework.util.StringUtils;
import com.mongodb.Mongo; import com.mongodb.Mongo;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Data's * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's mongo support.
* {@link MongoTemplate}.
* <p> * <p>
* Registers a {@link org.springframework.data.mongodb.core.MongoTemplate} bean if no * Registers a {@link MongoTemplate} and {@link GridFsTemplate} beans if no other beans of
* other bean of the same type is configured. * the same type are configured.
* <P> * <P>
* Honors the {@literal spring.data.mongodb.database} property if set, otherwise connects * Honors the {@literal spring.data.mongodb.database} property if set, otherwise connects
* to the {@literal test} database. * to the {@literal test} database.

7
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/GridFsTemplateAutoConfigurationTests.java → spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoTemplateAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2013 the original author or authors. * Copyright 2012-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,12 +25,11 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
/** /**
* Tests for * Tests for {@link MongoTemplateAutoConfiguration}.
* {@link org.springframework.boot.autoconfigure.mongo.MongoTemplateAutoConfiguration}.
* *
* @author Josh Long * @author Josh Long
*/ */
public class GridFsTemplateAutoConfigurationTests { public class MongoTemplateAutoConfigurationTests {
private AnnotationConfigApplicationContext context; private AnnotationConfigApplicationContext context;