hacking part II

Author: christophstrobl

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

@@ -91,27 +91,11 @@ private MongoConverters() {}
 	 */
 	static Collection<Object> getConvertersToRegister() {
 
-		Environment env = new StandardEnvironment();
-		boolean flagPresent = env.containsProperty("mongo.decimal128.representation");
-		boolean decimalToString =  !flagPresent || env.getProperty("mongo.decimal128.representation", String.class, "string").equals("string");
-
 		List<Object> converters = new ArrayList<>();
 
-		if(decimalToString) {
-			converters.add(BigDecimalToStringConverter.INSTANCE);
-			converters.add(StringToBigDecimalConverter.INSTANCE);
-		} else {
-			//converters.add(new NumberToNumberConverter<>())
-		}
-
 		converters.add(BigDecimalToDecimal128Converter.INSTANCE);
 		converters.add(Decimal128ToBigDecimalConverter.INSTANCE);
 
-		if(decimalToString) {
-			converters.add(BigIntegerToStringConverter.INSTANCE);
-			converters.add(StringToBigIntegerConverter.INSTANCE);
-		}
-
 		converters.add(URLToStringConverter.INSTANCE);
 		converters.add(StringToURLConverter.INSTANCE);
 		converters.add(DocumentToStringConverter.INSTANCE);

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

@@ -47,6 +47,10 @@
 import org.springframework.data.convert.SimplePropertyValueConversions;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
@@ -157,16 +161,16 @@ public static class MongoConverterConfigurationAdapter {
 		private static final Set<Class<?>> JAVA_DRIVER_TIME_SIMPLE_TYPES = Set.of(LocalDate.class, LocalTime.class, LocalDateTime.class);
 
 		private boolean useNativeDriverJavaTimeCodecs = false;
-		private boolean defaultToDecimal128;
+		private String numericFormat;
 		private final List<Object> customConverters = new ArrayList<>();
 
 		private final PropertyValueConversions internalValueConversion = PropertyValueConversions.simple(it -> {});
 		private PropertyValueConversions propertyValueConversions = internalValueConversion;
 
 		{
 			Environment env = new StandardEnvironment();
-			boolean flagPresent = env.containsProperty("mongo.decimal128.representation");
-			defaultToDecimal128 = !flagPresent || env.getProperty("mongo.decimal128.representation", String.class, "string").equals("string");
+			boolean flagPresent = env.containsProperty("mongo.numeric.format");
+			numericFormat = flagPresent ? env.getProperty("mongo.numeric.format", String.class, "string") : "string";
 		}
 
 		/**
@@ -308,6 +312,10 @@ public MongoConverterConfigurationAdapter useSpringDataJavaTimeCodecs() {
 			return useNativeDriverJavaTimeCodecs(false);
 		}
 
+		public MongoConverterConfigurationAdapter numericFormat(String format) {
+			this.numericFormat = format;
+			return this;
+		}
 		/**
 		 * Optionally set the {@link PropertyValueConversions} to be applied during mapping.
 		 * <p>
@@ -357,17 +365,24 @@ ConverterConfiguration createConverterConfiguration() {
 				svc.init();
 			}
 
-			// TODO: all the config must go here now and omg get rid of the static blocks!!
+			List<Object> converters = new ArrayList<>(STORE_CONVERTERS.size() + 7);
+			if(numericFormat.equals("string")) {
+				converters.add(BigDecimalToStringConverter.INSTANCE);
+				converters.add(StringToBigDecimalConverter.INSTANCE);
+				converters.add(BigIntegerToStringConverter.INSTANCE);
+				converters.add(StringToBigIntegerConverter.INSTANCE);
+			}
 
 			if (!useNativeDriverJavaTimeCodecs) {
-				return new ConverterConfiguration(STORE_CONVERSIONS, this.customConverters, convertiblePair -> true,
+
+				converters.addAll(customConverters);
+				return new ConverterConfiguration(STORE_CONVERSIONS, converters, convertiblePair -> true,
 						this.propertyValueConversions);
 			}
 
 			/*
 			 * We need to have those converters using UTC as the default ones would go on with the systemDefault.
 			 */
-			List<Object> converters = new ArrayList<>(STORE_CONVERTERS.size() + 3);
 			converters.add(DateToUtcLocalDateConverter.INSTANCE);
 			converters.add(DateToUtcLocalTimeConverter.INSTANCE);
 			converters.add(DateToUtcLocalDateTimeConverter.INSTANCE);

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java

@@ -3376,7 +3376,7 @@ void convertsBigIntegerToDecimal128IfFieldTypeIndicatesConversion() {
 	}
 
 	@Test // GH-3444
-	@SetSystemProperty(key = "mongo.decimal128.representation", value = "decimal128")
+	@SetSystemProperty(key = "mongo.numeric.format", value = "decimal128")
 	void usesConfiguredNumericFormat() {
 
 		MongoCustomConversions conversions = new MongoCustomConversions(