Skip to content

Commit 9cb45a5

Browse files
committed
fixed minor issues
1 parent e1cd563 commit 9cb45a5

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

client-v2/src/main/java/com/clickhouse/client/api/internal/BaseCollectionConverter.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.Deque;
99
import java.util.List;
1010

11-
public abstract class BaseCollectionConverter<TAcc, TList> {
11+
public abstract class BaseCollectionConverter<ACC, LIST> {
1212
public static final String ARRAY_START = "[";
1313
public static final String ARRAY_END = "]";
1414

@@ -18,36 +18,36 @@ protected BaseCollectionConverter(String itemDelimiter) {
1818
this.itemDelimiter = itemDelimiter;
1919
}
2020

21-
protected abstract void setAccumulator(TAcc acc);
21+
protected abstract void setAccumulator(ACC acc);
2222

2323
protected abstract void append(String str);
2424

2525
protected abstract String buildString();
2626

27-
protected abstract void onStart(ListConversionState<TList> state);
27+
protected abstract void onStart(ListConversionState<LIST> state);
2828

29-
protected abstract void onEnd(ListConversionState<TList> state);
29+
protected abstract void onEnd(ListConversionState<LIST> state);
3030

31-
protected abstract void onItem(Object item, ListConversionState<TList> state);
31+
protected abstract void onItem(Object item, ListConversionState<LIST> state);
3232

3333
protected abstract String onEmptyCollection();
3434

35-
protected abstract boolean isEmpty(TList list);
35+
protected abstract boolean isEmpty(LIST list);
3636

3737
protected abstract boolean isSubList(Object list);
3838

39-
protected abstract int listSize(TList list);
39+
protected abstract int listSize(LIST list);
4040

41-
protected abstract Object getNext(ListConversionState<TList> state);
41+
protected abstract Object getNext(ListConversionState<LIST> state);
4242

43-
public final String convert(TList value, TAcc acc) {
43+
public final String convert(LIST value, ACC acc) {
4444
if (isEmpty(value)) {
4545
return onEmptyCollection();
4646
}
4747
setAccumulator(acc);
4848

49-
Deque<ListConversionState<TList>> stack = new ArrayDeque<>();
50-
ListConversionState<TList> state = new ListConversionState<>(value, listSize(value));
49+
Deque<ListConversionState<LIST>> stack = new ArrayDeque<>();
50+
ListConversionState<LIST> state = new ListConversionState<>(value, listSize(value));
5151
while (state != null) {
5252
if (state.isFirst()) {
5353
onStart(state);
@@ -57,7 +57,7 @@ public final String convert(TList value, TAcc acc) {
5757
state.incPos();
5858
if (isSubList(item)) {
5959
stack.push(state);
60-
TList list = (TList) item;
60+
LIST list = (LIST) item;
6161
state = new ListConversionState<>(list, listSize(list));
6262
} else {
6363
onItem(item, state);
@@ -77,19 +77,19 @@ public final String convert(TList value, TAcc acc) {
7777
return buildString();
7878
}
7979

80-
public static final class ListConversionState<TList> {
80+
public static final class ListConversionState<LIST> {
8181

82-
final TList list;
82+
final LIST list;
8383
int position;
8484
int size;
8585

86-
public ListConversionState(TList list, int size) {
86+
private ListConversionState(LIST list, int size) {
8787
this.list = list;
8888
this.position = 0;
8989
this.size = size;
9090
}
9191

92-
public TList getList() {
92+
public LIST getList() {
9393
return list;
9494
}
9595

@@ -110,7 +110,7 @@ public boolean isFirst() {
110110
}
111111
}
112112

113-
public static abstract class BaseArrayWriter extends BaseCollectionWriter<Object> {
113+
public abstract static class BaseArrayWriter extends BaseCollectionWriter<Object> {
114114

115115
protected BaseArrayWriter() {
116116
super(", ");
@@ -137,9 +137,9 @@ protected Object getNext(ListConversionState<Object> state) {
137137
}
138138
}
139139

140-
public static abstract class BaseListWriter
140+
public abstract static class BaseListWriter
141141
extends BaseCollectionWriter<List<?>> {
142-
public BaseListWriter() {
142+
protected BaseListWriter() {
143143
super(", ");
144144
}
145145

@@ -164,7 +164,7 @@ protected Object getNext(ListConversionState<List<?>> state) {
164164
}
165165
}
166166

167-
public static abstract class BaseCollectionWriter<T> extends
167+
public abstract static class BaseCollectionWriter<T> extends
168168
BaseCollectionConverter<Appendable, T> {
169169

170170
protected Appendable appendable;

0 commit comments

Comments
 (0)