raw value as String

Topper-MC · Nov 1, 2024 · 3cec9ae · 3cec9ae
1 parent 8929929
commit 3cec9ae
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/...number/src/main/java/me/hsgamer/topper/agent/storage/number/FlatNumberEntryConverter.java b/...number/src/main/java/me/hsgamer/topper/agent/storage/number/FlatNumberEntryConverter.java
@@ -4,16 +4,16 @@
 
 public interface FlatNumberEntryConverter<K> extends FlatEntryConverter<K, Double> {
     @Override
-    default Double toValue(Object object) {
+    default Double toValue(String object) {
         try {
-            return Double.parseDouble(String.valueOf(object));
+            return Double.parseDouble(object);
         } catch (Exception e) {
             return null;
         }
     }
 
     @Override
-    default Object toRawValue(Double object) {
-        return object;
+    default String toRawValue(Double object) {
+        return Double.toString(object);
     }
 }
diff --git a/...le/src/main/java/me/hsgamer/topper/agent/storage/simple/converter/FlatEntryConverter.java b/...le/src/main/java/me/hsgamer/topper/agent/storage/simple/converter/FlatEntryConverter.java
@@ -5,7 +5,7 @@ public interface FlatEntryConverter<K, V> {
 
     String toRawKey(K key);
 
-    V toValue(Object object);
+    V toValue(String value);
 
-    Object toRawValue(V object);
+    String toRawValue(V object);
 }
diff --git a/...le/src/main/java/me/hsgamer/topper/agent/storage/simple/supplier/DataStorageSupplier.java b/...le/src/main/java/me/hsgamer/topper/agent/storage/simple/supplier/DataStorageSupplier.java
@@ -1,7 +1,6 @@
 package me.hsgamer.topper.agent.storage.simple.supplier;
 
 import me.hsgamer.topper.agent.storage.DataStorage;
-import me.hsgamer.topper.core.DataHolder;
 
 public interface DataStorageSupplier<K, V> {
     DataStorage<K, V> getStorage(String name);

diff --git a/...le/src/main/java/me/hsgamer/topper/agent/storage/simple/supplier/FlatStorageSupplier.java b/...le/src/main/java/me/hsgamer/topper/agent/storage/simple/supplier/FlatStorageSupplier.java
@@ -63,7 +63,7 @@ public Map<K, V> load() {
                 Map<K, V> map = new HashMap<>();
                 properties.forEach((key, value) -> {
                     K k = converter.toKey(key.toString());
-                    V v = converter.toValue(value);
+                    V v = converter.toValue(value.toString());
                     map.put(k, v);
                 });
                 return map;

diff --git a/...ple/src/main/java/me/hsgamer/topper/agent/storage/simple/supplier/SqlStorageSupplier.java b/...ple/src/main/java/me/hsgamer/topper/agent/storage/simple/supplier/SqlStorageSupplier.java
@@ -7,7 +7,6 @@
 import me.hsgamer.hscore.logger.provider.LoggerProvider;
 import me.hsgamer.topper.agent.storage.DataStorage;
 import me.hsgamer.topper.agent.storage.simple.converter.SqlEntryConverter;
-import me.hsgamer.topper.core.DataHolder;
 import org.intellij.lang.annotations.Language;
 
 import java.sql.Connection;

diff --git a/...in/java/me/hsgamer/topper/spigot/agent/storage/simple/supplier/ConfigStorageSupplier.java b/...in/java/me/hsgamer/topper/spigot/agent/storage/simple/supplier/ConfigStorageSupplier.java
@@ -45,7 +45,7 @@ public Map<K, V> load() {
                 Map<String[], Object> values = config.getValues(false);
                 Map<K, V> map = new HashMap<>();
                 values.forEach((path, value) -> {
-                    V finalValue = converter.toValue(value);
+                    V finalValue = converter.toValue(String.valueOf(value));
                     if (finalValue != null) {
                         K finalKey = converter.toKey(path[0]);
                         map.put(finalKey, finalValue);
@@ -69,7 +69,7 @@ public CompletableFuture<Void> save(Map<K, V> map, boolean urgent) {
             @Override
             public CompletableFuture<Optional<V>> load(K key, boolean urgent) {
                 return CompletableFuture.supplyAsync(
-                        () -> Optional.ofNullable(config.get(converter.toRawKey(key))).map(converter::toValue),
+                        () -> Optional.ofNullable(config.get(converter.toRawKey(key))).map(String::valueOf).map(converter::toValue),
                         urgent ? Runnable::run : mainThreadExecutor
                 );
             }