Make codacy-bot happy

Mairbek Khadikov · Mairbek Khadikov · commit 94ca80de3a57 · 2017-04-18T17:57:19.000-07:00
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
@@ -121,7 +121,7 @@ static Object fromTypedProto(Value proto) {
     return decodeValue(type, proto.getListValue().getValues(1));
   }
 
-  private static Object decodeValue(Type fieldType, com.google.protobuf.Value proto) {
+  private static Object decodeValue(Type fieldType, Value proto) {
     if (proto.getKindCase() == Value.KindCase.NULL_VALUE) {
       return null;
     }
@@ -263,7 +263,7 @@ private static void checkType(Type fieldType, Value proto, Value.KindCase expect
     }
   }
 
-  private static double valueProtoToFloat64(com.google.protobuf.Value proto) {
+  private static double valueProtoToFloat64(Value proto) {
     if (proto.getKindCase() == Value.KindCase.STRING_VALUE) {
       switch (proto.getStringValue()) {
         case "-Infinity":
@@ -296,7 +296,7 @@ private static NullPointerException throwNotNull(int columnIndex) {
         "Cannot call array getter for column " + columnIndex + " with null elements");
   }
 
-  boolean consumeRow(Iterator<com.google.protobuf.Value> iterator) {
+  boolean consumeRow(Iterator<Value> iterator) {
     rowData.clear();
     if (!iterator.hasNext()) {
       return false;
@@ -307,7 +307,7 @@ boolean consumeRow(Iterator<com.google.protobuf.Value> iterator) {
             ErrorCode.INTERNAL,
             "Invalid value stream: end of stream reached before row is complete");
       }
-      com.google.protobuf.Value value = iterator.next();
+      Value value = iterator.next();
       rowData.add(decodeValue(fieldType.getType(), value));
     }
     return true;
@@ -469,7 +469,7 @@ private abstract static class PrimitiveArray<T, A> extends AbstractList<T> {
 
     abstract A newArray(int size);
 
-    abstract void setProto(A array, int i, com.google.protobuf.Value protoValue);
+    abstract void setProto(A array, int i, Value protoValue);
 
     abstract T get(A array, int i);
 
@@ -511,7 +511,7 @@ long[] newArray(int size) {
     }
 
     @Override
-    void setProto(long[] array, int i, com.google.protobuf.Value protoValue) {
+    void setProto(long[] array, int i, Value protoValue) {
       array[i] = Long.parseLong(protoValue.getStringValue());
     }
 
@@ -536,7 +536,7 @@ private static class Float64Array extends PrimitiveArray<Double, double[]> {
     }
 
     @Override
-    void setProto(double[] array, int i, com.google.protobuf.Value protoValue) {
+    void setProto(double[] array, int i, Value protoValue) {
       array[i] = valueProtoToFloat64(protoValue);
     }
 
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Mutation.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Mutation.java
@@ -82,6 +82,8 @@ public enum Op {
     DELETE,
   }
 
+  private static final long serialVersionUID = 1L;
+
   private final String table;
   private final Op operation;
   private final ImmutableList<String> columns;
@@ -407,6 +409,8 @@ static void toProto(Iterable<Mutation> mutations, List<com.google.spanner.v1.Mut
    * A proxy class that handles {@link Mutation} serialization.
    */
   private static class SerializationProxy implements Serializable {
+    private static final long serialVersionUID = 2L;
+
     private com.google.spanner.v1.Mutation proto;
 
     private SerializationProxy(Mutation mutation) {
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
@@ -445,7 +445,7 @@ static Value structArray(Iterable<Type.StructField> fieldTypes, @Nullable Iterab
    */
   com.google.protobuf.Value toTypedProto() {
     com.google.protobuf.Value.Builder valueBuilder = com.google.protobuf.Value.newBuilder();
-    com.google.protobuf.ListValue.Builder listBuilder = valueBuilder.getListValueBuilder();
+    ListValue.Builder listBuilder = valueBuilder.getListValueBuilder();
     listBuilder.addValuesBuilder().setStringValueBytes(getType().toProto().toByteString()).build();
     listBuilder.addValues(toProto());
     return valueBuilder.build();

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ static Object fromTypedProto(Value proto) {`
`121`	`121`	`return decodeValue(type, proto.getListValue().getValues(1));`
`122`	`122`	`}`
`123`	`123`
`124`		`- private static Object decodeValue(Type fieldType, com.google.protobuf.Value proto) {`
	`124`	`+ private static Object decodeValue(Type fieldType, Value proto) {`
`125`	`125`	`if (proto.getKindCase() == Value.KindCase.NULL_VALUE) {`
`126`	`126`	`return null;`
`127`	`127`	`}`
`@@ -263,7 +263,7 @@ private static void checkType(Type fieldType, Value proto, Value.KindCase expect`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`
`266`		`- private static double valueProtoToFloat64(com.google.protobuf.Value proto) {`
	`266`	`+ private static double valueProtoToFloat64(Value proto) {`
`267`	`267`	`if (proto.getKindCase() == Value.KindCase.STRING_VALUE) {`
`268`	`268`	`switch (proto.getStringValue()) {`
`269`	`269`	`case "-Infinity":`
`@@ -296,7 +296,7 @@ private static NullPointerException throwNotNull(int columnIndex) {`
`296`	`296`	`"Cannot call array getter for column " + columnIndex + " with null elements");`
`297`	`297`	`}`
`298`	`298`
`299`		`- boolean consumeRow(Iterator<com.google.protobuf.Value> iterator) {`
	`299`	`+ boolean consumeRow(Iterator<Value> iterator) {`
`300`	`300`	`rowData.clear();`
`301`	`301`	`if (!iterator.hasNext()) {`
`302`	`302`	`return false;`
`@@ -307,7 +307,7 @@ boolean consumeRow(Iterator<com.google.protobuf.Value> iterator) {`
`307`	`307`	`ErrorCode.INTERNAL,`
`308`	`308`	`"Invalid value stream: end of stream reached before row is complete");`
`309`	`309`	`}`
`310`		`- com.google.protobuf.Value value = iterator.next();`
	`310`	`+ Value value = iterator.next();`
`311`	`311`	`rowData.add(decodeValue(fieldType.getType(), value));`
`312`	`312`	`}`
`313`	`313`	`return true;`
`@@ -469,7 +469,7 @@ private abstract static class PrimitiveArray<T, A> extends AbstractList<T> {`
`469`	`469`
`470`	`470`	`abstract A newArray(int size);`
`471`	`471`
`472`		`- abstract void setProto(A array, int i, com.google.protobuf.Value protoValue);`
	`472`	`+ abstract void setProto(A array, int i, Value protoValue);`
`473`	`473`
`474`	`474`	`abstract T get(A array, int i);`
`475`	`475`
`@@ -511,7 +511,7 @@ long[] newArray(int size) {`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`@Override`
`514`		`- void setProto(long[] array, int i, com.google.protobuf.Value protoValue) {`
	`514`	`+ void setProto(long[] array, int i, Value protoValue) {`
`515`	`515`	`array[i] = Long.parseLong(protoValue.getStringValue());`
`516`	`516`	`}`
`517`	`517`
`@@ -536,7 +536,7 @@ private static class Float64Array extends PrimitiveArray<Double, double[]> {`
`536`	`536`	`}`
`537`	`537`
`538`	`538`	`@Override`
`539`		`- void setProto(double[] array, int i, com.google.protobuf.Value protoValue) {`
	`539`	`+ void setProto(double[] array, int i, Value protoValue) {`
`540`	`540`	`array[i] = valueProtoToFloat64(protoValue);`
`541`	`541`	`}`
`542`	`542`