Commit 0d53b9d9 authored by Josh Long's avatar Josh Long Committed by Dave Syer

adding initial GridFS integration.

parent 4ffc95dc
package org.springframework.boot.autoconfigure.mongo;
import com.mongodb.Mongo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.MongoDbFactory;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
import org.springframework.data.mongodb.gridfs.GridFsTemplate;
import org.springframework.util.StringUtils;
/**
* <P>
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration Auto-configuration} for
* Mongo's {@link com.mongodb.gridfs.GridFS Grid FS} Spring Data's
* {@link org.springframework.data.mongodb.gridfs.GridFsTemplate GridFsTemplate}.
*
* <p>
* You can override which GridFS database is used by specifying {@code spring.data.mongodb.gridFsDatabase},
* otherwise it defaults to the general {@code spring.data.mongodb.database} parameter.
*
* @author Josh Long
*/
@Configuration
@ConditionalOnClass({Mongo.class, GridFsTemplate.class})
@EnableConfigurationProperties(MongoProperties.class)
@AutoConfigureAfter(MongoTemplateAutoConfiguration.class)
public class GridFsTemplateAutoConfiguration {
@Autowired
private MongoProperties mongoProperties;
@Bean
@ConditionalOnMissingBean
public MongoDbFactory mongoDbFactory(Mongo mongo) throws Exception {
String db = StringUtils.hasText(this.mongoProperties.getGridFsDatabase()) ?
this.mongoProperties.getGridFsDatabase() : this.mongoProperties.getMongoClientDatabase() ;
return new SimpleMongoDbFactory(mongo, db );
}
@Bean
@ConditionalOnMissingBean
public GridFsTemplate gridFsTemplate(MongoDbFactory mongoDbFactory,
MongoTemplate mongoTemplate) {
return new GridFsTemplate(mongoDbFactory, mongoTemplate.getConverter());
}
}
...@@ -16,75 +16,86 @@ ...@@ -16,75 +16,86 @@
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.
* *
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
* @author Josh Long
*/ */
@ConfigurationProperties(prefix = "spring.data.mongodb") @ConfigurationProperties(prefix = "spring.data.mongodb")
public class MongoProperties { public class MongoProperties {
private String host; private String host;
private int port = DBPort.PORT;
private String uri = "mongodb://localhost/test";
private String database;
private String gridFsDatabase;
private int port = DBPort.PORT;
private String uri = "mongodb://localhost/test"; public String getHost() {
return this.host;
}
private String database; public void setHost(String host) {
this.host = host;
}
public String getHost() { public String getDatabase() {
return this.host; return this.database;
} }
public void setHost(String host) { public void setDatabase(String database) {
this.host = host; this.database = database;
} }
public String getDatabase() { public String getUri() {
return this.database; return this.uri;
} }
public void setDatabase(String database) { public void setUri(String uri) {
this.database = database; this.uri = uri;
} }
public String getUri() { public int getPort() {
return this.uri; return this.port;
} }
public void setUri(String uri) { public void setPort(int port) {
this.uri = uri; this.port = port;
} }
public int getPort() { public String getGridFsDatabase() {
return this.port; return gridFsDatabase;
} }
public void setPort(int port) { public void setGridFsDatabase(String gridFsDatabase) {
this.port = port; this.gridFsDatabase = gridFsDatabase;
} }
public String getMongoClientDatabase() { public String getMongoClientDatabase() {
if (this.database != null) { if (this.database != null) {
return this.database; return this.database;
} }
return new MongoClientURI(this.uri).getDatabase(); return new MongoClientURI(this.uri).getDatabase();
} }
public MongoClient createMongoClient() throws UnknownHostException { public MongoClient createMongoClient() throws UnknownHostException {
if (this.host != null) { if (this.host != null) {
return new MongoClient(this.host, this.port); return new MongoClient(this.host, this.port);
} }
return new MongoClient(new MongoClientURI(this.uri)); return new MongoClient(new MongoClientURI(this.uri));
} }
} }
package org.springframework.boot.autoconfigure.mongo;
import org.junit.After;
import org.junit.Test;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.gridfs.GridFsTemplate;
import static org.junit.Assert.assertEquals;
public class GridFsTemplateAutoConfigurationTests {
private AnnotationConfigApplicationContext context;
@After
public void close() {
if (this.context != null) {
this.context.close();
}
}
@Test
public void templateExists() {
this.context = new AnnotationConfigApplicationContext(
PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class,
MongoTemplateAutoConfiguration.class , GridFsTemplateAutoConfiguration.class);
assertEquals(1, this.context.getBeanNamesForType(GridFsTemplate.class).length);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment