Add serialization for PotionEffectType

1.16-testing/src/test/java/de/eldoria/jacksonbukkit/legacy/LegacyTest.java

@@ -5,7 +5,7 @@
  */
 package de.eldoria.jacksonbukkit.legacy;
 
-import de.eldoria.jacksonbukkit.serializer.PotionEffectSerializer;
+import de.eldoria.jacksonbukkit.serializer.PotionEffectTypeSerializer;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -14,7 +14,7 @@ public class LegacyTest {
 
     @Test
     public void testLegacyPotion() {
-        assertTrue(PotionEffectSerializer.LEGACY);
+        assertTrue(PotionEffectTypeSerializer.LEGACY);
     }
 
 }

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "de.eldoria.jacksonbukkit"
-version = "1.1.1"
+version = "1.1.2"
 
 val publicProjects = setOf("core", "bukkit", "paper", "jackson-bukkit")
 
@@ -201,7 +201,7 @@ tasks {
     register<Javadoc>("allJavadocs") {
         applyJavaDocOptions(options)
 
-        setDestinationDir(file("${buildDir}/docs/javadoc"))
+        destinationDir = file("${buildDir}/docs/javadoc")
         val projects = project.rootProject.allprojects.filter { p -> publicProjects.contains(p.name) }
         setSource(projects.map { p -> p.sourceSets.main.get().allJava })
         classpath = files(projects.map { p -> p.sourceSets.main.get().compileClasspath })

core/build.gradle.kts

@@ -4,5 +4,4 @@ dependencies {
     testImplementation(project(":testing"))
     testImplementation("org.spigotmc", "spigot-api", "1.19.2-R0.1-SNAPSHOT")
     testImplementation("com.github.seeseemelk", "MockBukkit-v1.19", "2.29.0")
-
 }

core/src/main/java/de/eldoria/jacksonbukkit/JacksonBukkitModule.java

@@ -18,6 +18,7 @@
 import de.eldoria.jacksonbukkit.deserializer.PatternDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.PlayerDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.PotionEffectDeserializer;
+import de.eldoria.jacksonbukkit.deserializer.PotionEffectTypeDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.RGBColorDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.VectorDeserializer;
 import de.eldoria.jacksonbukkit.serializer.AttributeModifierSerializer;
@@ -29,6 +30,7 @@
 import de.eldoria.jacksonbukkit.serializer.PatternSerializer;
 import de.eldoria.jacksonbukkit.serializer.PlayerSerializer;
 import de.eldoria.jacksonbukkit.serializer.PotionEffectSerializer;
+import de.eldoria.jacksonbukkit.serializer.PotionEffectTypeSerializer;
 import de.eldoria.jacksonbukkit.serializer.RGBColorSerializer;
 import de.eldoria.jacksonbukkit.serializer.VectorSerializer;
 import org.bukkit.Color;
@@ -39,6 +41,7 @@
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.block.banner.Pattern;
 import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.BlockVector;
 import org.bukkit.util.BoundingBox;
 import org.bukkit.util.Vector;
@@ -93,6 +96,7 @@ protected final void addSerializer(SimpleSerializers serializers) {
         serializers.addSerializer(BlockVector.class, new BlockVectorSerializer());
         serializers.addSerializer(NamespacedKey.class, new NamespacedKeySerializer());
         serializers.addSerializer(PotionEffect.class, new PotionEffectSerializer());
+        serializers.addSerializer(PotionEffectType.class, new PotionEffectTypeSerializer());
         serializers.addSerializer(FireworkEffect.class, new FireworkEffectSerializer());
         serializers.addSerializer(Pattern.class, new PatternSerializer());
         serializers.addSerializer(BoundingBox.class, new BoundingBoxSerializer());
@@ -122,6 +126,7 @@ protected final void addDeserializer(SimpleDeserializers deserializers) {
         deserializers.addDeserializer(BlockVector.class, new BlockVectorDeserializer());
         deserializers.addDeserializer(NamespacedKey.class, new NamespacedKeyDeserializer());
         deserializers.addDeserializer(PotionEffect.class, new PotionEffectDeserializer());
+        deserializers.addDeserializer(PotionEffectType.class, new PotionEffectTypeDeserializer());
         deserializers.addDeserializer(FireworkEffect.class, new FireworkEffectDeserializer());
         deserializers.addDeserializer(Pattern.class, new PatternDeserializer());
         deserializers.addDeserializer(BoundingBox.class, new BoundingBoxDeserializer());

core/src/main/java/de/eldoria/jacksonbukkit/deserializer/PotionEffectDeserializer.java

@@ -8,8 +8,6 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import de.eldoria.jacksonbukkit.entities.LegacyPotionEffectWrapper;
 import de.eldoria.jacksonbukkit.entities.PotionEffectWrapper;
 import org.bukkit.potion.PotionEffect;
 
@@ -21,15 +19,6 @@
 public class PotionEffectDeserializer extends JsonDeserializer<PotionEffect> {
     @Override
     public PotionEffect deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        JsonNode tree = ctxt.readTree(p);
-        JsonNode type = tree.get("type");
-        if (type.isInt()) {
-            return ctxt.readTreeAsValue(tree, LegacyPotionEffectWrapper.class).toBukkitPotionEffect();
-        }
-        if (type.isObject()) {
-            return ctxt.readTreeAsValue(tree, PotionEffectWrapper.class).toBukkitPotionEffect();
-        }
-
-        throw new IOException("Unknown type for field type" + type.getNodeType().name());
+        return ctxt.readValue(p, PotionEffectWrapper.class).toBukkitPotionEffect();
     }
 }

core/src/main/java/de/eldoria/jacksonbukkit/deserializer/PotionEffectTypeDeserializer.java

@@ -0,0 +1,34 @@
+/*
+ *     SPDX-License-Identifier: MIT
+ *
+ *     Copyright (C) EldoriaRPG Team and Contributor
+ */
+package de.eldoria.jacksonbukkit.deserializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.bukkit.NamespacedKey;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import java.io.IOException;
+
+/**
+ * Class for deserialization of {@link PotionEffect}.
+ */
+public class PotionEffectTypeDeserializer extends JsonDeserializer<PotionEffectType> {
+    @Override
+    public PotionEffectType deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        JsonNode tree = ctxt.readTree(p);
+        if (tree.isInt()) {
+            return PotionEffectType.getById(ctxt.readValue(p, Integer.class));
+        }
+        if (tree.isObject()) {
+            return PotionEffectType.getByKey(ctxt.readTreeAsValue(tree, NamespacedKey.class));
+        }
+
+        throw new IOException("Unknown type for field type" + tree.getNodeType().name());
+    }
+}