Skip to content

Commit a522d8a

Browse files
nicktorwaldTotktonada
nicktorwald
authored and
Totktonada
committed
Follow a new checkstyle
1 parent 06755d5 commit a522d8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1570
-1284
lines changed

‎src/main/java/org/tarantool/AbstractTarantoolOps.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.tarantool;
22

33

4-
public abstract class AbstractTarantoolOps<Space, Tuple, Operation, Result> implements TarantoolClientOps<Space, Tuple, Operation, Result> {
4+
public abstract class AbstractTarantoolOps<Space, Tuple, Operation, Result>
5+
implements TarantoolClientOps<Space, Tuple, Operation, Result> {
6+
57
private Code callCode = Code.OLD_CALL;
68

79
protected abstract Result exec(Code code, Object... args);
@@ -11,7 +13,15 @@ public Result select(Space space, Space index, Tuple key, int offset, int limit,
1113
}
1214

1315
public Result select(Space space, Space index, Tuple key, int offset, int limit, int iterator) {
14-
return exec(Code.SELECT, Key.SPACE, space, Key.INDEX, index, Key.KEY, key, Key.ITERATOR, iterator, Key.LIMIT, limit, Key.OFFSET, offset);
16+
return exec(
17+
Code.SELECT,
18+
Key.SPACE, space,
19+
Key.INDEX, index,
20+
Key.KEY, key,
21+
Key.ITERATOR, iterator,
22+
Key.LIMIT, limit,
23+
Key.OFFSET, offset
24+
);
1525
}
1626

1727
public Result insert(Space space, Tuple tuple) {

‎src/main/java/org/tarantool/Base64.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.tarantool;
22

33
public class Base64 {
4-
static String charSet =
5-
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
4+
static final String CHAR_SET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
65

76
public static byte[] decode(String s) {
87
int end = 0;
@@ -16,7 +15,7 @@ public static byte[] decode(String s) {
1615
byte[] result = new byte[len];
1716
int dst = 0;
1817
for (int src = 0; src < s.length(); src++) {
19-
int code = charSet.indexOf(s.charAt(src));
18+
int code = CHAR_SET.indexOf(s.charAt(src));
2019
if (code == -1) {
2120
break;
2221
}
@@ -35,8 +34,10 @@ public static byte[] decode(String s) {
3534
case 3:
3635
result[dst++] |= (byte) (code & 0x3f);
3736
break;
37+
default:
38+
break;
3839
}
3940
}
4041
return result;
4142
}
42-
}
43+
}

‎src/main/java/org/tarantool/Code.java

+13-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,19 @@
22

33

44
public enum Code {
5-
SELECT(1), INSERT(2), REPLACE(3), UPDATE(4),
6-
DELETE(5), OLD_CALL(6), AUTH(7), EVAL(8), UPSERT(9), CALL(10), EXECUTE(11) , PING(64), SUBSCRIBE(66),;
5+
SELECT(1),
6+
INSERT(2),
7+
REPLACE(3),
8+
UPDATE(4),
9+
DELETE(5),
10+
OLD_CALL(6),
11+
AUTH(7),
12+
EVAL(8),
13+
UPSERT(9),
14+
CALL(10),
15+
EXECUTE(11),
16+
PING(64),
17+
SUBSCRIBE(66);
718

819
int id;
920

‎src/main/java/org/tarantool/CommunicationException.java

+22-28
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
package org.tarantool;
22

33
/**
4-
* <p>
54
* CommunicationException class.
6-
* </p>
7-
*
5+
*
86
* @author dgreen
97
* @version $Id: $
108
*/
119
public class CommunicationException extends RuntimeException {
1210

13-
/**
14-
* <p>
15-
* Constructor for CommunicationException.
16-
* </p>
17-
*
18-
* @param message
19-
* a {@link java.lang.String} object.
20-
* @param cause
21-
* a {@link java.lang.Throwable} object.
22-
*/
23-
public CommunicationException(String message, Throwable cause) {
24-
super(message, cause);
25-
}
11+
/**
12+
* Constructor for CommunicationException.
13+
*
14+
* @param message
15+
* a {@link java.lang.String} object.
16+
* @param cause
17+
* a {@link java.lang.Throwable} object.
18+
*/
19+
public CommunicationException(String message, Throwable cause) {
20+
super(message, cause);
21+
}
2622

27-
/**
28-
* <p>
29-
* Constructor for CommunicationException.
30-
* </p>
31-
*
32-
* @param message
33-
* a {@link java.lang.String} object.
34-
*/
35-
public CommunicationException(String message) {
36-
super(message);
37-
}
23+
/**
24+
* Constructor for CommunicationException.
25+
*
26+
* @param message
27+
* a {@link java.lang.String} object.
28+
*/
29+
public CommunicationException(String message) {
30+
super(message);
31+
}
3832

39-
private static final long serialVersionUID = 1L;
33+
private static final long serialVersionUID = 1L;
4034

4135
}

‎src/main/java/org/tarantool/Iterator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public enum Iterator {
2424
public int getValue() {
2525
return value;
2626
}
27-
}
27+
}

‎src/main/java/org/tarantool/JDBCBridge.java

+34-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
package org.tarantool;
22

3+
import org.tarantool.protocol.TarantoolPacket;
4+
35
import java.util.ArrayList;
46
import java.util.Collections;
57
import java.util.LinkedHashMap;
68
import java.util.List;
79
import java.util.ListIterator;
810
import java.util.Map;
911

10-
import org.tarantool.jdbc.SQLResultSet;
11-
import org.tarantool.protocol.TarantoolPacket;
12-
1312
public class JDBCBridge {
1413

15-
public static final JDBCBridge EMPTY = new JDBCBridge(Collections.<TarantoolBase.SQLMetaData>emptyList(), Collections.<List<Object>>emptyList());
14+
public static final JDBCBridge EMPTY = new JDBCBridge(Collections.emptyList(), Collections.emptyList());
1615

1716
final List<TarantoolBase.SQLMetaData> sqlMetadata;
18-
final Map<String,Integer> columnsByName;
17+
final Map<String, Integer> columnsByName;
1918
final List<List<Object>> rows;
2019

2120
protected JDBCBridge(TarantoolPacket pack) {
@@ -31,33 +30,49 @@ protected JDBCBridge(List<TarantoolBase.SQLMetaData> sqlMetadata, List<List<Obje
3130
}
3231
}
3332

34-
public static JDBCBridge query(TarantoolConnection connection, String sql, Object ... params) {
33+
public static JDBCBridge query(TarantoolConnection connection, String sql, Object... params) {
3534
TarantoolPacket pack = connection.sql(sql, params);
3635
return new JDBCBridge(pack);
3736
}
3837

39-
public static int update(TarantoolConnection connection, String sql, Object ... params) {
38+
public static int update(TarantoolConnection connection, String sql, Object... params) {
4039
return connection.update(sql, params).intValue();
4140
}
4241

43-
public static JDBCBridge mock(List<String> fields, List<List<Object>> values) {
44-
List<TarantoolBase.SQLMetaData> meta = new ArrayList<TarantoolBase.SQLMetaData>(fields.size());
45-
for(String field : fields) {
46-
meta.add(new TarantoolBase.SQLMetaData(field));
42+
/**
43+
* Constructs a JDBCBridge with a predefined data.
44+
*
45+
* @param fields fields metadata
46+
* @param values tuples
47+
*
48+
* @return bridge
49+
*/
50+
public static JDBCBridge mock(List<String> fields, List<List<Object>> values) {
51+
List<TarantoolBase.SQLMetaData> meta = new ArrayList<>(fields.size());
52+
for (String field : fields) {
53+
meta.add(new TarantoolBase.SQLMetaData(field));
4754
}
4855
return new JDBCBridge(meta, values);
4956
}
5057

51-
public static Object execute(TarantoolConnection connection, String sql, Object ... params) {
58+
/**
59+
* Constructs a JDBCBridge with a parsed query result.
60+
*
61+
* @param connection connection to be used
62+
* @param sql query string
63+
* @param params query binding parameters
64+
*
65+
* @return bridge
66+
*/
67+
public static Object execute(TarantoolConnection connection, String sql, Object... params) {
5268
TarantoolPacket pack = connection.sql(sql, params);
5369
Long rowCount = SqlProtoUtils.getSqlRowCount(pack);
54-
if(rowCount == null) {
70+
if (rowCount == null) {
5571
return new JDBCBridge(pack);
5672
}
5773
return rowCount.intValue();
5874
}
5975

60-
6176
public String getColumnName(int columnIndex) {
6277
return columnIndex > sqlMetadata.size() ? null : sqlMetadata.get(columnIndex - 1).getName();
6378
}
@@ -81,9 +96,10 @@ public int size() {
8196
@Override
8297
public String toString() {
8398
return "JDBCBridge{" +
84-
"sqlMetadata=" + sqlMetadata +
85-
", columnsByName=" + columnsByName +
86-
", rows=" + rows +
87-
'}';
99+
"sqlMetadata=" + sqlMetadata +
100+
", columnsByName=" + columnsByName +
101+
", rows=" + rows +
102+
'}';
88103
}
104+
89105
}

‎src/main/java/org/tarantool/Key.java

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
package org.tarantool;
22

3-
43
import java.util.concurrent.Callable;
54

65
public enum Key implements Callable<Integer> {
7-
//header
8-
CODE(0x00), SYNC(0x01), SCHEMA_ID(0x05),
96

10-
//body
11-
SPACE(0x10), INDEX(0x11),
12-
LIMIT(0x12), OFFSET(0x13),
7+
// header
8+
CODE(0x00),
9+
SYNC(0x01),
10+
SCHEMA_ID(0x05),
11+
12+
// body
13+
SPACE(0x10),
14+
INDEX(0x11),
15+
LIMIT(0x12),
16+
OFFSET(0x13),
1317
ITERATOR(0x14),
1418

1519
KEY(0x20),
16-
TUPLE(0x21), FUNCTION(0x22),
17-
USER_NAME(0x23),EXPRESSION(0x27),
20+
TUPLE(0x21),
21+
FUNCTION(0x22),
22+
USER_NAME(0x23),
23+
EXPRESSION(0x27),
1824
UPSERT_OPS(0x28),
19-
DATA(0x30), ERROR(0x31),
25+
DATA(0x30),
26+
ERROR(0x31),
2027

2128
SQL_FIELD_NAME(0),
2229
SQL_METADATA(0x32),
@@ -45,9 +52,9 @@ public static Key getById(int id) {
4552
return null;
4653
}
4754

48-
4955
@Override
5056
public Integer call() throws Exception {
5157
return id;
5258
}
59+
5360
}

0 commit comments

Comments
 (0)