Fix MongoDB CustomConversions bean name
This commit qualifies the `CustomConversions` bean name that the Mongo auto-configuration might create. `CustomConversions` is a common pattern in Spring Data and other stores are using the same name. See https://jira.spring.io/browse/DATASOLR-362 Closes gh-8225
This commit is contained in:
parent
c48f45e755
commit
8a59e88a9d
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2016 the original author or authors.
|
* Copyright 2012-2017 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.
|
||||||
|
@ -68,6 +68,7 @@ import org.springframework.util.StringUtils;
|
||||||
* @author Josh Long
|
* @author Josh Long
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Eddú Meléndez
|
* @author Eddú Meléndez
|
||||||
|
* @author Stephane Nicoll
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
@Configuration
|
@Configuration
|
||||||
|
@ -139,7 +140,7 @@ public class MongoDataAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
public CustomConversions customConversions() {
|
public CustomConversions mongoCustomConversions() {
|
||||||
return new CustomConversions(Collections.emptyList());
|
return new CustomConversions(Collections.emptyList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue