Revert "Refactoring."

This reverts commit 3dc84f7.

Author: phinner

src/main/java/net/mindustry_ddns/filestore/AbstractFileStore.java renamed to src/main/java/net/mindustry_ddns/store/AbstractFileStore.java

@@ -1,15 +1,15 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
 import java.io.*;
 import java.util.function.*;
 
+
 /**
  * Base class for specific implementations of a file store.
  *
  * @param <T> the stored object type
  */
 public abstract class AbstractFileStore<T> implements FileStore<T> {
-
     private File file;
     private T object;
 

src/main/java/net/mindustry_ddns/filestore/ConfigFileStore.java renamed to src/main/java/net/mindustry_ddns/store/ConfigFileStore.java

@@ -1,11 +1,13 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
-import net.mindustry_ddns.filestore.util.*;
+import net.mindustry_ddns.store.util.*;
 import org.aeonbits.owner.*;
+
 import java.io.*;
 import java.nio.charset.*;
 import java.util.*;
 
+
 /**
  * A property based store backed by the <a href="http://owner.aeonbits.org/">OWNER library</a>.
  *
@@ -20,7 +22,6 @@
  * @param <T> the stored config type
  */
 public class ConfigFileStore<T extends Accessible> extends AbstractFileStore<T> {
-
     private final Factory factory;
     private final Class<T> clazz;
 
@@ -33,7 +34,6 @@ public class ConfigFileStore<T extends Accessible> extends AbstractFileStore<T>
      * @param imports imported properties for the initial value of the file store
      */
     public ConfigFileStore(String path, Class<T> clazz, Factory factory, Map<?, ?>... imports) {
-
         super(new File(path), () -> factory.create(clazz, imports));
         this.factory = factory;
         this.clazz = clazz;
@@ -54,7 +54,6 @@ public ConfigFileStore(String path, Class<T> clazz, Map<?, ?>... imports) {
      * @see ConfigFileStore#ConfigFileStore(String, Class, Factory, Map[])
      */
     public static <T extends Accessible> ConfigFileStore<T> load(String path, Class<T> clazz, Factory factory, Map<?, ?>... imports) {
-
         ConfigFileStore<T> store = new ConfigFileStore<>(path, clazz, factory, imports);
         store.load();
         return store;
@@ -66,7 +65,6 @@ public static <T extends Accessible> ConfigFileStore<T> load(String path, Class<
      * @see ConfigFileStore#ConfigFileStore(String, Class, Map[])
      */
     public static <T extends Accessible> ConfigFileStore<T> load(String path, Class<T> clazz, Map<?, ?>... imports) {
-
         ConfigFileStore<T> store = new ConfigFileStore<>(path, clazz, imports);
         store.load();
         return store;
@@ -75,11 +73,9 @@ public static <T extends Accessible> ConfigFileStore<T> load(String path, Class<
     @Override
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public void save() {
-
         getFile().getAbsoluteFile().getParentFile().mkdirs();
 
         try (final Writer writer = new FileWriter(getFile(), StandardCharsets.UTF_8)) {
-
             Properties properties = new Properties();
             get().fill(properties);
             properties.store(writer, null);
@@ -90,19 +86,16 @@ public void save() {
 
     @Override
     public void load() {
-
         if (!getFile().exists()) {
             save();
-            return;
-        }
-
-        try (final Reader reader = new FileReader(getFile(), StandardCharsets.UTF_8)) {
-
-            Properties properties = new Properties();
-            properties.load(reader);
-            set(factory.create(clazz, properties));
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to load the config at " + getFile(), e);
+        } else {
+            try (final Reader reader = new FileReader(getFile(), StandardCharsets.UTF_8)) {
+                Properties properties = new Properties();
+                properties.load(reader);
+                set(factory.create(clazz, properties));
+            } catch (IOException e) {
+                throw new RuntimeException("Unable to load the config at " + getFile(), e);
+            }
         }
     }
 

src/main/java/net/mindustry_ddns/filestore/FileStore.java renamed to src/main/java/net/mindustry_ddns/store/FileStore.java

@@ -1,14 +1,14 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
 import java.io.*;
 
+
 /**
  * A {@code FileStore} provides easier management of io operations with objects.
  *
  * @param <T> the stored object type
  */
 public interface FileStore<T> {
-
     /**
      * @return the stored object
      */

src/main/java/net/mindustry_ddns/filestore/JsonFileStore.java renamed to src/main/java/net/mindustry_ddns/store/JsonFileStore.java

@@ -1,11 +1,13 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
 import com.google.gson.*;
+
 import java.io.*;
 import java.lang.reflect.*;
 import java.nio.charset.*;
 import java.util.function.*;
 
+
 /**
  * A json based store backed by Gson.
  *
@@ -20,7 +22,6 @@
  * @param <T> the stored object type
  */
 public class JsonFileStore<T> extends AbstractFileStore<T> {
-
     private final Type type;
     private final Gson gson;
 
@@ -33,7 +34,6 @@ public class JsonFileStore<T> extends AbstractFileStore<T> {
      * @param gson     the gson instance
      */
     public JsonFileStore(String path, Type type, Supplier<T> supplier, Gson gson) {
-
         super(new File(path), supplier);
         this.type = type;
         this.gson = gson;
@@ -54,7 +54,6 @@ public JsonFileStore(String path, Type type, Supplier<T> supplier) {
      * @see JsonFileStore#JsonFileStore(String, Type, Supplier, Gson)
      */
     public static <T> JsonFileStore<T> load(String path, Type type, Supplier<T> supplier, Gson gson) {
-
         JsonFileStore<T> store = new JsonFileStore<>(path, type, supplier, gson);
         store.load();
         return store;
@@ -66,7 +65,6 @@ public static <T> JsonFileStore<T> load(String path, Type type, Supplier<T> supp
      * @see JsonFileStore#JsonFileStore(String, Type, Supplier)
      */
     public static <T> JsonFileStore<T> load(String path, Type type, Supplier<T> supplier) {
-
         JsonFileStore<T> store = new JsonFileStore<>(path, type, supplier);
         store.load();
         return store;
@@ -86,16 +84,14 @@ public void save() {
 
     @Override
     public void load() {
-
         if (!getFile().exists()) {
             save();
-            return;
-        }
-
-        try (final Reader reader = new FileReader(getFile(), StandardCharsets.UTF_8)) {
-            set(gson.fromJson(reader, type));
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to load the object at " + getFile(), e);
+        } else {
+            try (final Reader reader = new FileReader(getFile(), StandardCharsets.UTF_8)) {
+                set(gson.fromJson(reader, type));
+            } catch (IOException e) {
+                throw new RuntimeException("Unable to load the object at " + getFile(), e);
+            }
         }
     }
 

src/main/java/net/mindustry_ddns/filestore/util/JsonArrayReader.java renamed to src/main/java/net/mindustry_ddns/store/util/JsonArrayReader.java

@@ -1,20 +1,21 @@
-package net.mindustry_ddns.filestore.util;
+package net.mindustry_ddns.store.util;
 
 import com.google.gson.*;
 import com.google.gson.stream.*;
-import net.mindustry_ddns.filestore.*;
+import net.mindustry_ddns.store.*;
+
 import java.io.*;
 import java.lang.reflect.*;
 import java.nio.charset.*;
 import java.util.*;
 
+
 /**
  * An iterator backed by a {@link JsonReader} to read the elements of a json array.
  *
  * @param <E> the element type
  */
-public class JsonArrayReader<E> implements Iterator<E>, Closeable {
-
+public class JsonArrayReader<E> implements Iterator<E>, Closeable{
     private final JsonReader reader;
     private final Type type;
     private final Gson gson;
@@ -28,7 +29,6 @@ public class JsonArrayReader<E> implements Iterator<E>, Closeable {
      * @param gson   the gson instance
      */
     public JsonArrayReader(Reader reader, Type type, Gson gson) {
-
         try {
             this.reader = new JsonReader(reader);
             this.type = type;
@@ -54,9 +54,7 @@ public JsonArrayReader(Reader reader, Type type) {
      * @param gson   the gson instance
      */
     public JsonArrayReader(String path, Type type, Gson gson) {
-
         try (Reader reader = new FileReader(path, StandardCharsets.UTF_8)) {
-
             this.reader = new JsonReader(reader);
             this.type = type;
             this.gson = gson;
@@ -88,15 +86,15 @@ public JsonArrayReader(JsonFileStore<?> store, Type type) {
      */
     @Override
     public boolean hasNext() {
-
         try {
-
-            if (!closed && reader.hasNext()) return true;
-
-            if (!closed) reader.close();
-            closed = true;
-            return false;
-
+            if (!closed && reader.hasNext()) {
+                return true;
+            } else {
+                if (!closed)
+                    reader.close();
+                closed = true;
+                return false;
+            }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -110,9 +108,11 @@ public boolean hasNext() {
      */
     @Override
     public E next() {
-
-        if (!closed) return gson.fromJson(reader, type);
-        throw new NoSuchElementException("No more elements to read.");
+        if (!closed) {
+            return gson.fromJson(reader, type);
+        } else {
+            throw new NoSuchElementException("No more elements to read.");
+        }
     }
 
     @Override

src/main/java/net/mindustry_ddns/filestore/util/SingletonConfigFactory.java renamed to src/main/java/net/mindustry_ddns/store/util/SingletonConfigFactory.java

@@ -1,14 +1,15 @@
-package net.mindustry_ddns.filestore.util;
+package net.mindustry_ddns.store.util;
 
 import org.aeonbits.owner.*;
 import org.aeonbits.owner.loaders.*;
+
 import java.util.*;
 
+
 /**
  * A {@link Factory} view of {@link ConfigFactory}.
  */
 public final class SingletonConfigFactory implements Factory {
-
     private static final SingletonConfigFactory INSTANCE = new SingletonConfigFactory();
 
     public static SingletonConfigFactory getInstance() {

src/test/java/net/mindustry_ddns/filestore/ConfigFileStoreTest.java renamed to src/test/java/net/mindustry_ddns/store/ConfigFileStoreTest.java

@@ -1,6 +1,6 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
-import net.mindustry_ddns.filestore.util.*;
+import net.mindustry_ddns.store.util.*;
 import org.aeonbits.owner.*;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.io.*;

src/test/java/net/mindustry_ddns/filestore/JsonArrayReaderTest.java renamed to src/test/java/net/mindustry_ddns/store/JsonArrayReaderTest.java

@@ -1,6 +1,6 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
-import net.mindustry_ddns.filestore.util.*;
+import net.mindustry_ddns.store.util.*;
 import org.junit.jupiter.api.*;
 
 import java.io.*;

src/test/java/net/mindustry_ddns/filestore/JsonFileStoreTest.java renamed to src/test/java/net/mindustry_ddns/store/JsonFileStoreTest.java

@@ -1,6 +1,6 @@
-package net.mindustry_ddns.filestore;
+package net.mindustry_ddns.store;
 
-import net.mindustry_ddns.filestore.util.*;
+import net.mindustry_ddns.store.util.*;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.io.*;
 

src/test/java/net/mindustry_ddns/filestore/util/TestConfig.java renamed to src/test/java/net/mindustry_ddns/store/util/TestConfig.java

@@ -1,4 +1,4 @@
-package net.mindustry_ddns.filestore.util;
+package net.mindustry_ddns.store.util;
 
 import org.aeonbits.owner.*;
 

src/test/java/net/mindustry_ddns/filestore/util/TestObject.java renamed to src/test/java/net/mindustry_ddns/store/util/TestObject.java

@@ -1,4 +1,4 @@
-package net.mindustry_ddns.filestore.util;
+package net.mindustry_ddns.store.util;
 
 public class TestObject {
     private int luckyNumber = 7;