[JOHNZON-321] avoid conflict for primitive converters due to the new jsonb enum converter
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
index 751440d..37259d7 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
@@ -685,7 +685,7 @@
if (adapterEntry.getKey().getFrom() == type && !(
// ignore internal converters to let primitives be correctly handled
ConverterAdapter.class.isInstance(adapterEntry.getValue()) &&
- ConverterAdapter.class.cast(adapterEntry.getValue()).getConverter().getClass().getName().startsWith("org.apache.johnzon.mapper."))) {
+ isBuiltInJohnzonConverter(ConverterAdapter.class.cast(adapterEntry.getValue()).getConverter()))) {
if (converter != null) {
throw new IllegalArgumentException("Ambiguous adapter for " + decoratedType);
@@ -706,6 +706,14 @@
return converter;
}
+ private boolean isBuiltInJohnzonConverter(final Converter<?> converter) {
+ final Class<?> clazz = converter.getClass();
+ // don't reduce too much this package filter, we really want to filter the mapper module ones
+ return clazz.getName().startsWith("org.apache.johnzon.mapper.") ||
+ // jsonb adds a custom converter for enums so we must filter this one too
+ (MapperConfig.CustomEnumConverter.class.isAssignableFrom(clazz) && clazz.getName().startsWith("org.apache.johnzon."));
+ }
+
private static class MapBuilderReader implements AccessMode.Reader {
private final Map<String, Getter> getters;
private final Map<String, Object> template;
