Update OverrideConfiguration

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Issue [#196](https://github.com/42BV/beanmapper/issues/196) **Calls to the logger should not contain a call to String.formatted(Object...)**; Fixed by removing any formatting from performance logging. Trace-logging should keep the level of detail provided by the formatting.
 - Issue [#197](https://github.com/42BV/beanmapper/issues/197) **Implement caching for Unproxy results.**; Created UnproxyResultStore, allowing for thread-safe caching and retrieval of unproxied classes.
 - Issue [#199](https://github.com/42BV/beanmapper/issues/199) **Use of OverrideField causes excessive resource consumption.**; Use of OverrideField was phased out. OverrideField itself is now deprecated for removal.
+- Issue [#201](https://github.com/42BV/beanmapper/issues/201) **Calls from OverrideConfiguration to parentConfiguration cause unnecessary overhead.**; Introduced fields in the OverrideConfiguration, to limit the overhead of calls to the parent configuration.
 
 ## [4.1.3] - 2024-03-27
 

src/main/java/io/beanmapper/config/Configuration.java

@@ -149,6 +149,13 @@ public interface Configuration {
      */
     List<BeanPair> getBeanPairs();
 
+    /**
+     * Retrieves the CollectionHandlerStore from the CoreConfiguration.
+     *
+     * @return The CollectionHandlerStore retrieved from the CoreConfiguration.
+     */
+    CollectionHandlerStore getCollectionHandlerStore();
+
     boolean isConverterChoosable();
 
     void setConverterChoosable(boolean converterChoosable);
@@ -448,4 +455,11 @@ public interface Configuration {
      * @param <V> The type of the associated value.
      */
     <T, V> V getDefaultValueForClass(Class<T> targetClass);
+
+    /**
+     * Retrieved the Map containing the custom values for classes registered to the current mapping.
+     *
+     * @return Map containing custom values per type.
+     */
+    Map<Class<?>, Object> getCustomDefaultValuesMap();
 }

src/main/java/io/beanmapper/config/CoreConfiguration.java

@@ -430,9 +430,8 @@ public void setFlushAfterClear(Trinary flushAfterClear) {
      */
     @Override
     public <T, V> V getDefaultValueForClass(Class<T> targetClass) {
-        return this.customDefaultValueMap.containsKey(targetClass)
-                ? (V) this.customDefaultValueMap.get(targetClass)
-                : DefaultValues.defaultValueFor(targetClass);
+        Object defaultValue = customDefaultValueMap.get(targetClass);
+        return defaultValue != null ? (V) defaultValue : DefaultValues.defaultValueFor(targetClass);
     }
 
     /**
@@ -442,4 +441,20 @@ public <T, V> V getDefaultValueForClass(Class<T> targetClass) {
     public <T, V> void addCustomDefaultValueForClass(Class<T> targetClass, V value) {
         this.customDefaultValueMap.put(targetClass, value);
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public CollectionHandlerStore getCollectionHandlerStore() {
+        return this.collectionHandlerStore;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<Class<?>, Object> getCustomDefaultValuesMap() {
+        return customDefaultValueMap;
+    }
 }