type inference fix + optimizations

Author: phinner

build.gradle

@@ -7,13 +7,14 @@ plugins {
 }
 
 group "net.mindustry_ddns"
-version "2.0.0"
+version "2.1.0"
 
 ext.versions = [
         "gson" : "2.9.0",
         "owner": "1.0.12",
         "junit": "5.8.2",
-        "jackson": "2.13.2.2"
+        "jackson": "2.13.2.2",
+        "geantyref": "1.3.13"
 ]
 
 java {
@@ -38,13 +39,13 @@ dependencies {
     compileOnly "com.google.code.gson:gson:${versions.gson}"
     compileOnly "org.aeonbits.owner:owner-java8:${versions.owner}"
     compileOnly "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
-    api "io.leangen.geantyref:geantyref:1.3.13"
+    api "io.leangen.geantyref:geantyref:${versions.geantyref}"
 
     // Tests
     testImplementation "com.google.code.gson:gson:${versions.gson}"
     testImplementation "org.aeonbits.owner:owner-java8:${versions.owner}"
     testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
-    testImplementation "io.leangen.geantyref:geantyref:1.3.13"
+    testImplementation "io.leangen.geantyref:geantyref:${versions.geantyref}"
 
     testImplementation "org.junit.jupiter:junit-jupiter-params:${versions.junit}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${versions.junit}"

src/main/java/net/mindustry_ddns/filestore/FileStore.java

@@ -18,25 +18,27 @@ public interface FileStore<T> extends Store<T> {
      *
      * @param file       the file
      * @param serializer the serializer instance
+     * @param token      the type token of the stored object
      * @param object     the initial value of the store
      * @param <T>        the stored object type
      * @return a new simple {@code FileStore}
      */
-    static <T> FileStore<T> of(File file, Serializer<T> serializer, T object) {
-        return new SimpleFileStore<>(file, serializer, new TypeToken<>() {}, object);
+    static <T> FileStore<T> of(File file, Serializer<T> serializer, TypeToken<T> token, T object) {
+        return new SimpleFileStore<>(file, serializer, token, object);
     }
 
     /**
      * Creates a new {@code FileStore}.
      *
      * @param path       the path of the file
      * @param serializer the serializer instance
+     * @param token      the type token of the stored object
      * @param object     the initial value of the store
      * @param <T>        the stored object type
      * @return a new simple {@code FileStore}
      */
-    static <T> FileStore<T> of(String path, Serializer<T> serializer, T object) {
-        return of(new File(path), serializer, object);
+    static <T> FileStore<T> of(String path, Serializer<T> serializer, TypeToken<T> token, T object) {
+        return of(new File(path), serializer, token, object);
     }
 
     /**
@@ -46,51 +48,60 @@ static <T> FileStore<T> of(String path, Serializer<T> serializer, T object) {
      *
      * @param file       the file
      * @param serializer the serializer instance
+     * @param token      the type token of the stored object
      * @param <T>        the stored object type
      * @return a new simple {@code FileStore}
      */
-    static <T> FileStore<T> of(File file, Serializer<T> serializer) {
-        return of(file, serializer, null);
+    static <T> FileStore<T> of(File file, Serializer<T> serializer, TypeToken<T> token) {
+        return of(file, serializer, token, null);
     }
 
-
     /**
      * Creates a new {@code FileStore}.
      * <p>
      * <strong>Attention</strong>, the initial value is null.
      *
      * @param path       the path of the file
      * @param serializer the serializer instance
+     * @param token      the type token of the stored object
      * @param <T>        the stored object type
      * @return a new simple {@code FileStore}
      */
-    static <T> FileStore<T> of(String path, Serializer<T> serializer) {
-        return of(new File(path), serializer, null);
+    static <T> FileStore<T> of(String path, Serializer<T> serializer, TypeToken<T> token) {
+        return of(new File(path), serializer, token, null);
     }
 
+    /**
+     * {@inheritDoc}
+     * <p>
+     * If the parent directories of the file don't exist, they are created.
+     */
+    @Override
+    void save();
+
     /**
      * Returns the file where the object is stored.
      */
     File getFile();
 
     /**
-     * Set the file where the object is stored.
+     * Sets the file where the object is stored.
      *
      * @param file the file
      */
     void setFile(File file);
 
     /**
-     * @return If the file exists.
-     */
-    boolean doesFileExist();
-
-    /**
-     * Set the file where the object is stored.
+     * Sets the file where the object is stored.
      *
      * @param path the path of the file
      */
     default void setFile(String path) {
         setFile(new File(path));
     }
+
+    @Override
+    default boolean exists() {
+        return getFile().exists();
+    }
 }

src/main/java/net/mindustry_ddns/filestore/SimpleFileStore.java

@@ -2,6 +2,7 @@
 
 import io.leangen.geantyref.TypeToken;
 import net.mindustry_ddns.filestore.serial.Serializer;
+
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 
@@ -29,11 +30,6 @@ public void setFile(File file) {
         this.file = file;
     }
 
-    @Override
-    public boolean doesFileExist() {
-        return file.exists();
-    }
-
     @Override
     public T get() {
         return object;

src/main/java/net/mindustry_ddns/filestore/Store.java

@@ -16,7 +16,7 @@ public interface Store<T> {
     T get();
 
     /**
-     * Set the stored object.
+     * Sets the stored object.
      *
      * @param object the object to store
      */
@@ -29,16 +29,25 @@ public interface Store<T> {
 
     /**
      * Loads the stored object.
+     * <p>
+     * If the store doesn't exist, it is created and the stored object of the store is saved.
+     *
+     * @see #save()
      */
     void load();
 
     /**
-     * Returns the type of the stored object.
+     * Returns the type token of the stored object.
      */
     TypeToken<T> getTypeToken();
 
     /**
      * Returns the serializer of the store.
      */
     Serializer<T> getSerializer();
+
+    /**
+     * Returns whether the store exists or not.
+     */
+    boolean exists();
 }

src/main/java/net/mindustry_ddns/filestore/serial/ConfigSerializer.java

@@ -32,9 +32,9 @@ public T deserialize(Reader reader, TypeToken<T> token) throws IOException {
                     ? ConfigFactory.create((Class<T>) clazz, properties)
                     : factory.create((Class<T>) clazz, properties);
         } else {
-            throw new IOException("The type is invalid, it should be a 'Class', not "
-                    + token.getType().getClass().getSimpleName()
-                    + ".");
+            throw new IOException("The type is invalid, it should be an interface with no generic parameters, not '"
+                    + token.getType().getClass().toString()
+                    + "'.");
         }
     }