Start the process to move MemoryDataView implementation to the implementation. Add DataContainer#createNew(). Fix compiler warnings.

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

Author: gabizou

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

@@ -32,6 +32,7 @@
 
 public class DataAlreadyRegisteredException extends DataException {
 
+    private static final long serialVersionUID = 6644721737729647869L;
     @Nullable private final Class<? extends DataManipulator<?, ?>> manipulatorClass;
     @Nullable private final Class<? extends ImmutableDataManipulator<?, ?>> immutableManipulatorClass;
     @Nullable private final DataManipulatorBuilder<?, ?> builder;

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

@@ -31,8 +31,32 @@
  * Represents a data structure that contains data. A DataContainer is
  * an object that can be considered a root {@link DataView}.
  */
+@SuppressWarnings("deprecation")
 public interface DataContainer extends DataView {
 
+    /**
+     * Creates a new {@link DataContainer} with a default
+     * {@link org.spongepowered.api.data.DataView.SafetyMode} of
+     * {@link org.spongepowered.api.data.DataView.SafetyMode#ALL_DATA_CLONED}.
+     *
+     * @return A new data container
+     */
+    static DataContainer createNew() {
+        return new MemoryDataContainer();
+    }
+
+    /**
+     * Creates a new {@link DataContainer} with the provided
+     * {@link org.spongepowered.api.data.DataView.SafetyMode}.
+     *
+     * @param safety The safety mode to use
+     * @see org.spongepowered.api.data.DataView.SafetyMode
+     * @return A new data container with the provided safety mode
+     */
+    static DataContainer createNew(SafetyMode safety) {
+        return new MemoryDataContainer(safety);
+    }
+
     @Override
     DataContainer set(DataQuery path, Object value);
 

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

@@ -26,6 +26,8 @@
 
 public class DataException extends RuntimeException {
 
+    private static final long serialVersionUID = -7843375998187638640L;
+
     public DataException() {
     }
 

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

@@ -38,8 +38,7 @@ public interface DataRegistration<T extends DataManipulator<T, I>, I extends Imm
      * Creates a new {@link Builder} to build a {@link DataRegistration}.
      * Through the use of generics, this can be duck-typed to the generics of
      * the desired {@link DataManipulator} type to be registered.
-     * @param <M> The type of data manipulator
-     * @param <D> The type of immutable data manipulator
+     *
      * @return The new builder instance
      */
     @SuppressWarnings("unchecked")

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

@@ -31,6 +31,7 @@
 
 public class DataRegistrationNotFoundException extends DataException {
 
+    private static final long serialVersionUID = -1671720083547789746L;
     @Nullable private String registrationQuery;
     @Nullable private Class<? extends DataManipulator<?, ?>> manipulatorClass;
     @Nullable private Class<? extends ImmutableDataManipulator<?, ?>> immutableClass;

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

@@ -35,14 +35,22 @@
  * The default implementation of {@link DataContainer} that can be instantiated
  * for any use. This is the primary implementation of any {@link DataView} that
  * is used throughout both SpongeAPI and Sponge implementation.
+ *
+ * @deprecated To be removed in future releases to avoid implementation bugs
+ *     being part of the API.
  */
+@SuppressWarnings("deprecation")
+@Deprecated
 public class MemoryDataContainer extends MemoryDataView implements DataContainer {
 
     /**
      * Creates a new {@link MemoryDataContainer} with a default
      * {@link org.spongepowered.api.data.DataView.SafetyMode} of
      * {@link org.spongepowered.api.data.DataView.SafetyMode#ALL_DATA_CLONED}.
+     *
+     * @deprecated Use {@link DataContainer#createNew()}
      */
+    @Deprecated
     public MemoryDataContainer() {
         this(DataView.SafetyMode.ALL_DATA_CLONED);
     }
@@ -53,7 +61,10 @@ public MemoryDataContainer() {
      *
      * @param safety The safety mode to use
      * @see org.spongepowered.api.data.DataView.SafetyMode
+     *
+     * @deprecated Use {@link DataContainer#createNew(org.spongepowered.api.data.DataView.SafetyMode)}
      */
+    @Deprecated
     public MemoryDataContainer(DataView.SafetyMode safety) {
         super(safety);
     }

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

@@ -58,7 +58,10 @@
 
 /**
  * Default implementation of a {@link DataView} being used in memory.
+ * @deprecated To be moved to implementation to avoid implementation bugs
+ *     being existing in the API.
  */
+@Deprecated
 public class MemoryDataView implements DataView {
 
     protected final Map<String, Object> map = Maps.newLinkedHashMap();

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

@@ -153,7 +153,7 @@ public int getContentVersion() {
 
     @Override
     public DataContainer toContainer() {
-        final DataContainer container = new MemoryDataContainer()
+        final DataContainer container = DataContainer.createNew()
             .set(Queries.CONTENT_VERSION, getContentVersion())
             .set(Queries.TYPE_CLASS, this.original.getClass().getName())
             .set(Queries.ORIGINAL, this.original)

src/main/java/org/spongepowered/api/data/manipulator/immutable/common/AbstractImmutableData.java

@@ -29,7 +29,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import org.spongepowered.api.data.DataContainer;
-import org.spongepowered.api.data.MemoryDataContainer;
 import org.spongepowered.api.data.Queries;
 import org.spongepowered.api.data.key.Key;
 import org.spongepowered.api.data.manipulator.DataManipulator;
@@ -162,7 +161,7 @@ public boolean equals(Object obj) {
 
     @Override
     public DataContainer toContainer() {
-        return new MemoryDataContainer()
+        return DataContainer.createNew()
                 .set(Queries.CONTENT_VERSION, getContentVersion());
     }
 

src/main/java/org/spongepowered/api/data/manipulator/mutable/common/AbstractData.java

@@ -30,7 +30,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import org.spongepowered.api.data.DataContainer;
-import org.spongepowered.api.data.MemoryDataContainer;
 import org.spongepowered.api.data.Queries;
 import org.spongepowered.api.data.key.Key;
 import org.spongepowered.api.data.manipulator.DataManipulator;
@@ -209,7 +208,7 @@ public boolean equals(Object obj) {
 
     @Override
     public DataContainer toContainer() {
-        return new MemoryDataContainer()
+        return DataContainer.createNew()
                 .set(Queries.CONTENT_VERSION, getContentVersion());
     }