Fix a few of the checkstyle issues in the data package.

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

src/main/java/org/spongepowered/api/data/DataManager.java

@@ -60,8 +60,30 @@ public interface DataManager {
      */
     <T extends DataSerializable> void registerBuilder(Class<T> clazz, DataBuilder<T> builder);
 
+    /**
+     * Registers a {@link DataContentUpdater} for the desired
+     * {@link DataSerializable} such that any versioned data may be updated to
+     * newer versions for the most up to date {@link DataBuilder}.
+     *
+     * @param clazz The data serializable class
+     * @param updater The updater
+     * @param <T> The type of DataSerializable
+     */
     <T extends DataSerializable> void registerContentUpdater(Class<T> clazz, DataContentUpdater updater);
 
+    /**
+     * Gets a wrapped fake {@link DataContentUpdater} that may wrap several
+     * {@link DataContentUpdater}s to translate versioned data from the desired
+     * {@code fromVersion} to the {@code toVersion}. If the version jump is too
+     * great or a {@link DataContentUpdater} has not been registered to cover
+     * the complete jump, {@link Optional#empty()} may be returned.
+     *
+     * @param clazz The data serializable class
+     * @param fromVersion The version converting from
+     * @param toVersion The version converting to
+     * @param <T> The type of data serializable
+     * @return The content updater, if available
+     */
     <T extends DataSerializable> Optional<DataContentUpdater> getWrappedContentUpdater(Class<T> clazz, int fromVersion, int toVersion);
 
     /**
@@ -76,7 +98,7 @@ public interface DataManager {
      * @param <T> The type of data serializable
      * @return The builder, if available
      */
-    <T extends DataSerializable>  Optional<DataBuilder<T>> getBuilder(Class<T> clazz);
+    <T extends DataSerializable> Optional<DataBuilder<T>> getBuilder(Class<T> clazz);
 
     /**
      * Attempts to deserialize an instance of the {@link DataSerializable} from
@@ -104,20 +126,6 @@ public interface DataManager {
      */
     <T extends ImmutableDataHolder<T>, B extends ImmutableDataBuilder<T, B>> void register(Class<T> holderClass, B builder);
 
-    /**
-     * Attempts to retrieve the builder for the given
-     * {@link ImmutableDataHolder}.
-     *
-     * <p>If the {@link ImmutableDataHolder} was not registered, multiple
-     * systems could fail to retrieve specific data.</p>
-     *
-     * @param holderClass The immutable data holder class
-     * @param <T> The type of immutable data holder
-     * @param <B> The type of immutable data builder
-     * @return The builder, if available
-     */
-    <T extends ImmutableDataHolder<T>, B extends ImmutableDataBuilder<T, B>> Optional<B> getImmutableBuilder(Class<T> holderClass);
-
     /**
      * Registers the given {@link DataManipulator} class with it's associated
      * {@link DataManipulatorBuilder}. The builder can be used to create new
@@ -126,13 +134,28 @@ public interface DataManager {
      * to multiple {@link DataHolder}s.
      *
      * @param manipulatorClass The class of the data manipulator
-     * @param immutableManipulatorClass The class of the immutable datamanipulator
+     * @param immutableManipulatorClass The class of the immutable
+     *     datamanipulator
      * @param builder The builder instance of the data manipulator
      * @param <T> The type of data manipulator
      * @param <I> The type of immutable datamanipulator
      */
     <T extends DataManipulator<T, I>, I extends ImmutableDataManipulator<I, T>> void register(Class<? extends T> manipulatorClass,
-        Class<? extends I> immutableManipulatorClass, DataManipulatorBuilder<T, I> builder);
+            Class<? extends I> immutableManipulatorClass, DataManipulatorBuilder<T, I> builder);
+
+    /**
+     * Attempts to retrieve the builder for the given
+     * {@link ImmutableDataHolder}.
+     *
+     * <p>If the {@link ImmutableDataHolder} was not registered, multiple
+     * systems could fail to retrieve specific data.</p>
+     *
+     * @param holderClass The immutable data holder class
+     * @param <T> The type of immutable data holder
+     * @param <B> The type of immutable data builder
+     * @return The builder, if available
+     */
+    <T extends ImmutableDataHolder<T>, B extends ImmutableDataBuilder<T, B>> Optional<B> getImmutableBuilder(Class<T> holderClass);
 
     /**
      * Attempts to retrieve the builder for the given {@link DataManipulator}.
@@ -146,7 +169,7 @@ <T extends DataManipulator<T, I>, I extends ImmutableDataManipulator<I, T>> void
      * @return The builder, if available
      */
     <T extends DataManipulator<T, I>, I extends ImmutableDataManipulator<I, T>>
-    Optional<DataManipulatorBuilder<T, I>> getManipulatorBuilder(Class<T> manipulatorClass);
+        Optional<DataManipulatorBuilder<T, I>> getManipulatorBuilder(Class<T> manipulatorClass);
 
     /**
      * Attempts to retrieve the builder for the given
@@ -161,6 +184,6 @@ <T extends DataManipulator<T, I>, I extends ImmutableDataManipulator<I, T>> void
      * @return The DataManipulatorBuilder, if available
      */
     <T extends DataManipulator<T, I>, I extends ImmutableDataManipulator<I, T>>
-    Optional<DataManipulatorBuilder<T, I>> getImmutableManipulatorBuilder(Class<I> immutableManipulatorClass);
+        Optional<DataManipulatorBuilder<T, I>> getImmutableManipulatorBuilder(Class<I> immutableManipulatorClass);
 
 }

src/main/java/org/spongepowered/api/data/DataQuery.java

@@ -54,7 +54,7 @@ public final class DataQuery {
      * @param separator The separator
      * @param path The path
      */
-    public DataQuery(char separator, String path) {
+    private DataQuery(char separator, String path) {
         this(path.split(Pattern.quote(String.valueOf(separator))));
     }
 
@@ -63,7 +63,7 @@ public DataQuery(char separator, String path) {
      *
      * @param parts The parts
      */
-    public DataQuery(String... parts) {
+    private DataQuery(String... parts) {
         this.parts = ImmutableList.copyOf(parts);
     }
 
@@ -72,7 +72,7 @@ public DataQuery(String... parts) {
      *
      * @param parts The parts
      */
-    public DataQuery(List<String> parts) {
+    private DataQuery(List<String> parts) {
         this.parts = ImmutableList.copyOf(parts);
     }
 

src/main/java/org/spongepowered/api/data/MemoryDataView.java

@@ -39,8 +39,8 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.data.key.Key;
 import org.spongepowered.api.data.value.BaseValue;
-import org.spongepowered.api.util.persistence.DataBuilder;
 import org.spongepowered.api.util.Coerce;
+import org.spongepowered.api.util.persistence.DataBuilder;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/org/spongepowered/api/data/key/KeyFactory.java

@@ -62,7 +62,8 @@ private KeyFactory() {}
      * @param <V> The inferred return type
      * @return The generated key
      */
-    public static <E, T extends BaseValue, V extends BaseValue<E>> Key<V> makeSingleKey(final Class<E> elementClass, final Class<T> valueClass, final DataQuery query) {
+    public static <E, T extends BaseValue, V extends BaseValue<E>> Key<V> makeSingleKey(final Class<E> elementClass, final Class<T> valueClass,
+            final DataQuery query) {
         return new Key<V>() {
             @SuppressWarnings("rawtypes")
             @Override
@@ -82,7 +83,7 @@ public int hashCode() {
 
             @Override
             public String toString() {
-                return "Key{Value:" + valueClass.getName() + "<" + elementClass + ">, Query: " + query.toString() + "}";
+                return "Key{Value:" + valueClass.getSimpleName() + "<" + elementClass.getSimpleName() + ">, Query: " + query.toString() + "}";
             }
         };
     }
@@ -116,7 +117,7 @@ public int hashCode() {
 
             @Override
             public String toString() {
-                return "Key{Value:" + "ListValue<" + elementClass + ">, Query: " + query.toString() + "}";
+                return "Key{Value:" + "ListValue<" + elementClass.getSimpleName() + ">, Query: " + query.toString() + "}";
             }
         };
     }
@@ -150,7 +151,7 @@ public int hashCode() {
 
             @Override
             public String toString() {
-                return "Key{Value:" + "SetValue<" + elementClass + ">, Query: " + query.toString() + "}";
+                return "Key{Value:" + "SetValue<" + elementClass.getSimpleName() + ">, Query: " + query.toString() + "}";
             }
         };
     }
@@ -187,7 +188,8 @@ public int hashCode() {
 
             @Override
             public String toString() {
-                return "Key{Value:" + "MapValue<" + keyClass + "," + valueclass + ">, Query: " + query.toString() + "}";
+                return "Key{Value:" + "MapValue<" + keyClass.getSimpleName() + "," + valueclass.getSimpleName() + ">, Query: " + query.toString()
+                       + "}";
             }
         };
     }

src/main/java/org/spongepowered/api/data/key/Keys.java

@@ -118,7 +118,6 @@
 import org.spongepowered.api.data.type.WallType;
 import org.spongepowered.api.data.type.WireAttachmentType;
 import org.spongepowered.api.data.value.immutable.ImmutableBoundedValue;
-import org.spongepowered.api.data.value.immutable.ImmutableListValue;
 import org.spongepowered.api.data.value.mutable.ListValue;
 import org.spongepowered.api.data.value.mutable.MapValue;
 import org.spongepowered.api.data.value.mutable.MutableBoundedValue;
@@ -129,7 +128,6 @@
 import org.spongepowered.api.data.value.mutable.WeightedCollectionValue;
 import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.effect.potion.PotionEffectType;
-import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntitySnapshot;
 import org.spongepowered.api.entity.EntityType;
 import org.spongepowered.api.entity.living.Living;
@@ -153,7 +151,6 @@
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 
-import java.lang.ref.WeakReference;
 import java.time.Instant;
 import java.util.UUID;
 
@@ -488,47 +485,47 @@ public final class Keys {
 
     /**
      * Represents the {@link Key} for representing the "enchantments hidden"
-     * state of a {@link ItemStack}
+     * state of a {@link ItemStack}.
      *
      * @see HideData#hideEnchantments()
      */
     public static final Key<Value<Boolean>> HIDE_ENCHANTMENTS = null;
 
     /**
      * Represents the {@link Key} for representing the "attributes hidden"
-     * state of a {@link ItemStack}
+     * state of a {@link ItemStack}.
      *
      * @see HideData#hideAttributes()
      */
     public static final Key<Value<Boolean>> HIDE_ATTRIBUTES = null;
 
     /**
      * Represents the {@link Key} for representing the "unbreakable hidden"
-     * state of a {@link ItemStack}
+     * state of a {@link ItemStack}.
      *
      * @see HideData#hideUnbreakable()
      */
     public static final Key<Value<Boolean>> HIDE_UNBREAKABLE = null;
 
     /**
      * Represents the {@link Key} for representing the "can destroy hidden"
-     * state of a {@link ItemStack}
+     * state of a {@link ItemStack}.
      *
      * @see HideData#hideCanDestroy()
      */
     public static final Key<Value<Boolean>> HIDE_CAN_DESTROY = null;
 
     /**
      * Represents the {@link Key} for representing the "can place hidden"
-     * state of a {@link ItemStack}
+     * state of a {@link ItemStack}.
      *
      * @see HideData#hideCanPlace()
      */
     public static final Key<Value<Boolean>> HIDE_CAN_PLACE = null;
 
     /**
      * Represents the {@link Key} for representing the "miscellaneous hidden"
-     * state of a {@link ItemStack}
+     * state of a {@link ItemStack}.
      *
      * @see HideData#hideMiscellaneous()
      */

src/main/java/org/spongepowered/api/data/manipulator/DataManipulatorBuilder.java

@@ -25,8 +25,8 @@
 package org.spongepowered.api.data.manipulator;
 
 import org.spongepowered.api.data.DataHolder;
-import org.spongepowered.api.util.persistence.DataBuilder;
 import org.spongepowered.api.data.DataManager;
+import org.spongepowered.api.util.persistence.DataBuilder;
 
 import java.util.Optional;
 

src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogEntityData.java

@@ -99,6 +99,7 @@
 import org.spongepowered.api.data.type.OcelotType;
 import org.spongepowered.api.data.type.RabbitType;
 import org.spongepowered.api.data.type.SkeletonType;
+import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.entity.EnderCrystal;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.ExperienceOrb;
@@ -144,7 +145,6 @@
 import org.spongepowered.api.item.FireworkEffect;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.merchant.TradeOffer;
-import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.statistic.Statistic;
 import org.spongepowered.api.statistic.achievement.Achievement;
 import org.spongepowered.api.world.weather.Weather;

src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogItemData.java

@@ -55,13 +55,13 @@
 import org.spongepowered.api.data.type.DyeColor;
 import org.spongepowered.api.data.type.Fish;
 import org.spongepowered.api.data.type.GoldenApple;
+import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.entity.EntityType;
 import org.spongepowered.api.item.Enchantment;
 import org.spongepowered.api.item.FireworkEffect;
 import org.spongepowered.api.item.ItemTypes;
 import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.item.inventory.ItemStack;
-import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.util.Color;
 

src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogTileEntityData.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.data.manipulator.catalog;
 
-import org.spongepowered.api.profile.GameProfile;
 import org.spongepowered.api.block.tileentity.Banner;
 import org.spongepowered.api.block.tileentity.CommandBlock;
 import org.spongepowered.api.block.tileentity.Comparator;
@@ -57,6 +56,7 @@
 import org.spongepowered.api.data.manipulator.mutable.tileentity.SignData;
 import org.spongepowered.api.data.meta.PatternLayer;
 import org.spongepowered.api.item.inventory.ItemStack;
+import org.spongepowered.api.profile.GameProfile;
 
 /**
  * An enumeration of known vanilla {@link DataManipulator}s associated with

src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableMobSpawnerData.java

@@ -102,7 +102,8 @@ public interface ImmutableMobSpawnerData extends ImmutableDataManipulator<Immuta
      * {@link Player} is NOT within the provided range, no attempts to spawn an
      * {@link Entity} is made.
      *
-     * @return The immutable value of the required player range to spawn entities
+     * @return The immutable value of the required player range to spawn
+     *     entities
      */
     ImmutableBoundedValue<Short> requiredPlayerRange();
 
@@ -126,21 +127,21 @@ public interface ImmutableMobSpawnerData extends ImmutableDataManipulator<Immuta
     ImmutableNextEntityToSpawnValue nextEntityToSpawn();
 
     /**
-     * Gets the {@link ImmutableWeightedEntityCollectionValue} of all possible
+     * Gets the {@link ImmutableWeightedCollectionValue} of all possible
      * {@link Entity} instances that can be spawned by the spawner. As they
-     * are all {@link WeightedSerializableObject} instances, their weight is defined as
-     * a {@link Random} to determine the next {@link Entity} that will be
-     * spawned, unless overriden by {@link #nextEntityToSpawn()}.
+     * are all {@link WeightedSerializableObject} instances, their weight is
+     * defined as a {@link Random} to determine the next {@link Entity} that
+     * will be spawned, unless overriden by {@link #nextEntityToSpawn()}.
      *
      * @return The immutable weighted entity collection value of entities
      */
     ImmutableWeightedCollectionValue<EntitySnapshot> possibleEntitiesToSpawn();
 
     /**
      * Represents a custom {@link Value} dealing with the next
-     * {@link WeightedSerializableObject} such that the next {@link Entity} to spawn may
-     * be pulled from the owning {@link #possibleEntitiesToSpawn()} with a
-     * default {@link Random}, or it may be custom defined on a case by
+     * {@link WeightedSerializableObject} such that the next {@link Entity} to
+     * spawn may be pulled from the owning {@link #possibleEntitiesToSpawn()}
+     * with a default {@link Random}, or it may be custom defined on a case by
      * case basis.
      */
     interface ImmutableNextEntityToSpawnValue extends ImmutableValue<WeightedSerializableObject<EntitySnapshot>> {
@@ -161,7 +162,8 @@ interface ImmutableNextEntityToSpawnValue extends ImmutableValue<WeightedSeriali
         ImmutableNextEntityToSpawnValue with(WeightedSerializableObject<EntitySnapshot> value);
 
         @Override
-        ImmutableNextEntityToSpawnValue transform(Function<WeightedSerializableObject<EntitySnapshot>, WeightedSerializableObject<EntitySnapshot>> function);
+        ImmutableNextEntityToSpawnValue transform(Function<WeightedSerializableObject<EntitySnapshot>,
+                WeightedSerializableObject<EntitySnapshot>> function);
 
         @Override
         MobSpawnerData.NextEntityToSpawnValue asMutable();