chore: Delombok-inize

IntellectualSites · Oct 11, 2021 · 693e4fe · 693e4fe
1 parent 95d3a62
commit 693e4fe
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 34 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,8 +31,6 @@ dependencies {
     compileOnly(libs.worldedit)
     compileOnly(libs.dynmapCore) { isTransitive = false }
     compileOnly(libs.dynmapApi) { isTransitive = false }
-    compileOnly(libs.lombok)
-    annotationProcessor(libs.lombok)
     implementation(libs.bstatsBukkit)
     implementation(libs.bstatsBase)
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,9 +7,6 @@ plotsquared = "6.1.2"
 worldedit = "7.2.6"
 dynmap = "3.2-beta-1"
 
-# Annotations
-lombok = "1.18.20"
-
 # Third party
 bstats = "2.2.1"
 
@@ -27,9 +24,6 @@ worldedit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.
 dynmapCore = { group = "us.dynmap", name = "DynmapCore", version.ref = "dynmap" }
 dynmapApi = { group = "us.dynmap", name = "dynmap-api", version.ref = "dynmap" }
 
-# Annotations
-lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
-
 # Third party
 bstatsBase = { group = "org.bstats", name = "bstats-base", version.ref = "bstats" }
 bstatsBukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }

diff --git a/src/main/java/com/plotsquared/plot2dynmap/Plot2DynmapPlugin.java b/src/main/java/com/plotsquared/plot2dynmap/Plot2DynmapPlugin.java
@@ -51,20 +51,20 @@ public class Plot2DynmapPlugin extends JavaPlugin implements Listener, Runnable
 
     private String formatInfoWindow(final PlotWrapper plot) {
         String v = "<div class=\"plotinfo\">" + this.infoWindow + "</div>";
-        v = v.replace("%id%", plot.getPlotId().toCommaSeparatedString());
+        v = v.replace("%id%", plot.plotId().toCommaSeparatedString());
         v = v.replace(
                 "%alias%",
-                this.infoElement.replace("%values%", StringEscapeUtils.escapeHtml(plot.getAlias())).replace("%key%", "Alias")
+                this.infoElement.replace("%values%", StringEscapeUtils.escapeHtml(plot.alias())).replace("%key%", "Alias")
         );
-        v = v.replace("%owner%", this.infoElement.replace("%values%", plot.getOwner()).replace("%key%", "Owner"));
-        v = v.replace("%trusted%", this.infoElement.replace("%values%", plot.getTrusted()).replace("%key%", "Trusted"));
-        v = v.replace("%members%", this.infoElement.replace("%values%", plot.getHelpers()).replace("%key%", "Members"));
-        v = v.replace("%denied%", this.infoElement.replace("%values%", plot.getDenied()).replace("%key%", "Denied"));
+        v = v.replace("%owner%", this.infoElement.replace("%values%", plot.owner()).replace("%key%", "Owner"));
+        v = v.replace("%trusted%", this.infoElement.replace("%values%", plot.trusted()).replace("%key%", "Trusted"));
+        v = v.replace("%members%", this.infoElement.replace("%values%", plot.helpers()).replace("%key%", "Members"));
+        v = v.replace("%denied%", this.infoElement.replace("%values%", plot.denied()).replace("%key%", "Denied"));
         v = v.replace(
                 "%flags%",
-                this.infoElement.replace("%values%", StringEscapeUtils.escapeHtml(plot.getFlags())).replace("%key%", "Flags")
+                this.infoElement.replace("%values%", StringEscapeUtils.escapeHtml(plot.flags())).replace("%key%", "Flags")
         );
-        v = v.replace("%owner%", plot.getOwner());
+        v = v.replace("%owner%", plot.owner());
         return v;
     }
 
@@ -85,7 +85,7 @@ private void addStyle(final String plotId, final String worldId, final AreaMarke
         }
         if (areaStyle == null) { /* Check for owner style matches */
             if (!this.ownerStyle.isEmpty()) {
-                String owner = plot.getOwner();
+                String owner = plot.owner();
                 if (owner == null) {
                     owner = "unknown";
                 }
@@ -116,14 +116,14 @@ private void addStyle(final String plotId, final String worldId, final AreaMarke
     }
 
     private void handlePlot(final World world, final PlotWrapper plotWrapper, final Map<String, AreaMarker> newMap) {
-        final String name = plotWrapper.getPlotId().toCommaSeparatedString();
+        final String name = plotWrapper.plotId().toCommaSeparatedString();
 
         double[] x;
         double[] z;
 
         int i = 0;
 
-        final Plot plotObject = plotWrapper.getArea().getPlot(plotWrapper.getPlotId());
+        final Plot plotObject = plotWrapper.area().getPlot(plotWrapper.plotId());
 
         if (plotObject == null) {
             return;

diff --git a/src/main/java/com/plotsquared/plot2dynmap/PlotWrapper.java b/src/main/java/com/plotsquared/plot2dynmap/PlotWrapper.java
@@ -2,20 +2,73 @@
 
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotId;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-class PlotWrapper {
-
-    private final String owner;
-    private final String helpers;
-    private final String trusted;
-    private final String denied;
-    private final PlotId plotId;
-    private final String alias;
-    private final String flags;
-    private final PlotArea area;
+
+record PlotWrapper(String owner, String helpers, String trusted, String denied,
+                   PlotId plotId, String alias, String flags,
+                   PlotArea area) {
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public String getOwner() {
+        return this.owner;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public String getHelpers() {
+        return this.helpers;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public String getTrusted() {
+        return this.trusted;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public String getDenied() {
+        return this.denied;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public PlotId getPlotId() {
+        return this.plotId;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public String getAlias() {
+        return this.alias;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public String getFlags() {
+        return this.flags;
+    }
+
+    /**
+     * @deprecated Scheduled for removal in favor of record accessors.
+     */
+    @Deprecated(forRemoval = true)
+    public PlotArea getArea() {
+        return this.area;
+    }
 
 }