[eclipse-ee4j#617]User defined deserializer always should be used bef…

…ore standard ones

src/main/java/org/eclipse/yasson/internal/deserializer/DeserializationModelCreator.java

@@ -152,6 +152,17 @@ private ModelDeserializer<JsonParser> deserializerChainInternal(LinkedList<Type>
             models.put(cachedItem, deserializer);
             return deserializer;
         }
+
+        ClassCustomization classCustomization = classModel.getClassCustomization();
+        Optional<DeserializerBinding<?>> deserializerBinding = userDeserializer(type,
+                (ComponentBoundCustomization) propertyCustomization);
+        if (deserializerBinding.isPresent()) {
+            UserDefinedDeserializer user = new UserDefinedDeserializer(deserializerBinding.get().getJsonbDeserializer(),
+                    JustReturn.instance(), type, classCustomization);
+            models.put(cachedItem, user);
+            return user;
+        }
+
         Optional<AdapterBinding> adapterBinding = adapterBinding(type, (ComponentBoundCustomization) propertyCustomization);
         if (adapterBinding.isPresent()) {
             AdapterBinding adapter = adapterBinding.get();
@@ -201,14 +212,6 @@ private ModelDeserializer<JsonParser> createObjectDeserializer(LinkedList<Type>
                                                                    Class<?> rawType,
                                                                    CachedItem cachedItem) {
         ClassCustomization classCustomization = classModel.getClassCustomization();
-        Optional<DeserializerBinding<?>> deserializerBinding = userDeserializer(type,
-                                                                                (ComponentBoundCustomization) propertyCustomization);
-        if (deserializerBinding.isPresent()) {
-            UserDefinedDeserializer user = new UserDefinedDeserializer(deserializerBinding.get().getJsonbDeserializer(),
-                                                                       JustReturn.instance(), type, classCustomization);
-            models.put(cachedItem, user);
-            return user;
-        }
         JsonbCreator creator = classCustomization.getCreator();
         boolean hasCreator = creator != null;
         List<String> params = hasCreator ? creatorParamsList(creator) : Collections.emptyList();

src/test/java/org/eclipse/yasson/serializers/SerializersTest.java

@@ -51,6 +51,7 @@
 import org.eclipse.yasson.serializers.model.Author;
 import org.eclipse.yasson.serializers.model.Box;
 import org.eclipse.yasson.serializers.model.BoxWithAnnotations;
+import org.eclipse.yasson.serializers.model.Colors;
 import org.eclipse.yasson.serializers.model.Containee;
 import org.eclipse.yasson.serializers.model.Container;
 import org.eclipse.yasson.serializers.model.Crate;
@@ -812,4 +813,15 @@ public void testCustomSerializersInContainer(){
 
     }
 
+    @Test
+    void testCustomSerializersAndDeserializersInEnum(){
+        Jsonb jsonb = JsonbBuilder.create();
+
+        Colors expected = Colors.GREEN;
+
+        String expectedJson = jsonb.toJson(expected);
+
+        assertEquals(expected, jsonb.fromJson(expectedJson, Colors.class));
+    }
+
 }

src/test/java/org/eclipse/yasson/serializers/model/Colors.java

@@ -0,0 +1,15 @@
+package org.eclipse.yasson.serializers.model;
+
+import jakarta.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.annotation.JsonbTypeDeserializer;
+import jakarta.json.bind.annotation.JsonbTypeSerializer;
+
+@JsonbTypeSerializer(ColorsSerializer.class)
+@JsonbTypeDeserializer(ColorsDeserializer.class)
+public enum Colors {
+	@JsonbProperty("Red")
+	RED,
+	@JsonbProperty("Green")
+	GREEN
+}
+

src/test/java/org/eclipse/yasson/serializers/model/ColorsDeserializer.java

@@ -0,0 +1,8 @@
+package org.eclipse.yasson.serializers.model;
+
+public class ColorsDeserializer extends EnumWithJsonbPropertyDeserializer<Colors> {
+
+	public ColorsDeserializer() {
+		super();
+	}
+}

src/test/java/org/eclipse/yasson/serializers/model/ColorsSerializer.java

@@ -0,0 +1,7 @@
+package org.eclipse.yasson.serializers.model;
+
+public class ColorsSerializer extends EnumWithJsonbPropertySerializer<Colors> {
+	public ColorsSerializer() {
+		super();
+	}
+}

src/test/java/org/eclipse/yasson/serializers/model/EnumWithJsonbPropertyDeserializer.java

@@ -0,0 +1,57 @@
+package org.eclipse.yasson.serializers.model;
+
+import static java.util.Optional.ofNullable;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import jakarta.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.stream.JsonParser;
+
+public class EnumWithJsonbPropertyDeserializer<E extends Enum<E>> implements JsonbDeserializer<E> {
+
+	private final Map<String, E> jsonToJavaMapping;
+
+	public EnumWithJsonbPropertyDeserializer() {
+		super();
+
+		Class<E> enumType = getEnumType();
+		jsonToJavaMapping = new HashMap<>();
+
+		Stream.of(enumType.getEnumConstants()).forEach(constant -> {
+			final String asString;
+			try {
+				asString = ofNullable(
+						constant.getClass()
+								.getDeclaredField(constant.name())
+								.getAnnotation(JsonbProperty.class))
+						.map(JsonbProperty::value)
+						.orElseGet(constant::name);
+			} catch (final NoSuchFieldException e) {
+				throw new IllegalArgumentException(e);
+			}
+			jsonToJavaMapping.put(asString, constant);
+		});
+	}
+
+	private Class<E> getEnumType() {
+		return Class.class.cast(ParameterizedType.class.cast(
+						getClass().getGenericSuperclass())
+				.getActualTypeArguments()[0]);
+	}
+
+	@Override
+	public E deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+		String key = parser.getString();
+
+		assert key != null;
+
+		return ofNullable(jsonToJavaMapping.get(key))
+				.orElseThrow(() -> new IllegalArgumentException("Unknown enum value: '" + key + "'"));
+	}
+}

src/test/java/org/eclipse/yasson/serializers/model/EnumWithJsonbPropertySerializer.java

@@ -0,0 +1,48 @@
+package org.eclipse.yasson.serializers.model;
+
+import static java.util.Optional.ofNullable;
+
+import java.lang.reflect.ParameterizedType;
+import java.util.EnumMap;
+import java.util.stream.Stream;
+
+import jakarta.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.serializer.JsonbSerializer;
+import jakarta.json.bind.serializer.SerializationContext;
+import jakarta.json.stream.JsonGenerator;
+
+public class EnumWithJsonbPropertySerializer<E extends Enum<E>> implements JsonbSerializer<E> {
+	private final EnumMap<E, String> javaToJsonMapping;
+
+	public EnumWithJsonbPropertySerializer() {
+		super();
+
+		Class<E> enumType = getEnumType();
+		javaToJsonMapping = new EnumMap<>(enumType);
+
+		Stream.of(enumType.getEnumConstants()).forEach(constant -> {
+			final String asString;
+			try {
+				asString = ofNullable(
+						constant.getClass()
+								.getDeclaredField(constant.name())
+								.getAnnotation(JsonbProperty.class))
+						.map(JsonbProperty::value)
+						.orElseGet(constant::name);
+			} catch (final NoSuchFieldException e) {
+				throw new IllegalArgumentException(e);
+			}
+			javaToJsonMapping.put(constant, asString);
+		});
+	}
+
+	private Class<E> getEnumType() {
+		return Class.class.cast(ParameterizedType.class.cast(
+						getClass().getGenericSuperclass())
+				.getActualTypeArguments()[0]);
+	}
+
+	@Override public void serialize(E obj, JsonGenerator generator, SerializationContext ctx) {
+		generator.write(javaToJsonMapping.get(obj));
+	}
+}