Skip to content

Commit 03ff01d

Browse files
HSGamerHSGamer
committed
less confusing naming in ValueConverter
1 parent 8ab17d7 commit 03ff01d

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎spigot/storage-simple/src/main/java/me/hsgamer/topper/spigot/storage/simple/supplier/ConfigStorageSupplier.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public Map<K, V> load() {
3535
Map<String[], Object> values = config.getValues(false);
3636
Map<K, V> map = new HashMap<>();
3737
values.forEach((path, value) -> {
38-
K finalKey = keyConverter.parseString(path[0]);
39-
V finalValue = valueConverter.parseString(String.valueOf(value));
38+
K finalKey = keyConverter.fromRawString(path[0]);
39+
V finalValue = valueConverter.fromRawString(String.valueOf(value));
4040
if (finalKey != null && finalValue != null) {
4141
map.put(finalKey, finalValue);
4242
}
@@ -46,7 +46,7 @@ public Map<K, V> load() {
4646

4747
@Override
4848
public Optional<V> load(K key) {
49-
return Optional.ofNullable(config.get(keyConverter.parseString(key))).map(String::valueOf).map(valueConverter::parseString);
49+
return Optional.ofNullable(config.get(keyConverter.toRawString(key))).map(String::valueOf).map(valueConverter::fromRawString);
5050
}
5151

5252
@Override
@@ -69,8 +69,8 @@ public void remove(Collection<K> keys) {
6969

7070
@Override
7171
public void commit() {
72-
map.forEach((k, v) -> config.set(keyConverter.parseString(k), valueConverter.parseString(v)));
73-
removeSet.forEach(key -> config.remove(keyConverter.parseString(key)));
72+
map.forEach((k, v) -> config.set(keyConverter.toRawString(k), valueConverter.toRawString(v)));
73+
removeSet.forEach(key -> config.remove(keyConverter.toRawString(key)));
7474
config.save();
7575
}
7676

‎storage/simple/src/main/java/me/hsgamer/topper/storage/simple/converter/NumberConverter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public NumberConverter(String valueName, boolean isDoubleValue, Function<@NotNul
2121
}
2222

2323
@Override
24-
public @NotNull String parseString(@NotNull Number value) {
24+
public @NotNull String toRawString(@NotNull Number value) {
2525
return value.toString();
2626
}
2727

2828
@Override
29-
public @Nullable T parseString(@NotNull String value) {
29+
public @Nullable T fromRawString(@NotNull String value) {
3030
try {
3131
return numberFunction.apply(isDoubleValue ? Double.parseDouble(value) : Long.parseLong(value));
3232
} catch (NumberFormatException e) {
@@ -35,12 +35,12 @@ public NumberConverter(String valueName, boolean isDoubleValue, Function<@NotNul
3535
}
3636

3737
@Override
38-
public @NotNull Map<String, Object> parseObjectMap(@NotNull Number value) {
38+
public @NotNull Map<String, Object> toObjectMap(@NotNull Number value) {
3939
return Collections.singletonMap(valueName, value);
4040
}
4141

4242
@Override
43-
public @Nullable T parseObjectMap(@NotNull Map<String, Object> map) {
43+
public @Nullable T fromObjectMap(@NotNull Map<String, Object> map) {
4444
Object value = map.get(valueName);
4545
Number number;
4646
if (value instanceof Number) {
@@ -72,7 +72,7 @@ public Object[] toSqlValues(@NotNull Number value) {
7272
}
7373

7474
@Override
75-
public @Nullable T parseSqlResultSet(@NotNull ResultSet resultSet) throws SQLException {
75+
public @Nullable T fromSqlResultSet(@NotNull ResultSet resultSet) throws SQLException {
7676
Number number = isDoubleValue ? resultSet.getDouble(valueName) : resultSet.getLong(valueName);
7777
return numberFunction.apply(number);
7878
}

‎storage/simple/src/main/java/me/hsgamer/topper/storage/simple/converter/SimpleValueConverter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ public SimpleValueConverter(Function<@NotNull T, @NotNull String> toStringConver
2525
}
2626

2727
@Override
28-
public @NotNull String parseString(@NotNull T value) {
28+
public @NotNull String toRawString(@NotNull T value) {
2929
return toStringConverter.apply(value);
3030
}
3131

3232
@Override
33-
public @Nullable T parseString(@NotNull String value) {
33+
public @Nullable T fromRawString(@NotNull String value) {
3434
return fromStringConverter.apply(value);
3535
}
3636

3737
@Override
38-
public @NotNull Map<String, Object> parseObjectMap(@NotNull T value) {
38+
public @NotNull Map<String, Object> toObjectMap(@NotNull T value) {
3939
return Collections.singletonMap(valueName, value);
4040
}
4141

4242
@Override
43-
public @Nullable T parseObjectMap(@NotNull Map<String, Object> map) {
43+
public @Nullable T fromObjectMap(@NotNull Map<String, Object> map) {
4444
Object value = map.get(valueName);
45-
return value == null ? null : parseString(value.toString());
45+
return value == null ? null : fromRawString(value.toString());
4646
}
4747

4848
@Override
@@ -57,12 +57,12 @@ public String[] getSqlColumnDefinitions() {
5757

5858
@Override
5959
public Object[] toSqlValues(@NotNull T value) {
60-
return new Object[]{parseString(value)};
60+
return new Object[]{toRawString(value)};
6161
}
6262

6363
@Override
64-
public @Nullable T parseSqlResultSet(@NotNull ResultSet resultSet) throws SQLException {
64+
public @Nullable T fromSqlResultSet(@NotNull ResultSet resultSet) throws SQLException {
6565
String value = resultSet.getString(valueName);
66-
return value == null ? null : parseString(value);
66+
return value == null ? null : fromRawString(value);
6767
}
6868
}

‎storage/simple/src/main/java/me/hsgamer/topper/storage/simple/converter/ValueConverter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
import java.util.Map;
99

1010
public interface ValueConverter<T> {
11-
@NotNull String parseString(@NotNull T value);
11+
@NotNull String toRawString(@NotNull T value);
1212

13-
@Nullable T parseString(@NotNull String value);
13+
@Nullable T fromRawString(@NotNull String value);
1414

15-
@NotNull Map<String, Object> parseObjectMap(@NotNull T value);
15+
@NotNull Map<String, Object> toObjectMap(@NotNull T value);
1616

17-
@Nullable T parseObjectMap(@NotNull Map<String, Object> map);
17+
@Nullable T fromObjectMap(@NotNull Map<String, Object> map);
1818

1919
String[] getSqlColumns();
2020

2121
String[] getSqlColumnDefinitions();
2222

2323
Object[] toSqlValues(@NotNull T value);
2424

25-
@Nullable T parseSqlResultSet(@NotNull ResultSet resultSet) throws SQLException;
25+
@Nullable T fromSqlResultSet(@NotNull ResultSet resultSet) throws SQLException;
2626
}

‎storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/FlatStorageSupplier.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public <K, V> DataStorage<K, V> getStorage(String name, ValueConverter<K> keyCon
5555
public Map<K, V> load() {
5656
Map<K, V> map = new HashMap<>();
5757
properties.forEach((key, value) -> {
58-
K k = keyConverter.parseString(key.toString());
59-
V v = valueConverter.parseString(value.toString());
58+
K k = keyConverter.fromRawString(key.toString());
59+
V v = valueConverter.fromRawString(value.toString());
6060
if (k != null && v != null) {
6161
map.put(k, v);
6262
}
@@ -66,7 +66,7 @@ public Map<K, V> load() {
6666

6767
@Override
6868
public Optional<V> load(K key) {
69-
return Optional.ofNullable(properties.getProperty(keyConverter.parseString(key))).map(valueConverter::parseString);
69+
return Optional.ofNullable(properties.getProperty(keyConverter.toRawString(key))).map(valueConverter::fromRawString);
7070
}
7171

7272
@Override
@@ -89,8 +89,8 @@ public void remove(Collection<K> keys) {
8989

9090
@Override
9191
public void commit() {
92-
map.forEach((k, v) -> properties.put(keyConverter.parseString(k), valueConverter.parseString(v)));
93-
removeSet.forEach(key -> properties.remove(keyConverter.parseString(key)));
92+
map.forEach((k, v) -> properties.put(keyConverter.toRawString(k), valueConverter.toRawString(v)));
93+
removeSet.forEach(key -> properties.remove(keyConverter.toRawString(key)));
9494
saveRunnable.run();
9595
}
9696

‎storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Map<K, V> load() {
3434
connection = getConnection();
3535
return StatementBuilder.create(connection)
3636
.setStatement("SELECT * FROM `" + name + "`;")
37-
.queryList(resultSet -> new AbstractMap.SimpleEntry<>(keyConverter.parseSqlResultSet(resultSet), valueConverter.parseSqlResultSet(resultSet)))
37+
.queryList(resultSet -> new AbstractMap.SimpleEntry<>(keyConverter.fromSqlResultSet(resultSet), valueConverter.fromSqlResultSet(resultSet)))
3838
.stream()
3939
.filter(entry -> entry.getKey() != null && entry.getValue() != null)
4040
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
@@ -71,7 +71,7 @@ public Optional<V> load(K key) {
7171
.setStatement(statement.toString())
7272
.addValues(keyValues)
7373
.query(resultSet -> resultSet.next()
74-
? Optional.ofNullable(valueConverter.parseSqlResultSet(resultSet))
74+
? Optional.ofNullable(valueConverter.fromSqlResultSet(resultSet))
7575
: Optional.empty()
7676
);
7777
} catch (SQLException e) {

0 commit comments

Comments
 (0)