Skip to content

Commit 3423e01

Browse files
olim7tolim7t
committed
Address ErrorProne warnings
1 parent adebb92 commit 3423e01

53 files changed

Lines changed: 118 additions & 88 deletions

File tree

Some content is hidden

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

‎core/src/main/java/com/datastax/oss/driver/api/core/CoreProtocolVersion.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public enum CoreProtocolVersion implements ProtocolVersion {
4747
this.beta = beta;
4848
}
4949

50+
@Override
5051
public int getCode() {
5152
return code;
5253
}

‎core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ public interface DriverConfigLoader extends AutoCloseable {
3535
* Called when the cluster closes. This is a good time to release any external resource, for
3636
* example cancel a scheduled reloading task.
3737
*/
38+
@Override
3839
void close();
3940
}

‎core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public ExponentialReconnectionPolicy(DriverContext context) {
5858

5959
// Maximum number of attempts after which we overflow
6060
int ceil = (baseDelayMs & (baseDelayMs - 1)) == 0 ? 0 : 1;
61-
this.maxAttempts = 64 - Long.numberOfLeadingZeros(Long.MAX_VALUE / baseDelayMs) - ceil;
61+
this.maxAttempts = 64L - Long.numberOfLeadingZeros(Long.MAX_VALUE / baseDelayMs) - ceil;
6262
}
6363

6464
/**

‎core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public SimpleStatementBuilder clearNamedValues() {
121121
return this;
122122
}
123123

124+
@Override
124125
public SimpleStatement build() {
125126
return new DefaultSimpleStatement(
126127
query,

‎core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,10 @@ public Builder(boolean isNegative) {
351351
public Builder addYears(long numberOfYears) {
352352
validateOrder(1);
353353
validateMonths(numberOfYears, MONTHS_PER_YEAR);
354-
months += numberOfYears * MONTHS_PER_YEAR;
354+
// Cast to avoid http://errorprone.info/bugpattern/NarrowingCompoundAssignment
355+
// We could also change the method to accept an int, but keeping long allows us to keep the
356+
// calling code generic.
357+
months += (int) numberOfYears * MONTHS_PER_YEAR;
355358
return this;
356359
}
357360

@@ -364,7 +367,7 @@ public Builder addYears(long numberOfYears) {
364367
public Builder addMonths(long numberOfMonths) {
365368
validateOrder(2);
366369
validateMonths(numberOfMonths, 1);
367-
months += numberOfMonths;
370+
months += (int) numberOfMonths;
368371
return this;
369372
}
370373

@@ -377,7 +380,7 @@ public Builder addMonths(long numberOfMonths) {
377380
public Builder addWeeks(long numberOfWeeks) {
378381
validateOrder(3);
379382
validateDays(numberOfWeeks, DAYS_PER_WEEK);
380-
days += numberOfWeeks * DAYS_PER_WEEK;
383+
days += (int) numberOfWeeks * DAYS_PER_WEEK;
381384
return this;
382385
}
383386

@@ -390,7 +393,7 @@ public Builder addWeeks(long numberOfWeeks) {
390393
public Builder addDays(long numberOfDays) {
391394
validateOrder(4);
392395
validateDays(numberOfDays, 1);
393-
days += numberOfDays;
396+
days += (int) numberOfDays;
394397
return this;
395398
}
396399

‎core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ default String asCql(boolean includeFrozen, boolean pretty) {
2929
return String.format("'%s'", getClassName());
3030
}
3131

32+
@Override
3233
default int getProtocolCode() {
3334
return ProtocolConstants.DataType.CUSTOM;
3435
}

‎core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ default String asCql(boolean includeFrozen, boolean pretty) {
2828
return String.format(template, getElementType().asCql(includeFrozen, pretty));
2929
}
3030

31+
@Override
3132
default int getProtocolCode() {
3233
return ProtocolConstants.DataType.LIST;
3334
}

‎core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ default String asCql(boolean includeFrozen, boolean pretty) {
3333
getValueType().asCql(includeFrozen, pretty));
3434
}
3535

36+
@Override
3637
default int getProtocolCode() {
3738
return ProtocolConstants.DataType.MAP;
3839
}

‎core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ default String asCql(boolean includeFrozen, boolean pretty) {
2828
return String.format(template, getElementType().asCql(includeFrozen, pretty));
2929
}
3030

31+
@Override
3132
default int getProtocolCode() {
3233
return ProtocolConstants.DataType.SET;
3334
}

‎core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ default String asCql(boolean includeFrozen, boolean pretty) {
4747
return builder.toString();
4848
}
4949

50+
@Override
5051
default int getProtocolCode() {
5152
return ProtocolConstants.DataType.TUPLE;
5253
}

0 commit comments

Comments
 (0)