Merge remote-tracking branch 'origin/api-17' into api-18

Author: aromaa

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

@@ -58,6 +58,91 @@ static DataContainer createNew(SafetyMode safety) {
     @Override
     DataContainer set(DataQuery path, Object value);
 
+    @Override
+    default DataContainer set(DataQuery path, String value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, boolean value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, byte value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, short value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, int value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, long value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, float value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(DataQuery path, double value) {
+        return this.set(path, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, Object value) {
+        return this.set(DataQuery.of(key), value);
+    }
+
+    @Override
+    default DataContainer set(String key, String value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, boolean value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, byte value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, short value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, int value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, long value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, float value) {
+        return this.set(key, (Object) value);
+    }
+
+    @Override
+    default DataContainer set(String key, double value) {
+        return this.set(key, (Object) value);
+    }
+
     @Override
     DataContainer remove(DataQuery path);
 }

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

@@ -26,6 +26,8 @@
 
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -34,7 +36,6 @@
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Represents a query that can be done on views. Queries do not depend on
@@ -80,7 +81,7 @@ private DataQuery(final String... parts) {
      * @param parts The parts
      */
     private DataQuery(final List<String> parts) {
-        this.parts = List.copyOf(parts);
+        this.parts = parts;
     }
 
     /**
@@ -132,7 +133,7 @@ public static DataQuery of(final List<String> parts) {
         if (parts.isEmpty()) {
             return DataQuery.EMPTY;
         }
-        return new DataQuery(parts);
+        return new DataQuery(List.copyOf(parts));
     }
 
     /**
@@ -152,8 +153,10 @@ public List<String> parts() {
      * @return The constructed query
      */
     public DataQuery then(final DataQuery that) {
-        final var parts = Stream.concat(this.parts.stream(), that.parts.stream()).collect(Collectors.toUnmodifiableList());
-        return new DataQuery(parts);
+        final ArrayList<String> parts = new ArrayList<>(this.parts.size() + that.parts.size());
+        parts.addAll(this.parts);
+        parts.addAll(that.parts);
+        return new DataQuery(Collections.unmodifiableList(parts));
     }
 
     /**
@@ -164,8 +167,10 @@ public DataQuery then(final DataQuery that) {
      * @return The constructed query
      */
     public DataQuery then(final String that) {
-        final var parts = Stream.concat(this.parts.stream(), Stream.of(that)).collect(Collectors.toUnmodifiableList());
-        return new DataQuery(parts);
+        final ArrayList<String> parts = new ArrayList<>(this.parts.size() + 1);
+        parts.addAll(this.parts);
+        parts.add(that);
+        return new DataQuery(Collections.unmodifiableList(parts));
     }
 
     /**
@@ -192,7 +197,10 @@ public DataQuery pop() {
         if (this.parts.size() <= 1) {
             return DataQuery.of();
         }
-        final var parts = this.parts.stream().limit(this.parts.size() - 1L).collect(Collectors.toUnmodifiableList());
+        final ArrayList<String> parts = new ArrayList<>(this.parts.size() - 1);
+        for (int i = 0; i < this.parts.size() - 1; i++) {
+            parts.add(this.parts.get(i));
+        }
         return new DataQuery(parts);
     }
 
@@ -207,8 +215,11 @@ public DataQuery popFirst() {
         if (this.parts.size() <= 1) {
             return DataQuery.of();
         }
-        final var parts = this.parts.stream().skip(1L).collect(Collectors.toUnmodifiableList());
-        return new DataQuery(parts);
+        final ArrayList<String> parts = new ArrayList<>(this.parts.size() - 1);
+        for (int i = 1; i < this.parts.size(); i++) {
+            parts.add(this.parts.get(i));
+        }
+        return new DataQuery(Collections.unmodifiableList(parts));
     }
 
     /**

src/main/java/org/spongepowered/api/data/persistence/DataSerializable.java

@@ -52,4 +52,16 @@ public interface DataSerializable {
      */
     DataContainer toContainer();
 
+    /**
+     * Serializes this object and applies the provided
+     * data to the provided {@link DataView} instead of creating
+     * a new {@link DataContainer}, reducing nested information.
+     *
+     * @param container The data view to serialize to
+     * @return The provided data view, for chaining
+     */
+    default DataView toView(DataView container) {
+        this.toContainer().streamRootValues().forEach(entry -> container.set(entry.getKey(), entry.getValue()));
+        return container;
+    }
 }