From 745e2650e5f22c59667dce290688ca74d6ca5058 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 17 Oct 2017 14:51:12 +0200 Subject: [PATCH] DATAMONGO-1802 - Polishing. Reduce converter visibility to MongoConverters's package-scope visibility. Tiny alignment in Javadoc wording. Copyright year, create empty byte array with element count instead initializer. Original pull request: #505. --- .../mongodb/core/convert/MongoConverters.java | 50 +++++++++---------- .../MongoConvertersIntegrationTests.java | 3 +- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java index a2b352923..45eb5e91f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2011-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. @@ -65,7 +65,7 @@ abstract class MongoConverters { * @return * @since 1.9 */ - public static Collection getConvertersToRegister() { + static Collection getConvertersToRegister() { List converters = new ArrayList<>(); @@ -95,7 +95,7 @@ abstract class MongoConverters { * * @author Oliver Gierke */ - public static enum ObjectIdToStringConverter implements Converter { + enum ObjectIdToStringConverter implements Converter { INSTANCE; public String convert(ObjectId id) { @@ -108,7 +108,7 @@ abstract class MongoConverters { * * @author Oliver Gierke */ - public static enum StringToObjectIdConverter implements Converter { + enum StringToObjectIdConverter implements Converter { INSTANCE; public ObjectId convert(String source) { @@ -121,7 +121,7 @@ abstract class MongoConverters { * * @author Oliver Gierke */ - public static enum ObjectIdToBigIntegerConverter implements Converter { + enum ObjectIdToBigIntegerConverter implements Converter { INSTANCE; public BigInteger convert(ObjectId source) { @@ -134,7 +134,7 @@ abstract class MongoConverters { * * @author Oliver Gierke */ - public static enum BigIntegerToObjectIdConverter implements Converter { + enum BigIntegerToObjectIdConverter implements Converter { INSTANCE; public ObjectId convert(BigInteger source) { @@ -142,7 +142,7 @@ abstract class MongoConverters { } } - public static enum BigDecimalToStringConverter implements Converter { + enum BigDecimalToStringConverter implements Converter { INSTANCE; public String convert(BigDecimal source) { @@ -150,7 +150,7 @@ abstract class MongoConverters { } } - public static enum StringToBigDecimalConverter implements Converter { + enum StringToBigDecimalConverter implements Converter { INSTANCE; public BigDecimal convert(String source) { @@ -158,7 +158,7 @@ abstract class MongoConverters { } } - public static enum BigIntegerToStringConverter implements Converter { + enum BigIntegerToStringConverter implements Converter { INSTANCE; public String convert(BigInteger source) { @@ -166,7 +166,7 @@ abstract class MongoConverters { } } - public static enum StringToBigIntegerConverter implements Converter { + enum StringToBigIntegerConverter implements Converter { INSTANCE; public BigInteger convert(String source) { @@ -174,7 +174,7 @@ abstract class MongoConverters { } } - public static enum URLToStringConverter implements Converter { + enum URLToStringConverter implements Converter { INSTANCE; public String convert(URL source) { @@ -182,7 +182,7 @@ abstract class MongoConverters { } } - public static enum StringToURLConverter implements Converter { + enum StringToURLConverter implements Converter { INSTANCE; private static final TypeDescriptor SOURCE = TypeDescriptor.valueOf(String.class); @@ -199,7 +199,7 @@ abstract class MongoConverters { } @ReadingConverter - public static enum DocumentToStringConverter implements Converter { + enum DocumentToStringConverter implements Converter { INSTANCE; @@ -219,7 +219,7 @@ abstract class MongoConverters { * @since 1.6 */ @WritingConverter - public static enum TermToStringConverter implements Converter { + enum TermToStringConverter implements Converter { INSTANCE; @@ -233,7 +233,7 @@ abstract class MongoConverters { * @author Christoph Strobl * @since 1.7 */ - public static enum DocumentToNamedMongoScriptConverter implements Converter { + enum DocumentToNamedMongoScriptConverter implements Converter { INSTANCE; @@ -255,7 +255,7 @@ abstract class MongoConverters { * @author Christoph Strobl * @since 1.7 */ - public static enum NamedMongoScriptToDocumentConverter implements Converter { + enum NamedMongoScriptToDocumentConverter implements Converter { INSTANCE; @@ -282,7 +282,7 @@ abstract class MongoConverters { * @since 1.9 */ @WritingConverter - public static enum CurrencyToStringConverter implements Converter { + enum CurrencyToStringConverter implements Converter { INSTANCE; @@ -303,7 +303,7 @@ abstract class MongoConverters { * @since 1.9 */ @ReadingConverter - public static enum StringToCurrencyConverter implements Converter { + enum StringToCurrencyConverter implements Converter { INSTANCE; @@ -326,7 +326,7 @@ abstract class MongoConverters { * @since 1.9 */ @WritingConverter - public static enum NumberToNumberConverterFactory implements ConverterFactory, ConditionalConverter { + enum NumberToNumberConverterFactory implements ConverterFactory, ConditionalConverter { INSTANCE; @@ -391,7 +391,7 @@ abstract class MongoConverters { * @since 1.10 */ @WritingConverter - public static enum AtomicLongToLongConverter implements Converter { + enum AtomicLongToLongConverter implements Converter { INSTANCE; @Override @@ -407,7 +407,7 @@ abstract class MongoConverters { * @since 1.10 */ @WritingConverter - public static enum AtomicIntegerToIntegerConverter implements Converter { + enum AtomicIntegerToIntegerConverter implements Converter { INSTANCE; @Override @@ -423,7 +423,7 @@ abstract class MongoConverters { * @since 1.10 */ @ReadingConverter - public static enum LongToAtomicLongConverter implements Converter { + enum LongToAtomicLongConverter implements Converter { INSTANCE; @Override @@ -439,7 +439,7 @@ abstract class MongoConverters { * @since 1.10 */ @ReadingConverter - public static enum IntegerToAtomicIntegerConverter implements Converter { + enum IntegerToAtomicIntegerConverter implements Converter { INSTANCE; @Override @@ -449,13 +449,13 @@ abstract class MongoConverters { } /** - * {@link Converter} implementation capable of converting {@link Binary} to {@code byte[]}. + * {@link Converter} implementation converting {@link Binary} into {@code byte[]}. * * @author Christoph Strobl * @since 2.0.1 */ @ReadingConverter - public static enum BinaryToByteArrayConverter implements Converter { + enum BinaryToByteArrayConverter implements Converter { INSTANCE; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java index 77dc9b94a..273e715d2 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java @@ -41,6 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * * @author Oliver Gierke * @author Christoph Strobl + * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:infrastructure.xml") @@ -83,7 +84,7 @@ public class MongoConvertersIntegrationTests { public void shouldConvertEmptyBinaryDataOnRead() { WithBinaryDataInArray wbd = new WithBinaryDataInArray(); - wbd.data = new byte[] {}; + wbd.data = new byte[0]; template.save(wbd);