Commit ca5ebea2 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish

parent 9aa751a9
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 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.
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package org.springframework.boot.autoconfigure.data.mongo; package org.springframework.boot.autoconfigure.data.mongo;
import java.net.UnknownHostException;
import java.util.Collections; import java.util.Collections;
import com.mongodb.DB; import com.mongodb.DB;
...@@ -24,7 +23,6 @@ import com.mongodb.MongoClient; ...@@ -24,7 +23,6 @@ import com.mongodb.MongoClient;
import com.mongodb.client.MongoDatabase; import com.mongodb.client.MongoDatabase;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
...@@ -89,7 +87,7 @@ public class MongoDataAutoConfiguration { ...@@ -89,7 +87,7 @@ public class MongoDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(MongoDbFactory.class) @ConditionalOnMissingBean(MongoDbFactory.class)
public SimpleMongoDbFactory mongoDbFactory(MongoClient mongo) throws Exception { public SimpleMongoDbFactory mongoDbFactory(MongoClient mongo) {
String database = this.properties.getMongoClientDatabase(); String database = this.properties.getMongoClientDatabase();
return new SimpleMongoDbFactory(mongo, database); return new SimpleMongoDbFactory(mongo, database);
} }
...@@ -97,15 +95,14 @@ public class MongoDataAutoConfiguration { ...@@ -97,15 +95,14 @@ public class MongoDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public MongoTemplate mongoTemplate(MongoDbFactory mongoDbFactory, public MongoTemplate mongoTemplate(MongoDbFactory mongoDbFactory,
MongoConverter converter) throws UnknownHostException { MongoConverter converter) {
return new MongoTemplate(mongoDbFactory, converter); return new MongoTemplate(mongoDbFactory, converter);
} }
@Bean @Bean
@ConditionalOnMissingBean(MongoConverter.class) @ConditionalOnMissingBean(MongoConverter.class)
public MappingMongoConverter mappingMongoConverter(MongoDbFactory factory, public MappingMongoConverter mappingMongoConverter(MongoDbFactory factory,
MongoMappingContext context, BeanFactory beanFactory, MongoMappingContext context, MongoCustomConversions conversions) {
MongoCustomConversions conversions) {
DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory); DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
MappingMongoConverter mappingConverter = new MappingMongoConverter(dbRefResolver, MappingMongoConverter mappingConverter = new MappingMongoConverter(dbRefResolver,
context); context);
...@@ -115,8 +112,8 @@ public class MongoDataAutoConfiguration { ...@@ -115,8 +112,8 @@ public class MongoDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public MongoMappingContext mongoMappingContext(BeanFactory beanFactory, public MongoMappingContext mongoMappingContext(MongoCustomConversions conversions)
MongoCustomConversions conversions) throws ClassNotFoundException { throws ClassNotFoundException {
MongoMappingContext context = new MongoMappingContext(); MongoMappingContext context = new MongoMappingContext();
context.setInitialEntitySet(new EntityScanner(this.applicationContext) context.setInitialEntitySet(new EntityScanner(this.applicationContext)
.scan(Document.class, Persistent.class)); .scan(Document.class, Persistent.class));
......
...@@ -60,7 +60,7 @@ public class MongoReactiveDataAutoConfiguration { ...@@ -60,7 +60,7 @@ public class MongoReactiveDataAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(ReactiveMongoDatabaseFactory.class) @ConditionalOnMissingBean(ReactiveMongoDatabaseFactory.class)
public SimpleReactiveMongoDatabaseFactory reactiveMongoDatabaseFactory( public SimpleReactiveMongoDatabaseFactory reactiveMongoDatabaseFactory(
MongoClient mongo) throws Exception { MongoClient mongo) {
String database = this.properties.getMongoClientDatabase(); String database = this.properties.getMongoClientDatabase();
return new SimpleReactiveMongoDatabaseFactory(mongo, database); return new SimpleReactiveMongoDatabaseFactory(mongo, database);
} }
......
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