Tests update for #1957

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocUtils.java

@@ -23,6 +23,7 @@
 package org.springdoc.core;
 
 import java.lang.annotation.Annotation;
+import java.math.BigDecimal;
 import java.util.function.Predicate;
 
 import io.swagger.v3.oas.models.media.Schema;
@@ -33,6 +34,7 @@
 
 /**
  * The type Spring doc utils.
+ *
  * @author bnasslahsen
  */
 public class SpringDocUtils {
@@ -323,5 +325,27 @@ public SpringDocUtils setModelAndViewClass(Class<?> clazz) {
 		AbstractOpenApiResource.setModelAndViewClass(clazz);
 		return this;
 	}
+
+	/**
+	 * Remove from schema map spring doc utils.
+	 *
+	 * @param clazzs the clazzs
+	 * @return the spring doc utils
+	 */
+	public SpringDocUtils removeFromSchemaMap(Class<?> clazzs) {
+		AdditionalModelsConverter.removeFromSchemaMap(clazzs);
+		return this;
+	}
+
+	/**
+	 * Remove from schema class spring doc utils.
+	 *
+	 * @param clazzs the clazzs
+	 * @return the spring doc utils
+	 */
+	public SpringDocUtils removeFromSchemaClass(Class<?> clazzs) {
+		AdditionalModelsConverter.removeFromClassMap(clazzs);
+		return this;
+	}
 }
 

springdoc-openapi-common/src/main/java/org/springdoc/core/converters/AdditionalModelsConverter.java

@@ -39,19 +39,20 @@
 
 /**
  * The type Additional models converter.
+ *
  * @author bnasslahsen
  */
 public class AdditionalModelsConverter implements ModelConverter {
 
 	/**
 	 * The constant modelToClassMap.
 	 */
-	private static final Map<Class, Class> modelToClassMap = new HashMap<>();
+	private static Map<Class, Class> modelToClassMap = new HashMap<>();
 
 	/**
 	 * The constant modelToSchemaMap.
 	 */
-	private static final Map<Class, Schema> modelToSchemaMap = new HashMap<>();
+	private static Map<Class, Schema> modelToSchemaMap = new HashMap<>();
 
 	/**
 	 * The constant paramObjectReplacementMap.
@@ -154,4 +155,21 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 		return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null;
 	}
 
+	/**
+	 * Remove from schema map.
+	 *
+	 * @param clazz the clazz
+	 */
+	public static void removeFromSchemaMap(Class clazz) {
+		modelToSchemaMap.remove(clazz);
+	}
+
+	/**
+	 * Remove from class map.
+	 *
+	 * @param clazz the clazz
+	 */
+	public static void removeFromClassMap(Class clazz) {
+		modelToClassMap.remove(clazz);
+	}
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app114/SpringDocApp114Test.java

@@ -22,9 +22,12 @@
 
 package test.org.springdoc.api.v30.app114;
 
+import java.math.BigDecimal;
+
 import javax.money.MonetaryAmount;
 
 import org.springdoc.core.SpringDocUtils;
+import org.springdoc.core.converters.AdditionalModelsConverter;
 import test.org.springdoc.api.v30.AbstractSpringDocV30Test;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -33,7 +36,9 @@
 public class SpringDocApp114Test extends AbstractSpringDocV30Test {
 
 	static {
-		SpringDocUtils.getConfig().replaceWithClass(MonetaryAmount.class, org.springdoc.core.converters.models.MonetaryAmount.class);
+		SpringDocUtils.getConfig()
+				.removeFromSchemaMap(BigDecimal.class)
+				.replaceWithClass(MonetaryAmount.class, org.springdoc.core.converters.models.MonetaryAmount.class);
 	}
 
 	@SpringBootApplication