Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MongoDB CustomConversions bean name

Browse Source 
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:
Stephane Nicoll 2017-02-08 14:29:33 +01:00
parent c48f45e755
commit 8a59e88a9d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java
View File

@ -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");
* 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 Phillip Webb
* @author Eddú Meléndez
* @author Stephane Nicoll
* @since 1.1.0
*/
@Configuration
@ -139,7 +140,7 @@ public class MongoDataAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public CustomConversions customConversions() {
public CustomConversions mongoCustomConversions() {
return new CustomConversions(Collections.emptyList());
}