From c8c9247dfec9d0de88c066aef37f4f429cfb1650 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 17 Feb 2021 22:14:03 -0700 Subject: [PATCH] cleanup --- .../parser/exceptions/ParseException.java | 1 + .../tokenizer/exceptions/EOFException.java | 2 + .../tokenizer/exceptions/FormatException.java | 2 + .../exceptions/TokenizerException.java | 2 + .../transform/AttemptsFailedException.java | 1 + .../api/transform/TransformException.java | 2 + .../terra/api/transform/Transformer.java | 2 +- .../com/dfsek/terra/api/util/FastRandom.java | 1 + .../com/dfsek/terra/api/util/GlueList.java | 263 +++++++++--------- .../terra/api/util/mutable/MutableDouble.java | 2 + .../api/util/mutable/MutableInteger.java | 2 + .../terra/api/util/mutable/MutableNumber.java | 2 + .../config/loaders/LinkedHashMapLoader.java | 1 + .../noise/CellularNoiseTemplate.java | 1 + .../command/biome/BiomeLocateCommand.java | 1 + .../bukkit/population/SerializationUtil.java | 2 +- .../structure/WorldEditNotFoundException.java | 2 + .../terra/bukkit/world/BukkitBiomeGrid.java | 1 + 18 files changed, 158 insertions(+), 132 deletions(-) diff --git a/common/src/main/java/com/dfsek/terra/api/structures/parser/exceptions/ParseException.java b/common/src/main/java/com/dfsek/terra/api/structures/parser/exceptions/ParseException.java index df833972f..03bd8d5e4 100644 --- a/common/src/main/java/com/dfsek/terra/api/structures/parser/exceptions/ParseException.java +++ b/common/src/main/java/com/dfsek/terra/api/structures/parser/exceptions/ParseException.java @@ -3,6 +3,7 @@ package com.dfsek.terra.api.structures.parser.exceptions; import com.dfsek.terra.api.structures.tokenizer.Position; public class ParseException extends Exception { + private static final long serialVersionUID = 6744390543046766386L; private final Position position; public ParseException(String message, Position position) { diff --git a/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/EOFException.java b/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/EOFException.java index 8602e6c2f..1d615f601 100644 --- a/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/EOFException.java +++ b/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/EOFException.java @@ -4,6 +4,8 @@ import com.dfsek.terra.api.structures.tokenizer.Position; public class EOFException extends TokenizerException { + private static final long serialVersionUID = 3980047409902809440L; + public EOFException(String message, Position position) { super(message, position); } diff --git a/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/FormatException.java b/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/FormatException.java index 039c8fe60..3ca38e126 100644 --- a/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/FormatException.java +++ b/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/FormatException.java @@ -4,6 +4,8 @@ import com.dfsek.terra.api.structures.tokenizer.Position; public class FormatException extends TokenizerException { + private static final long serialVersionUID = -791308012940744455L; + public FormatException(String message, Position position) { super(message, position); } diff --git a/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/TokenizerException.java b/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/TokenizerException.java index 994a65361..15990bdfa 100644 --- a/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/TokenizerException.java +++ b/common/src/main/java/com/dfsek/terra/api/structures/tokenizer/exceptions/TokenizerException.java @@ -5,6 +5,8 @@ import com.dfsek.terra.api.structures.tokenizer.Position; public abstract class TokenizerException extends ParseException { + private static final long serialVersionUID = 2792384010083575420L; + public TokenizerException(String message, Position position) { super(message, position); } diff --git a/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java b/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java index dc97b7e31..904758a6c 100644 --- a/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java +++ b/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java @@ -5,6 +5,7 @@ import com.dfsek.terra.api.util.GlueList; import java.util.List; public class AttemptsFailedException extends RuntimeException { + private static final long serialVersionUID = -1160459550006067137L; private final List causes; public AttemptsFailedException(String message, List causes) { diff --git a/common/src/main/java/com/dfsek/terra/api/transform/TransformException.java b/common/src/main/java/com/dfsek/terra/api/transform/TransformException.java index 9643d9673..048c7d4da 100644 --- a/common/src/main/java/com/dfsek/terra/api/transform/TransformException.java +++ b/common/src/main/java/com/dfsek/terra/api/transform/TransformException.java @@ -1,6 +1,8 @@ package com.dfsek.terra.api.transform; public class TransformException extends Exception { + private static final long serialVersionUID = -6661338369581162084L; + public TransformException() { super(); } diff --git a/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java b/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java index 58feecf8b..30ce77b6f 100644 --- a/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java +++ b/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java @@ -58,7 +58,7 @@ public class Transformer { return this; } - public final Transformer build() { + public Transformer build() { return new Transformer<>(transforms); } } diff --git a/common/src/main/java/com/dfsek/terra/api/util/FastRandom.java b/common/src/main/java/com/dfsek/terra/api/util/FastRandom.java index 66d9023e7..fc530944a 100644 --- a/common/src/main/java/com/dfsek/terra/api/util/FastRandom.java +++ b/common/src/main/java/com/dfsek/terra/api/util/FastRandom.java @@ -8,6 +8,7 @@ import java.util.SplittableRandom; public class FastRandom extends Random { + private static final long serialVersionUID = 4571946470190183260L; private XoRoShiRo128PlusPlus random; public FastRandom() { diff --git a/common/src/main/java/com/dfsek/terra/api/util/GlueList.java b/common/src/main/java/com/dfsek/terra/api/util/GlueList.java index e75d47777..144738f56 100644 --- a/common/src/main/java/com/dfsek/terra/api/util/GlueList.java +++ b/common/src/main/java/com/dfsek/terra/api/util/GlueList.java @@ -15,6 +15,8 @@ */ package com.dfsek.terra.api.util; +import org.jetbrains.annotations.NotNull; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -76,14 +78,16 @@ import static net.jafama.FastMath.*; * @see ArrayList * @param the type of elements held in this collection */ +@SuppressWarnings({"ManualMinMaxCalculation", "ConstantConditions", "ManualArrayToCollectionCopy"}) public class GlueList extends AbstractList implements List, Cloneable, Serializable { - transient Node first; - transient Node last; + private static final long serialVersionUID = -4339173882660322249L; + private transient Node first; + private transient Node last; - int size; + private int size; - int initialCapacity; + private int initialCapacity; private static final int DEFAULT_CAPACITY = 10; @@ -236,7 +240,7 @@ public class GlueList extends AbstractList implements List, Cloneable, @SuppressWarnings("unchecked") @Override - public boolean addAll(Collection c) { + public boolean addAll(@NotNull Collection c) { Objects.requireNonNull(c); @@ -244,7 +248,7 @@ public class GlueList extends AbstractList implements List, Cloneable, int len = collection.length; - if (len == 0) { + if(len == 0) { return false; } @@ -426,7 +430,6 @@ public class GlueList extends AbstractList implements List, Cloneable, return indexOf(o) != -1; } - @SuppressWarnings("unchecked") @Override public T remove(int index) { @@ -499,12 +502,12 @@ public class GlueList extends AbstractList implements List, Cloneable, } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(@NotNull Collection c) { Objects.requireNonNull(c); Object[] arr = c.toArray(); - if (arr.length == 0) { + if(arr.length == 0) { return false; } @@ -518,12 +521,12 @@ public class GlueList extends AbstractList implements List, Cloneable, } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(@NotNull Collection c) { Objects.requireNonNull(c); Object[] arr = c.toArray(); - if (arr.length == 0) { + if(arr.length == 0) { return false; } @@ -663,7 +666,7 @@ public class GlueList extends AbstractList implements List, Cloneable, } @Override - public List subList(int fromIndex, int toIndex) { + public @NotNull List subList(int fromIndex, int toIndex) { return super.subList(fromIndex, toIndex); } @@ -689,8 +692,8 @@ public class GlueList extends AbstractList implements List, Cloneable, @SuppressWarnings("unchecked") @Override - public T[] toArray(T[] a) { - return (T[]) Arrays.copyOf(toArray(), size, a.getClass()); + public E[] toArray(E[] a) { + return (E[]) Arrays.copyOf(toArray(), size, a.getClass()); } public boolean isEmpty() { @@ -698,7 +701,7 @@ public class GlueList extends AbstractList implements List, Cloneable, } @Override - public Iterator iterator() { + public @NotNull Iterator iterator() { return new Itr(); } @@ -736,7 +739,7 @@ public class GlueList extends AbstractList implements List, Cloneable, } @Override - public ListIterator listIterator(int index) { + public @NotNull ListIterator listIterator(int index) { checkPositionIndex(index); @@ -751,89 +754,65 @@ public class GlueList extends AbstractList implements List, Cloneable, } @Override - public ListIterator listIterator() { + public @NotNull ListIterator listIterator() { return new ListItr(0); } - private class Itr implements Iterator { + protected static class Node { - Node node = first; + protected Node pre; + protected Node next; - int i = 0;//inner-array index - int j = 0;//total index -> cursor + protected int listSize; - int lastReturn = -1; + protected int startingIndex; + protected int endingIndex; - int expectedModCount = modCount; - int elementDataPointer = node.elementDataPointer; + protected T[] elementData; + protected int elementDataPointer; - @Override - public boolean hasNext() { - return j != size; + @SuppressWarnings("unchecked") + Node(Node pre, Node next, int listSize) { + this.pre = pre; + this.next = next; + this.listSize = listSize; + this.elementData = (T[]) new Object[listSize >>> 1]; + this.startingIndex = listSize; + this.endingIndex = listSize + elementData.length - 1; } - @Override - public T next() { - - checkForComodification(); - - if (j >= size) { - throw new NoSuchElementException(); - } - - if (j >= last.endingIndex + 1) { - throw new ConcurrentModificationException(); - } - - if (j == 0) {// it's for listIterator.when node becomes null. - node = first; - elementDataPointer = node.elementDataPointer; - i = 0; - } - - T val = node.elementData[i++]; - - if (i >= elementDataPointer) { - node = node.next; - i = 0; - elementDataPointer = (node != null) ? node.elementDataPointer : 0; - } - - lastReturn = j++; - - return val; + Node(Node pre, Node next, int listSize, int initialCapacity) { + this.pre = pre; + this.next = next; + this.listSize = listSize; + this.elementData = createElementData(initialCapacity); + this.startingIndex = listSize; + this.endingIndex = listSize + elementData.length - 1; } - @Override - public void remove() { + @SuppressWarnings("unchecked") + T[] createElementData(int capacity) { - if (lastReturn < 0) { - throw new IllegalStateException(); - } - - checkForComodification(); - - try { - com.dfsek.terra.api.util.GlueList.this.remove(lastReturn); - - j = lastReturn; - - lastReturn = -1; - - i = (--i < 0) ? 0 : i; - - elementDataPointer = (node != null) ? node.elementDataPointer : 0; - - expectedModCount = modCount; - } catch (IndexOutOfBoundsException e) { - throw new ConcurrentModificationException(); + if(capacity == 0 || capacity == 1) { + return (T[]) new Object[DEFAULT_CAPACITY]; + } else if(capacity > 1) { + return (T[]) new Object[capacity]; + } else { + throw new IllegalArgumentException("Illegal Capacity: " + capacity); } } - void checkForComodification() { - if (modCount != expectedModCount) { - throw new ConcurrentModificationException(); - } + boolean isAddable() { + return elementDataPointer < elementData.length; + } + + void add(T element) { + elementData[elementDataPointer++] = element; + } + + @Override + public String toString() { + return String.format("[sIndex: %d - eIndex: %d | elementDataPointer: %d | elementDataLength: %d]", startingIndex, endingIndex, elementDataPointer, elementData.length); } } @@ -988,61 +967,85 @@ public class GlueList extends AbstractList implements List, Cloneable, } } - static class Node { + private class Itr implements Iterator { - Node pre; - Node next; + protected Node node = first; - int listSize; + protected int i = 0;//inner-array index + protected int j = 0;//total index -> cursor - int startingIndex; - int endingIndex; + protected int lastReturn = -1; - T[] elementData; - int elementDataPointer; + protected int expectedModCount = modCount; + protected int elementDataPointer = node.elementDataPointer; - @SuppressWarnings("unchecked") - Node(Node pre, Node next, int listSize) { - this.pre = pre; - this.next = next; - this.listSize = listSize; - this.elementData = (T[]) new Object[listSize >>> 1]; - this.startingIndex = listSize; - this.endingIndex = listSize + elementData.length - 1; - } - - Node(Node pre, Node next, int listSize, int initialCapacity) { - this.pre = pre; - this.next = next; - this.listSize = listSize; - this.elementData = createElementData(initialCapacity); - this.startingIndex = listSize; - this.endingIndex = listSize + elementData.length - 1; - } - - @SuppressWarnings("unchecked") - T[] createElementData(int capacity) { - - if (capacity == 0 || capacity == 1) { - return (T[]) new Object[DEFAULT_CAPACITY]; - } else if (capacity > 1) { - return (T[]) new Object[capacity]; - } else { - throw new IllegalArgumentException("Illegal Capacity: " + capacity); - } - } - - boolean isAddable() { - return elementDataPointer < elementData.length; - } - - void add(T element) { - elementData[elementDataPointer++] = element; + @Override + public boolean hasNext() { + return j != size; } @Override - public String toString() { - return String.format("[sIndex: %d - eIndex: %d | elementDataPointer: %d | elementDataLength: %d]", startingIndex, endingIndex, elementDataPointer, elementData.length); + public T next() { + + checkForComodification(); + + if(j >= size) { + throw new NoSuchElementException(); + } + + if(j >= last.endingIndex + 1) { + throw new ConcurrentModificationException(); + } + + if(j == 0) {// it's for listIterator.when node becomes null. + node = first; + elementDataPointer = node.elementDataPointer; + i = 0; + } + + T val = node.elementData[i++]; + + if(i >= elementDataPointer) { + node = node.next; + i = 0; + elementDataPointer = (node != null) ? node.elementDataPointer : 0; + } + + lastReturn = j++; + + return val; + } + + @Override + public void remove() { + + if(lastReturn < 0) { + throw new IllegalStateException(); + } + + checkForComodification(); + + try { + com.dfsek.terra.api.util.GlueList.this.remove(lastReturn); + + j = lastReturn; + + lastReturn = -1; + + i = (--i < 0) ? 0 : i; + + elementDataPointer = (node != null) ? node.elementDataPointer : 0; + + expectedModCount = modCount; + } catch(IndexOutOfBoundsException e) { + throw new ConcurrentModificationException(); + } + } + + void checkForComodification() { + if(modCount != expectedModCount) { + throw new ConcurrentModificationException(); + } } } } \ No newline at end of file diff --git a/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java b/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java index fec0a7b48..483fa3d3e 100644 --- a/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java +++ b/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java @@ -1,6 +1,8 @@ package com.dfsek.terra.api.util.mutable; public class MutableDouble extends MutableNumber { + private static final long serialVersionUID = -2218110876763640053L; + public MutableDouble(Double value) { super(value); } diff --git a/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java b/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java index 946cced77..0774680d5 100644 --- a/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java +++ b/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java @@ -1,6 +1,8 @@ package com.dfsek.terra.api.util.mutable; public class MutableInteger extends MutableNumber { + private static final long serialVersionUID = -4427935901819632745L; + public MutableInteger(Integer value) { super(value); } diff --git a/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java b/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java index 7bf03b836..8b682eea0 100644 --- a/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java +++ b/common/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java @@ -1,6 +1,8 @@ package com.dfsek.terra.api.util.mutable; public abstract class MutableNumber extends Number implements MutablePrimitive { + + private static final long serialVersionUID = 8619508342781664393L; protected T value; public MutableNumber(T value) { diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java index 25eee5845..5de7cbe9b 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java @@ -9,6 +9,7 @@ import java.lang.reflect.Type; import java.util.LinkedHashMap; import java.util.Map; +@SuppressWarnings("unchecked") public class LinkedHashMapLoader implements TypeLoader> { @Override public LinkedHashMap load(Type t, Object c, ConfigLoader loader) throws LoadException { diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java index 556d9fb82..3852742b9 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java @@ -7,6 +7,7 @@ import com.dfsek.terra.api.math.noise.samplers.noise.CellularSampler; import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +@SuppressWarnings("FieldMayBeFinal") public class CellularNoiseTemplate extends NoiseTemplate { @Value("distance") @Default diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeLocateCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeLocateCommand.java index 943fc2f8e..17d1abf59 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeLocateCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeLocateCommand.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +@SuppressWarnings("deprecation") public class BiomeLocateCommand extends WorldCommand { public BiomeLocateCommand(com.dfsek.terra.bukkit.command.Command parent) { super(parent); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java index e280e7ae7..0a0267b6a 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java @@ -11,7 +11,7 @@ import java.io.ObjectStreamClass; import java.io.Serializable; import java.lang.reflect.Field; -public class SerializationUtil { +public final class SerializationUtil { public static Object fromFile(File f) throws IOException, ClassNotFoundException { ObjectInputStream ois = new MovedObjectInputStream(new FileInputStream(f), "com.dfsek.terra.api.world.generation.population", "com.dfsek.terra.bukkit.population"); // Backwards compat with old Gaea location Object o = ois.readObject(); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/WorldEditNotFoundException.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/WorldEditNotFoundException.java index 5b7ec6e0d..619cbe75f 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/WorldEditNotFoundException.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/WorldEditNotFoundException.java @@ -1,6 +1,8 @@ package com.dfsek.terra.bukkit.structure; public class WorldEditNotFoundException extends RuntimeException { + private static final long serialVersionUID = 3678822468346338227L; + public WorldEditNotFoundException() { } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java index da1fdfc51..9f3b91a23 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java @@ -5,6 +5,7 @@ import com.dfsek.terra.api.platform.world.BiomeGrid; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; +@SuppressWarnings("deprecation") public class BukkitBiomeGrid implements BiomeGrid { private final ChunkGenerator.BiomeGrid delegate;