Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
f57ff3a7
Commit
f57ff3a7
authored
Dec 27, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.5.x'
parents
cf427736
970b16f8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
22 deletions
+14
-22
MongoDataAutoConfiguration.java
.../autoconfigure/data/mongo/MongoDataAutoConfiguration.java
+1
-2
MongoRepositoriesAutoConfiguration.java
...figure/data/mongo/MongoRepositoriesAutoConfiguration.java
+2
-2
EmbeddedMongoAutoConfiguration.java
...figure/mongo/embedded/EmbeddedMongoAutoConfiguration.java
+1
-2
MongoDataAutoConfigurationTests.java
...configure/data/mongo/MongoDataAutoConfigurationTests.java
+5
-5
MongoReactiveRepositoriesAutoConfigurationTests.java
...ongo/MongoReactiveRepositoriesAutoConfigurationTests.java
+1
-2
MongoRepositoriesAutoConfigurationTests.java
...e/data/mongo/MongoRepositoriesAutoConfigurationTests.java
+3
-7
MongoAutoConfigurationTests.java
...boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
+1
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java
View file @
f57ff3a7
...
@@ -20,7 +20,6 @@ import java.net.UnknownHostException;
...
@@ -20,7 +20,6 @@ import java.net.UnknownHostException;
import
java.util.Collections
;
import
java.util.Collections
;
import
com.mongodb.DB
;
import
com.mongodb.DB
;
import
com.mongodb.Mongo
;
import
com.mongodb.MongoClient
;
import
com.mongodb.MongoClient
;
import
com.mongodb.client.MongoDatabase
;
import
com.mongodb.client.MongoDatabase
;
...
@@ -73,7 +72,7 @@ import org.springframework.util.StringUtils;
...
@@ -73,7 +72,7 @@ import org.springframework.util.StringUtils;
* @since 1.1.0
* @since 1.1.0
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
({
Mongo
.
class
,
MongoTemplate
.
class
})
@ConditionalOnClass
({
Mongo
Client
.
class
,
MongoTemplate
.
class
})
@EnableConfigurationProperties
(
MongoProperties
.
class
)
@EnableConfigurationProperties
(
MongoProperties
.
class
)
@AutoConfigureAfter
(
MongoAutoConfiguration
.
class
)
@AutoConfigureAfter
(
MongoAutoConfiguration
.
class
)
public
class
MongoDataAutoConfiguration
{
public
class
MongoDataAutoConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java
View file @
f57ff3a7
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
data
.
mongo
;
package
org
.
springframework
.
boot
.
autoconfigure
.
data
.
mongo
;
import
com.mongodb.Mongo
;
import
com.mongodb.Mongo
Client
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
...
@@ -53,7 +53,7 @@ import org.springframework.data.mongodb.repository.support.MongoRepositoryFactor
...
@@ -53,7 +53,7 @@ import org.springframework.data.mongodb.repository.support.MongoRepositoryFactor
* @see EnableMongoRepositories
* @see EnableMongoRepositories
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
({
Mongo
.
class
,
MongoRepository
.
class
})
@ConditionalOnClass
({
Mongo
Client
.
class
,
MongoRepository
.
class
})
@ConditionalOnMissingBean
({
MongoRepositoryFactoryBean
.
class
,
@ConditionalOnMissingBean
({
MongoRepositoryFactoryBean
.
class
,
MongoRepositoryConfigurationExtension
.
class
})
MongoRepositoryConfigurationExtension
.
class
})
@ConditionalOnRepositoryType
(
store
=
"mongodb"
,
type
=
RepositoryType
.
IMPERATIVE
)
@ConditionalOnRepositoryType
(
store
=
"mongodb"
,
type
=
RepositoryType
.
IMPERATIVE
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java
View file @
f57ff3a7
...
@@ -24,7 +24,6 @@ import java.util.HashMap;
...
@@ -24,7 +24,6 @@ import java.util.HashMap;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.Set
;
import
com.mongodb.Mongo
;
import
com.mongodb.MongoClient
;
import
com.mongodb.MongoClient
;
import
de.flapdoodle.embed.mongo.Command
;
import
de.flapdoodle.embed.mongo.Command
;
import
de.flapdoodle.embed.mongo.MongodExecutable
;
import
de.flapdoodle.embed.mongo.MongodExecutable
;
...
@@ -80,7 +79,7 @@ import org.springframework.util.Assert;
...
@@ -80,7 +79,7 @@ import org.springframework.util.Assert;
@Configuration
@Configuration
@EnableConfigurationProperties
({
MongoProperties
.
class
,
EmbeddedMongoProperties
.
class
})
@EnableConfigurationProperties
({
MongoProperties
.
class
,
EmbeddedMongoProperties
.
class
})
@AutoConfigureBefore
(
MongoAutoConfiguration
.
class
)
@AutoConfigureBefore
(
MongoAutoConfiguration
.
class
)
@ConditionalOnClass
({
Mongo
.
class
,
MongodStarter
.
class
})
@ConditionalOnClass
({
Mongo
Client
.
class
,
MongodStarter
.
class
})
public
class
EmbeddedMongoAutoConfiguration
{
public
class
EmbeddedMongoAutoConfiguration
{
private
static
final
byte
[]
IP4_LOOPBACK_ADDRESS
=
{
127
,
0
,
0
,
1
};
private
static
final
byte
[]
IP4_LOOPBACK_ADDRESS
=
{
127
,
0
,
0
,
1
};
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java
View file @
f57ff3a7
...
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
...
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Set
;
import
java.util.Set
;
import
com.mongodb.Mongo
;
import
com.mongodb.Mongo
Client
;
import
org.junit.After
;
import
org.junit.After
;
import
org.junit.Test
;
import
org.junit.Test
;
...
@@ -96,8 +96,8 @@ public class MongoDataAutoConfigurationTests {
...
@@ -96,8 +96,8 @@ public class MongoDataAutoConfigurationTests {
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
);
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
);
this
.
context
.
refresh
();
this
.
context
.
refresh
();
MongoTemplate
template
=
this
.
context
.
getBean
(
MongoTemplate
.
class
);
MongoTemplate
template
=
this
.
context
.
getBean
(
MongoTemplate
.
class
);
assertThat
(
template
.
getConverter
().
getConversionService
()
.
canConvert
(
Mongo
.
class
,
assertThat
(
template
.
getConverter
().
getConversionService
()
Boolean
.
class
)).
isTrue
();
.
canConvert
(
MongoClient
.
class
,
Boolean
.
class
)).
isTrue
();
}
}
@Test
@Test
...
@@ -203,10 +203,10 @@ public class MongoDataAutoConfigurationTests {
...
@@ -203,10 +203,10 @@ public class MongoDataAutoConfigurationTests {
}
}
private
static
class
MyConverter
implements
Converter
<
Mongo
,
Boolean
>
{
private
static
class
MyConverter
implements
Converter
<
Mongo
Client
,
Boolean
>
{
@Override
@Override
public
Boolean
convert
(
Mongo
source
)
{
public
Boolean
convert
(
Mongo
Client
source
)
{
return
null
;
return
null
;
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java
View file @
f57ff3a7
...
@@ -60,8 +60,7 @@ public class MongoReactiveRepositoriesAutoConfigurationTests {
...
@@ -60,8 +60,7 @@ public class MongoReactiveRepositoriesAutoConfigurationTests {
public
void
testDefaultRepositoryConfiguration
()
{
public
void
testDefaultRepositoryConfiguration
()
{
this
.
runner
.
withUserConfiguration
(
TestConfiguration
.
class
).
run
((
context
)
->
{
this
.
runner
.
withUserConfiguration
(
TestConfiguration
.
class
).
run
((
context
)
->
{
assertThat
(
context
).
hasSingleBean
(
ReactiveCityRepository
.
class
);
assertThat
(
context
).
hasSingleBean
(
ReactiveCityRepository
.
class
);
MongoClient
client
=
context
.
getBean
(
MongoClient
.
class
);
assertThat
(
context
).
hasSingleBean
(
MongoClient
.
class
);
assertThat
(
client
).
isInstanceOf
(
MongoClient
.
class
);
MongoMappingContext
mappingContext
=
context
MongoMappingContext
mappingContext
=
context
.
getBean
(
MongoMappingContext
.
class
);
.
getBean
(
MongoMappingContext
.
class
);
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java
View file @
f57ff3a7
...
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.data.mongo;
...
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.data.mongo;
import
java.util.Set
;
import
java.util.Set
;
import
com.mongodb.Mongo
;
import
com.mongodb.MongoClient
;
import
com.mongodb.MongoClient
;
import
org.junit.Test
;
import
org.junit.Test
;
...
@@ -56,8 +55,7 @@ public class MongoRepositoriesAutoConfigurationTests {
...
@@ -56,8 +55,7 @@ public class MongoRepositoriesAutoConfigurationTests {
public
void
testDefaultRepositoryConfiguration
()
{
public
void
testDefaultRepositoryConfiguration
()
{
this
.
runner
.
withUserConfiguration
(
TestConfiguration
.
class
).
run
((
context
)
->
{
this
.
runner
.
withUserConfiguration
(
TestConfiguration
.
class
).
run
((
context
)
->
{
assertThat
(
context
).
hasSingleBean
(
CityRepository
.
class
);
assertThat
(
context
).
hasSingleBean
(
CityRepository
.
class
);
Mongo
mongo
=
context
.
getBean
(
Mongo
.
class
);
assertThat
(
context
).
hasSingleBean
(
MongoClient
.
class
);
assertThat
(
mongo
).
isInstanceOf
(
MongoClient
.
class
);
MongoMappingContext
mappingContext
=
context
MongoMappingContext
mappingContext
=
context
.
getBean
(
MongoMappingContext
.
class
);
.
getBean
(
MongoMappingContext
.
class
);
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
...
@@ -69,10 +67,8 @@ public class MongoRepositoriesAutoConfigurationTests {
...
@@ -69,10 +67,8 @@ public class MongoRepositoriesAutoConfigurationTests {
@Test
@Test
public
void
testNoRepositoryConfiguration
()
{
public
void
testNoRepositoryConfiguration
()
{
this
.
runner
.
withUserConfiguration
(
EmptyConfiguration
.
class
).
run
((
context
)
->
{
this
.
runner
.
withUserConfiguration
(
EmptyConfiguration
.
class
).
run
((
context
)
->
assertThat
(
context
).
hasSingleBean
(
Mongo
.
class
);
assertThat
(
context
).
hasSingleBean
(
MongoClient
.
class
));
assertThat
(
context
.
getBean
(
Mongo
.
class
)).
isInstanceOf
(
MongoClient
.
class
);
});
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
View file @
f57ff3a7
...
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.mongo;
...
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.mongo;
import
javax.net.SocketFactory
;
import
javax.net.SocketFactory
;
import
com.mongodb.Mongo
;
import
com.mongodb.MongoClient
;
import
com.mongodb.MongoClient
;
import
com.mongodb.MongoClientOptions
;
import
com.mongodb.MongoClientOptions
;
import
org.junit.After
;
import
org.junit.After
;
...
@@ -54,7 +53,7 @@ public class MongoAutoConfigurationTests {
...
@@ -54,7 +53,7 @@ public class MongoAutoConfigurationTests {
public
void
clientExists
()
{
public
void
clientExists
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
(
this
.
context
=
new
AnnotationConfigApplicationContext
(
PropertyPlaceholderAutoConfiguration
.
class
,
MongoAutoConfiguration
.
class
);
PropertyPlaceholderAutoConfiguration
.
class
,
MongoAutoConfiguration
.
class
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
Mongo
.
class
).
length
).
isEqualTo
(
1
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
Mongo
Client
.
class
)).
hasSize
(
1
);
}
}
@Test
@Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment