Skip to content

Commit 2c876e5

Browse files
committed
Review chages.
Function name changed and restored to old implementation
1 parent 6d429b8 commit 2c876e5

File tree

1 file changed

+8
-23
lines changed

1 file changed

+8
-23
lines changed

src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,13 @@ public CustomConversions customConversions() {
432432
* @return must not be {@literal null}.
433433
*/
434434
public CustomConversions customConversions(CryptoManager cryptoManager, ObjectMapper objectMapper) {
435-
List<Object> newConverters = additionalConverters();
435+
List<Object> newConverters = new ArrayList();
436+
// The following
437+
newConverters.add(new OtherConverters.EnumToObject(getObjectMapper()));
438+
newConverters.add(new IntegerToEnumConverterFactory(getObjectMapper()));
439+
newConverters.add(new StringToEnumConverterFactory(getObjectMapper()));
440+
newConverters.add(new BooleanToEnumConverterFactory(getObjectMapper()));
441+
additionalConverters(newConverters);
436442
CustomConversions customConversions = CouchbaseCustomConversions.create(configurationAdapter -> {
437443
SimplePropertyValueConversions valueConversions = new SimplePropertyValueConversions();
438444
valueConversions.setConverterFactory(
@@ -445,31 +451,10 @@ public CustomConversions customConversions(CryptoManager cryptoManager, ObjectMa
445451
return customConversions;
446452
}
447453

448-
/**
449-
* This function makes a list of custom converters.
450-
* This list can be updated via {@link #registerAdditionalConverters(List)}
451-
*
452-
* @return additionalConverters - must not be {@literal null}.
453-
*/
454-
public List<Object> additionalConverters() {
455-
456-
List<Object> additionalConverters = new ArrayList();
457-
additionalConverters.add(new OtherConverters.EnumToObject(getObjectMapper()));
458-
additionalConverters.add(new IntegerToEnumConverterFactory(getObjectMapper()));
459-
additionalConverters.add(new StringToEnumConverterFactory(getObjectMapper()));
460-
additionalConverters.add(new BooleanToEnumConverterFactory(getObjectMapper()));
461-
462-
// Register more converters
463-
registerAdditionalConverters(additionalConverters);
464-
465-
return additionalConverters;
466-
467-
}
468-
469454
/**
470455
* This should be overridden in order to update the {@link #additionalConverters()} List
471456
*/
472-
protected void registerAdditionalConverters(List<Object> converters) {
457+
protected void additionalConverters(List<Object> converters) {
473458
// NO_OP
474459
}
475460

0 commit comments

Comments
 (0)