Skip to content

Commit f4782d1

Browse files
committed
correct some illogical in ComplexValueConverter
1 parent e7645a2 commit f4782d1

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/converter/ComplexValueConverter.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import java.util.regex.Pattern;
1313

1414
public final class ComplexValueConverter<T> implements ValueConverter<T> {
15-
private final String rawStringSeparator;
15+
private final String stringSeparator;
1616
private final List<Entry<T>> entries;
1717
private final Supplier<T> constructor;
1818
private final String[] sqlColumns;
1919
private final String[] sqlColumnDefinitions;
2020

21-
private ComplexValueConverter(String rawStringSeparator, List<Entry<T>> entries, Supplier<T> constructor) {
22-
this.rawStringSeparator = rawStringSeparator;
21+
private ComplexValueConverter(String stringSeparator, List<Entry<T>> entries, Supplier<T> constructor) {
22+
this.stringSeparator = stringSeparator;
2323
this.entries = Collections.unmodifiableList(entries);
2424
this.constructor = constructor;
2525

@@ -41,7 +41,7 @@ public static <T> Builder<T> builder() {
4141

4242
@Override
4343
public @NotNull String toRawString(@NotNull T value) {
44-
StringJoiner joiner = new StringJoiner(rawStringSeparator);
44+
StringJoiner joiner = new StringJoiner(stringSeparator);
4545
for (Entry<T> entry : entries) {
4646
String rawString = entry.converter.toRawString(entry.getter.apply(value));
4747
joiner.add(rawString);
@@ -51,7 +51,7 @@ public static <T> Builder<T> builder() {
5151

5252
@Override
5353
public @Nullable T fromRawString(@NotNull String value) {
54-
String[] values = value.split(Pattern.quote(rawStringSeparator));
54+
String[] values = value.split(Pattern.quote(stringSeparator));
5555
if (values.length != entries.size()) {
5656
return null;
5757
}
@@ -136,16 +136,16 @@ private Entry(ValueConverter<Object> converter, Function<T, Object> getter, BiFu
136136

137137
public static class Builder<T> {
138138
private final List<Entry<T>> entries;
139-
private String rawStringSeparator;
139+
private String stringSeparator;
140140
private Supplier<T> constructor;
141141

142142
private Builder() {
143143
entries = new ArrayList<>();
144-
rawStringSeparator = "||";
144+
stringSeparator = "||";
145145
}
146146

147-
public Builder<T> rawStringSeparator(String rawStringSeparator) {
148-
this.rawStringSeparator = rawStringSeparator;
147+
public Builder<T> stringSeparator(String rawStringSeparator) {
148+
this.stringSeparator = rawStringSeparator;
149149
return this;
150150
}
151151

@@ -155,7 +155,7 @@ public Builder<T> constructor(Supplier<T> constructor) {
155155
}
156156

157157
@SuppressWarnings("unchecked")
158-
public <V> Builder<T> entry(ValueConverter<T> converter, Function<T, V> getter, BiFunction<T, V, T> setter) {
158+
public <V> Builder<T> entry(ValueConverter<V> converter, Function<T, V> getter, BiFunction<T, V, T> setter) {
159159
ValueConverter<Object> objectConverter = (ValueConverter<Object>) converter;
160160
Function<T, Object> objectGetter = (Function<T, Object>) getter;
161161
BiFunction<T, Object, T> objectSetter = (BiFunction<T, Object, T>) setter;
@@ -171,7 +171,7 @@ public ComplexValueConverter<T> build() {
171171
if (entries.isEmpty()) {
172172
throw new IllegalStateException("Entries are empty");
173173
}
174-
return new ComplexValueConverter<>(rawStringSeparator, entries, constructor);
174+
return new ComplexValueConverter<>(stringSeparator, entries, constructor);
175175
}
176176
}
177177
}

0 commit comments

Comments
 (0)