Polishing.

Reorder methods.

See: #4555
Original pull request: #4556

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java

@@ -179,55 +179,62 @@ public static MongoConverterConfigurationAdapter from(List<?> converters) {
 		}
 
 		/**
-		 * Set whether to or not to use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
-		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
-		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
+		 * Add a custom {@link Converter} implementation.
 		 *
-		 * @param useNativeDriverJavaTimeCodecs
+		 * @param converter must not be {@literal null}.
 		 * @return this.
 		 */
-		public MongoConverterConfigurationAdapter useNativeDriverJavaTimeCodecs(boolean useNativeDriverJavaTimeCodecs) {
+		public MongoConverterConfigurationAdapter registerConverter(Converter<?, ?> converter) {
 
-			this.useNativeDriverJavaTimeCodecs = useNativeDriverJavaTimeCodecs;
+			Assert.notNull(converter, "Converter must not be null");
+			customConverters.add(converter);
 			return this;
 		}
 
 		/**
-		 * Use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
-		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
-		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
+		 * Add {@link Converter converters}, {@link ConverterFactory factories}, {@link ConverterBuilder.ConverterAware
+		 * converter-aware objects}, and {@link GenericConverter generic converters}.
 		 *
+		 * @param converters must not be {@literal null} nor contain {@literal null} values.
 		 * @return this.
-		 * @see #useNativeDriverJavaTimeCodecs(boolean)
 		 */
-		public MongoConverterConfigurationAdapter useNativeDriverJavaTimeCodecs() {
-			return useNativeDriverJavaTimeCodecs(true);
+		public MongoConverterConfigurationAdapter registerConverters(Collection<?> converters) {
+
+			Assert.notNull(converters, "Converters must not be null");
+			Assert.noNullElements(converters, "Converters must not be null nor contain null values");
+
+			customConverters.addAll(converters);
+			return this;
 		}
 
 		/**
-		 * Use SpringData {@link Converter Jsr310 converters} for
-		 * {@link org.springframework.data.convert.Jsr310Converters.LocalDateToDateConverter LocalDate},
-		 * {@link org.springframework.data.convert.Jsr310Converters.LocalTimeToDateConverter LocalTime} and
-		 * {@link org.springframework.data.convert.Jsr310Converters.LocalDateTimeToDateConverter LocalDateTime} using the
-		 * {@link ZoneId#systemDefault()}.
+		 * Add a custom {@link ConverterFactory} implementation.
 		 *
+		 * @param converterFactory must not be {@literal null}.
 		 * @return this.
-		 * @see #useNativeDriverJavaTimeCodecs(boolean)
 		 */
-		public MongoConverterConfigurationAdapter useSpringDataJavaTimeCodecs() {
-			return useNativeDriverJavaTimeCodecs(false);
+		public MongoConverterConfigurationAdapter registerConverterFactory(ConverterFactory<?, ?> converterFactory) {
+
+			Assert.notNull(converterFactory, "ConverterFactory must not be null");
+			customConverters.add(converterFactory);
+			return this;
 		}
 
 		/**
-		 * Add a custom {@link Converter} implementation.
+		 * Add a custom/default {@link PropertyValueConverterFactory} implementation used to serve
+		 * {@link PropertyValueConverter}.
 		 *
-		 * @param converter must not be {@literal null}.
+		 * @param converterFactory must not be {@literal null}.
 		 * @return this.
+		 * @since 3.4
 		 */
-		public MongoConverterConfigurationAdapter registerConverter(Converter<?, ?> converter) {
+		public MongoConverterConfigurationAdapter registerPropertyValueConverterFactory(
+				PropertyValueConverterFactory converterFactory) {
 
-			Assert.notNull(converter, "Converter must not be null");
-			customConverters.add(converter);
+			Assert.state(valueConversions() instanceof SimplePropertyValueConversions,
+					"Configured PropertyValueConversions does not allow setting custom ConverterRegistry");
+
+			((SimplePropertyValueConversions) valueConversions()).setConverterFactory(converterFactory);
 			return this;
 		}
 
@@ -253,50 +260,43 @@ public MongoConverterConfigurationAdapter configurePropertyConversions(
 		}
 
 		/**
-		 * Add a custom {@link ConverterFactory} implementation.
+		 * Set whether to or not to use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
+		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
+		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
 		 *
-		 * @param converterFactory must not be {@literal null}.
+		 * @param useNativeDriverJavaTimeCodecs
 		 * @return this.
 		 */
-		public MongoConverterConfigurationAdapter registerConverterFactory(ConverterFactory<?, ?> converterFactory) {
+		public MongoConverterConfigurationAdapter useNativeDriverJavaTimeCodecs(boolean useNativeDriverJavaTimeCodecs) {
 
-			Assert.notNull(converterFactory, "ConverterFactory must not be null");
-			customConverters.add(converterFactory);
+			this.useNativeDriverJavaTimeCodecs = useNativeDriverJavaTimeCodecs;
 			return this;
 		}
 
 		/**
-		 * Add {@link Converter converters}, {@link ConverterFactory factories}, {@link ConverterBuilder.ConverterAware
-		 * converter-aware objects}, and {@link GenericConverter generic converters}.
+		 * Use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
+		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
+		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
 		 *
-		 * @param converters must not be {@literal null} nor contain {@literal null} values.
 		 * @return this.
+		 * @see #useNativeDriverJavaTimeCodecs(boolean)
 		 */
-		public MongoConverterConfigurationAdapter registerConverters(Collection<?> converters) {
-
-			Assert.notNull(converters, "Converters must not be null");
-			Assert.noNullElements(converters, "Converters must not be null nor contain null values");
-
-			customConverters.addAll(converters);
-			return this;
+		public MongoConverterConfigurationAdapter useNativeDriverJavaTimeCodecs() {
+			return useNativeDriverJavaTimeCodecs(true);
 		}
 
 		/**
-		 * Add a custom/default {@link PropertyValueConverterFactory} implementation used to serve
-		 * {@link PropertyValueConverter}.
+		 * Use SpringData {@link Converter Jsr310 converters} for
+		 * {@link org.springframework.data.convert.Jsr310Converters.LocalDateToDateConverter LocalDate},
+		 * {@link org.springframework.data.convert.Jsr310Converters.LocalTimeToDateConverter LocalTime} and
+		 * {@link org.springframework.data.convert.Jsr310Converters.LocalDateTimeToDateConverter LocalDateTime} using the
+		 * {@link ZoneId#systemDefault()}.
 		 *
-		 * @param converterFactory must not be {@literal null}.
 		 * @return this.
-		 * @since 3.4
+		 * @see #useNativeDriverJavaTimeCodecs(boolean)
 		 */
-		public MongoConverterConfigurationAdapter registerPropertyValueConverterFactory(
-				PropertyValueConverterFactory converterFactory) {
-
-			Assert.state(valueConversions() instanceof SimplePropertyValueConversions,
-					"Configured PropertyValueConversions does not allow setting custom ConverterRegistry");
-
-			((SimplePropertyValueConversions) valueConversions()).setConverterFactory(converterFactory);
-			return this;
+		public MongoConverterConfigurationAdapter useSpringDataJavaTimeCodecs() {
+			return useNativeDriverJavaTimeCodecs(false);
 		}
 
 		/**