Skip to content

Commit a79a703

Browse files
filipecosta90filipecosta90
authored
[add] enforcing https://github.com/google/google-java-format via Git Code Format Maven Plugin (#18)
1 parent 795e041 commit a79a703

File tree

12 files changed

+339
-305
lines changed

12 files changed

+339
-305
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ jobs:
3535
- ~/.m2
3636
key: v1-dependencies-{{ checksum "pom.xml" }}
3737

38+
# validate code format
39+
- run: mvn git-code-format:validate-code-format -Dgcf.globPattern=**/*
3840
# run tests!
39-
- run: mvn integration-test
41+
- run: mvn integration-test
4042
- run: mvn cobertura:cobertura
4143
- run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
4244

‎pom.xml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,26 @@
153153
</configuration>
154154
</plugin>
155155
<plugin>
156-
<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
157-
<artifactId>maven-java-formatter-plugin</artifactId>
158-
<version>0.4</version>
159-
<configuration>
160-
<configFile>${project.basedir}/hbase-formatter.xml</configFile>
161-
</configuration>
156+
<groupId>com.cosium.code</groupId>
157+
<artifactId>git-code-format-maven-plugin</artifactId>
158+
<version>2.4</version>
159+
<executions>
160+
<!-- On commit, format the modified java files -->
161+
<execution>
162+
<id>install-formatter-hook</id>
163+
<goals>
164+
<goal>install-hooks</goal>
165+
</goals>
166+
</execution>
167+
<!-- On Maven verify phase, fail if any file
168+
(including unmodified) is badly formatted -->
169+
<execution>
170+
<id>validate-code-format</id>
171+
<goals>
172+
<goal>validate-code-format</goal>
173+
</goals>
174+
</execution>
175+
</executions>
162176
</plugin>
163177
<plugin>
164178
<artifactId>maven-jar-plugin</artifactId>

‎src/main/java/com/redislabs/redisai/Backend.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import redis.clients.jedis.util.SafeEncoder;
55

66
public enum Backend implements ProtocolCommand {
7-
TF, TORCH;
7+
TF,
8+
TORCH;
89

910
private final byte[] raw;
1011

‎src/main/java/com/redislabs/redisai/Command.java

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,25 @@
33
import redis.clients.jedis.commands.ProtocolCommand;
44
import redis.clients.jedis.util.SafeEncoder;
55

6-
public enum Command implements ProtocolCommand{
6+
public enum Command implements ProtocolCommand {
7+
TENSOR_GET("AI.TENSORGET"),
8+
TENSOR_SET("AI.TENSORSET"),
9+
MODEL_GET("AI.MODELGET"),
10+
MODEL_SET("AI.MODELSET"),
11+
MODEL_RUN("AI.MODELRUN"),
12+
SCRIPT_GET("AI.SCRIPTGET"),
13+
SCRIPT_SET("AI.SCRIPTSET"),
14+
SCRIPT_RUN("AI.SCRIPTRUN"),
15+
INFO("AI.INFO"),
16+
CONFIG("AI.CONFIG");
717

8-
TENSOR_GET("AI.TENSORGET"),
9-
TENSOR_SET("AI.TENSORSET"),
10-
MODEL_GET("AI.MODELGET"),
11-
MODEL_SET("AI.MODELSET"),
12-
MODEL_RUN("AI.MODELRUN"),
13-
SCRIPT_GET("AI.SCRIPTGET"),
14-
SCRIPT_SET("AI.SCRIPTSET"),
15-
SCRIPT_RUN("AI.SCRIPTRUN"),
16-
INFO("AI.INFO"),
17-
CONFIG("AI.CONFIG");
18+
private final byte[] raw;
1819

19-
20-
private final byte[] raw;
20+
Command(String alt) {
21+
raw = SafeEncoder.encode(alt);
22+
}
2123

22-
Command(String alt) {
23-
raw = SafeEncoder.encode(alt);
24-
}
25-
26-
public byte[] getRaw() {
27-
return raw;
28-
}
29-
}
24+
public byte[] getRaw() {
25+
return raw;
26+
}
27+
}

‎src/main/java/com/redislabs/redisai/DataType.java

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,99 +4,97 @@
44
import java.util.ArrayList;
55
import java.util.HashMap;
66
import java.util.List;
7-
87
import redis.clients.jedis.Protocol;
98
import redis.clients.jedis.commands.ProtocolCommand;
109
import redis.clients.jedis.util.SafeEncoder;
1110

12-
public enum DataType implements ProtocolCommand{
13-
11+
public enum DataType implements ProtocolCommand {
1412
INT32 {
1513
@Override
16-
public List<byte[]> toByteArray(Object obj){
17-
int[] values = (int[])obj;
14+
public List<byte[]> toByteArray(Object obj) {
15+
int[] values = (int[]) obj;
1816
List<byte[]> res = new ArrayList<>(values.length);
19-
for(int value : values) {
17+
for (int value : values) {
2018
res.add(Protocol.toByteArray(value));
2119
}
2220
return res;
2321
}
2422

2523
@Override
2624
protected Object toObject(List<byte[]> data) {
27-
int [] values = new int[data.size()];
25+
int[] values = new int[data.size()];
2826
for (int i = 0; i < data.size(); i++) {
2927
values[i] = Integer.parseInt(SafeEncoder.encode(data.get(i)));
3028
}
3129
return values;
3230
}
33-
},
31+
},
3432
INT64 {
3533
@Override
36-
public List<byte[]> toByteArray(Object obj){
37-
long[] values = (long[])obj;
34+
public List<byte[]> toByteArray(Object obj) {
35+
long[] values = (long[]) obj;
3836
List<byte[]> res = new ArrayList<>(values.length);
39-
for(long value : values) {
37+
for (long value : values) {
4038
res.add(Protocol.toByteArray(value));
4139
}
4240
return res;
4341
}
4442

4543
@Override
4644
protected Object toObject(List<byte[]> data) {
47-
long [] values = new long[data.size()];
45+
long[] values = new long[data.size()];
4846
for (int i = 0; i < data.size(); i++) {
4947
values[i] = Long.parseLong(SafeEncoder.encode(data.get(i)));
5048
}
5149
return values;
5250
}
53-
},
51+
},
5452
FLOAT {
5553
@Override
56-
public List<byte[]> toByteArray(Object obj){
57-
float[] values = (float[])obj;
54+
public List<byte[]> toByteArray(Object obj) {
55+
float[] values = (float[]) obj;
5856
List<byte[]> res = new ArrayList<>(values.length);
59-
for(float value : values) {
57+
for (float value : values) {
6058
res.add(Protocol.toByteArray(value));
6159
}
6260
return res;
6361
}
6462

6563
@Override
6664
protected Object toObject(List<byte[]> data) {
67-
float [] values = new float[data.size()];
65+
float[] values = new float[data.size()];
6866
for (int i = 0; i < data.size(); i++) {
6967
values[i] = Float.parseFloat(SafeEncoder.encode(data.get(i)));
7068
}
7169
return values;
7270
}
73-
},
71+
},
7472
DOUBLE {
7573
@Override
76-
public List<byte[]> toByteArray(Object obj){
77-
double[] values = (double[])obj;
74+
public List<byte[]> toByteArray(Object obj) {
75+
double[] values = (double[]) obj;
7876
List<byte[]> res = new ArrayList<>(values.length);
79-
for(double value : values) {
77+
for (double value : values) {
8078
res.add(Protocol.toByteArray(value));
8179
}
8280
return res;
8381
}
8482

8583
@Override
8684
protected Object toObject(List<byte[]> data) {
87-
double [] values = new double[data.size()];
85+
double[] values = new double[data.size()];
8886
for (int i = 0; i < data.size(); i++) {
8987
values[i] = Double.parseDouble(SafeEncoder.encode(data.get(i)));
9088
}
9189
return values;
9290
}
93-
},
91+
},
9492
STRING {
9593
@Override
96-
public List<byte[]> toByteArray(Object obj){
97-
byte[] values = (byte[])obj;
94+
public List<byte[]> toByteArray(Object obj) {
95+
byte[] values = (byte[]) obj;
9896
List<byte[]> res = new ArrayList<>(values.length);
99-
for(byte value : values) {
97+
for (byte value : values) {
10098
res.add(Protocol.toByteArray(value));
10199
}
102100
return res;
@@ -106,13 +104,13 @@ public List<byte[]> toByteArray(Object obj){
106104
protected Object toObject(List<byte[]> data) {
107105
return data;
108106
}
109-
},
107+
},
110108
BOOL {
111109
@Override
112-
public List<byte[]> toByteArray(Object obj){
113-
boolean[] values = (boolean[])obj;
110+
public List<byte[]> toByteArray(Object obj) {
111+
boolean[] values = (boolean[]) obj;
114112
List<byte[]> res = new ArrayList<>(values.length);
115-
for(boolean value : values) {
113+
for (boolean value : values) {
116114
res.add(Protocol.toByteArray(value));
117115
}
118116
return res;
@@ -128,6 +126,7 @@ protected Object toObject(List<byte[]> data) {
128126
private final byte[] raw;
129127

130128
private static final HashMap<Class<?>, DataType> classDataTypes = new HashMap<>();
129+
131130
static {
132131
classDataTypes.put(int.class, DataType.INT32);
133132
classDataTypes.put(Integer.class, DataType.INT32);
@@ -149,29 +148,30 @@ protected Object toObject(List<byte[]> data) {
149148

150149
static DataType getDataTypefromString(String dtypeRaw) {
151150
DataType dt = null;
152-
if (dtypeRaw.equals(DataType.INT32.name())){
153-
dt=DataType.INT32;
151+
if (dtypeRaw.equals(DataType.INT32.name())) {
152+
dt = DataType.INT32;
154153
}
155-
if (dtypeRaw.equals(DataType.INT64.name())){
156-
dt=DataType.INT64;
154+
if (dtypeRaw.equals(DataType.INT64.name())) {
155+
dt = DataType.INT64;
157156
}
158-
if (dtypeRaw.equals(DataType.FLOAT.name())){
159-
dt=DataType.FLOAT;
157+
if (dtypeRaw.equals(DataType.FLOAT.name())) {
158+
dt = DataType.FLOAT;
160159
}
161-
if (dtypeRaw.equals(DataType.DOUBLE.name())){
162-
dt=DataType.DOUBLE;
160+
if (dtypeRaw.equals(DataType.DOUBLE.name())) {
161+
dt = DataType.DOUBLE;
163162
}
164163
return dt;
165164
}
166165

167166
protected abstract List<byte[]> toByteArray(Object obj);
167+
168168
protected abstract Object toObject(List<byte[]> data);
169169

170170
public byte[] getRaw() {
171171
return raw;
172172
}
173173

174-
public List<byte[]> toByteArray(Object obj, int[] dimensions){
174+
public List<byte[]> toByteArray(Object obj, int[] dimensions) {
175175
return toByteArray(obj, dimensions, 0, this);
176176
}
177177

@@ -185,14 +185,14 @@ public static DataType baseObjType(Object o) {
185185
if (ret != null) {
186186
return ret;
187187
}
188-
throw new IllegalArgumentException("cannot create Tensors of type " + c.getName());
188+
throw new IllegalArgumentException("cannot create Tensors of type " + c.getName());
189189
}
190-
190+
191191
private static List<byte[]> toByteArray(Object obj, int[] dimensions, int dim, DataType type) {
192192
ArrayList<byte[]> res = new ArrayList<>();
193-
if(dimensions.length > dim+1) {
193+
if (dimensions.length > dim + 1) {
194194
int dimension = dimensions[dim++];
195-
for(int i=0 ; i < dimension; ++i) {
195+
for (int i = 0; i < dimension; ++i) {
196196
Object value = Array.get(obj, i);
197197
res.addAll(toByteArray(value, dimensions, dim, type));
198198
}
@@ -202,5 +202,3 @@ private static List<byte[]> toByteArray(Object obj, int[] dimensions, int dim, D
202202
return res;
203203
}
204204
}
205-
206-

‎src/main/java/com/redislabs/redisai/Device.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import redis.clients.jedis.commands.ProtocolCommand;
44
import redis.clients.jedis.util.SafeEncoder;
55

6-
public enum Device implements ProtocolCommand{
7-
CPU, GPU;
6+
public enum Device implements ProtocolCommand {
7+
CPU,
8+
GPU;
89

910
private final byte[] raw;
1011

@@ -14,5 +15,5 @@ public enum Device implements ProtocolCommand{
1415

1516
public byte[] getRaw() {
1617
return raw;
17-
}
18+
}
1819
}

‎src/main/java/com/redislabs/redisai/Keyword.java

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,25 @@
33
import redis.clients.jedis.commands.ProtocolCommand;
44
import redis.clients.jedis.util.SafeEncoder;
55

6-
public enum Keyword implements ProtocolCommand{
6+
public enum Keyword implements ProtocolCommand {
7+
TENSOR,
8+
INPUTS,
9+
OUTPUTS,
10+
META,
11+
VALUES,
12+
BLOB,
13+
SOURCE,
14+
RESETSTAT,
15+
BACKENDSPATH,
16+
LOADBACKEND;
717

8-
TENSOR, INPUTS, OUTPUTS, META, VALUES, BLOB, SOURCE, RESETSTAT, BACKENDSPATH, LOADBACKEND;
9-
10-
private final byte[] raw;
18+
private final byte[] raw;
1119

12-
Keyword() {
13-
raw = SafeEncoder.encode(this.name());
14-
}
20+
Keyword() {
21+
raw = SafeEncoder.encode(this.name());
22+
}
1523

16-
public byte[] getRaw() {
17-
return raw;
18-
}
19-
}
24+
public byte[] getRaw() {
25+
return raw;
26+
}
27+
}

0 commit comments

Comments
 (0)