undo some of the previous changes

Author: christophstrobl

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import static org.springframework.data.convert.ConverterBuilder.*;
+import static org.springframework.data.convert.ConverterBuilder.reading;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -47,14 +47,11 @@
 import org.bson.types.Code;
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
-
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalConverter;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.domain.Vector;
@@ -174,20 +171,12 @@ public ObjectId convert(BigInteger source) {
 		}
 	}
 
-	enum BigDecimalToStringConverter implements Converter<BigDecimal, String>, ConditionalConverter {
+	enum BigDecimalToStringConverter implements Converter<BigDecimal, String> {
 		INSTANCE;
 
-		Environment env = new StandardEnvironment();
-
 		public String convert(BigDecimal source) {
 			return source.toString();
 		}
-
-		@Override
-		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-			boolean flagPresent = env.containsProperty("mongo.decimal128.representation");
-			return !flagPresent || env.getProperty("mongo.decimal128.representation", String.class, "string").equals("string");
-		}
 	}
 
 	/**
@@ -220,23 +209,16 @@ public BigDecimal convert(Decimal128 source) {
 		}
 	}
 
-	enum BigIntegerToStringConverter implements Converter<BigInteger, String>, ConditionalConverter {
+	@WritingConverter
+	enum BigIntegerToStringConverter implements Converter<BigInteger, String> {
 		INSTANCE;
 
-		Environment env = new StandardEnvironment();
-
 		public String convert(BigInteger source) {
 			return source.toString();
 		}
-
-		@Override
-		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-
-			boolean flagPresent = env.containsProperty("mongo.decimal128.representation");
-			return !flagPresent || env.getProperty("mongo.decimal128.representation", String.class, "string").equals("string");
-		}
 	}
 
+	@ReadingConverter
 	enum StringToBigIntegerConverter implements Converter<String, BigInteger> {
 		INSTANCE;
 
@@ -431,13 +413,13 @@ public NumberToNumberConverter(Class<T> targetType) {
 			@Override
 			public T convert(Number source) {
 
-				if(targetType == Decimal128.class) {
+				if (targetType == Decimal128.class) {
 
 					if (source instanceof BigDecimal bigDecimal) {
 						return targetType.cast(BigDecimalToDecimal128Converter.INSTANCE.convert(bigDecimal));
 					}
 
-					if(source instanceof BigInteger bigInteger) {
+					if (source instanceof BigInteger bigInteger) {
 						return targetType.cast(new Decimal128(bigInteger.longValueExact()));
 					}
 				}