8000 Feature/fix lint warnings (#409) · chakra-coder/rsocket-java@64fea50 · GitHub
[go: up one dir, main page]

Skip to content

Commit 64fea50

Browse files
qweekyschimke
authored andcommitted
Feature/fix lint warnings (rsocket#409)
* fix cast warnings warning: [cast] redundant cast to int * fix fallthrough warnings warning: [fallthrough] possible fall-through into case * fix serial warnings warning: [serial] serializable class has no definition of serialVersionUID * fix try warnings warning: [try] auto-closeable resource AeronChannel has a member method close() that could throw InterruptedException * update compile settings update java compiler lint arguments
1 parent 41d3a45 commit 64fea50

20 files changed

+63
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ subprojects {
4747
compileJava {
4848
sourceCompatibility = 1.8
4949
targetCompatibility = 1.8
50-
options.compilerArgs << "-Xlint:deprecation" // << "-Xlint:unchecked"
50+
options.compilerArgs << '-Xlint:all,-overloads,-rawtypes,-unchecked'
5151
}
5252

5353
ext {

rsocket-core/src/main/java/io/rsocket/exceptions/CancelException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
1919

2020
public class CancelException extends RSocketException {
21+
22+
private static final long serialVersionUID = 3579712120019438212L;
23+
2124
public CancelException(String message) {
2225
super(message);
2326
}

rsocket-core/src/main/java/io/rsocket/exceptions/ConnectionCloseException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import io.rsocket.frame.ErrorFrameFlyweight;
44

55
public class ConnectionCloseException extends RSocketException {
6+
7+
private static final long serialVersionUID = -7659717517940756969L;
8+
69
public ConnectionCloseException(String message) {
710
super(message);
811
}

rsocket-core/src/main/java/io/rsocket/exceptions/ConnectionException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
1919

2020
public class ConnectionException extends RSocketException implements Retryable {
21+
22+
private static final long serialVersionUID = -6565180364631212778L;
23+
2124
public ConnectionException(String message) {
2225
super(message);
2326
}

rsocket-core/src/main/java/io/rsocket/exceptions/InvalidRequestException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
1919

2020
public class InvalidRequestException extends RSocketException {
21+
22+
private static final long serialVersionUID = 812240443606264942L;
23+
2124
public InvalidRequestException(String message) {
2225
super(message);
2326
}

rsocket-core/src/main/java/io/rsocket/exceptions/InvalidSetupException.java

Lines changed: 3 additions & 0 deletions
19
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
19

2020
public class InvalidSetupException extends SetupException {
21+
22+
private static final long serialVersionUID = -6685677299580579050L;
23+
2124
public InvalidSetupException(String message) {
2225
super(message);
2326
}

rsocket-core/src/main/java/io/rsocket/exceptions/NoAvailableRSocketException.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@
1515
*/
1616
package io.rsocket.exceptions;
1717

18-
public class NoAvailableRSocketException extends Exception {}
18+
public class NoAvailableRSocketException extends Exception {
19+
20+
private static final long serialVersionUID = 7608370678694273507L;
21+
}

rsocket-core/src/main/java/io/rsocket/exceptions/RSocketException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package io.rsocket.exceptions;
22

33
public abstract class RSocketException extends RuntimeException {
4+
5+
private static final long serialVersionUID = 2912815394105575423L;
6+
47
public RSocketException(String message) {
58
super(message);
69
}

rsocket-core/src/main/java/io/rsocket/exceptions/RejectedException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
1919

2020
public class RejectedException extends RSocketException implements Retryable {
21+
22+
private static final long serialVersionUID = 2773784636669279750L;
23+
2124
public RejectedException(String message) {
2225
super(message);
2326
}

rsocket-core/src/main/java/io/rsocket/exceptions/RejectedResumeException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import io.rsocket.frame.ErrorFrameFlyweight;
44

55
public class RejectedResumeException extends RSocketException {
6+
7+
private static final long serialVersionUID = 6953301234450438491L;
8+
69
public RejectedResumeException(String message) {
710
super(message);
811
}

rsocket-core/src/main/java/io/rsocket/exceptions/RejectedSetupException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
1919

2020
public class RejectedSetupException extends SetupException implements Retryable {
21+
22+
private static final long serialVersionUID = -4932830657505898008L;
23+
2124
public RejectedSetupException(String message) {
2225
super(message);
2326
}

rsocket-core/src/main/java/io/rsocket/exceptions/SetupException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
package io.rsocket.exceptions;
1717

1818
public abstract class SetupException extends RSocketException {
19+
20+
private static final long serialVersionUID = -2928269501877732756L;
21+
1922
public SetupException(String message) {
2023
super(message);
2124
}

rsocket-core/src/main/java/io/rsocket/exceptions/TransportException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
package io.rsocket.exceptions;
1717

1818
public class TransportException extends Throwable {
19+
20+
private static final long serialVersionUID = 7541914004190564240L;
21+
1922
public TransportException(Throwable t) {
2023
super(t);
2124
}

rsocket-core/src/main/java/io/rsocket/exceptions/UnsupportedSetupException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import io.rsocket.frame.ErrorFrameFlyweight;
1919

2020
public class UnsupportedSetupException extends SetupException {
21+
22+
private static final long serialVersionUID = -2533421488941132736L;
23+
2124
public UnsupportedSetupException(String message) {
2225
super(message);
2326
}

rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/server/JavaServerDriver.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ public void parse(List<String> lines) {
190190
break;
191191
case "channel":
192192
handleChannel(args, lineIterator);
193+
break;
193194
case "echochannel":
195+
handleChannel(args, lineIterator);
194196
requestEchoChannel.add(new Tuple<>(args[1], args[2]));
195197
break;
196198
default:

rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/NotConnectedException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
package io.rsocket.aeron.internal;
1717

1818
public class NotConnectedException extends RuntimeException {
19+
20+
private static final long serialVersionUID = -5521573868855763403L;
21+
1922
public NotConnectedException() {
2023
super();
2124
}

rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/TimedOutException.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@
1515
*/
1616
package io.rsocket.aeron.internal;
1717

18-
public class TimedOutException extends RuntimeException {}
18+
public class TimedOutException extends RuntimeException {
19+
20+
private static final long serialVersionUID = 6252022225519863073L;
21+
}

rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/reactivestreams/AeronChannel.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.aeron.Publication;
1919
import io.aeron.Subscription;
2020
import io.rsocket.aeron.internal.EventLoop;
21+
import java.io.IOException;
2122
import java.util.Objects;
2223
import org.agrona.DirectBuffer;
2324
import reactor.core.publisher.Flux;
@@ -77,12 +78,12 @@ public Flux<? extends DirectBuffer> receive() {
7778
}
7879

7980
@Override
80-
public void close() throws Exception {
81+
public void close() throws IOException {
8182
try {
8283
destination.close();
8384
source.close();
8485
} catch (Throwable t) {
85-
throw new Exception(t);
86+
throw new IOException(t);
8687
}
8788
}
8889

rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/reactivestreams/AeronSocketAddress.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/** SocketAddress that represents an Aeron Channel */
2222
public class AeronSocketAddress extends SocketAddress {
2323
private static final String FORMAT = "%s?endpoint=%s:%d";
24+
private static final long serialVersionUID = -7691068719112973697L;
2425
private final String protocol;
2526
private final String host;
2627
private final int port;

rsocket-transport-aeron/src/main/java/io/rsocket/aeron/internal/reactivestreams/messages/ConnectEncoder.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public ConnectEncoder putSendingChannel(
183183
final int headerLength = 4;
184184
final int limit = parentMessage.limit();
185185
parentMessage.limit(limit + headerLength + length);
186-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
186+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
187187
buffer.putBytes(limit + headerLength, src, srcOffset, length);
188188

189189
return this;
@@ -197,7 +197,7 @@ public ConnectEncoder putSendingChannel(final byte[] src, final int srcOffset, f
197197
final int headerLength = 4;
198198
final int limit = parentMessage.limit();
199199
parentMessage.limit(limit + headerLength + length);
200-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
200+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
201201
buffer.putBytes(limit + headerLength, src, srcOffset, length);
202202

203203
return this;
@@ -219,7 +219,7 @@ public ConnectEncoder sendingChannel(final String value) {
219219
final int headerLength = 4;
220220
final int limit = parentMessage.limit();
221221
parentMessage.limit(limit + headerLength + length);
222-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
222+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
223223
buffer.putBytes(limit + headerLength, bytes, 0, length);
224224

225225
return this;
@@ -259,7 +259,7 @@ public ConnectEncoder putReceivingChannel(
259259
final int headerLength = 4;
260260
final int limit = parentMessage.limit();
261261
parentMessage.limit(limit + headerLength + length);
262-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
262+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
263263
buffer.putBytes(limit + headerLength, src, srcOffset, length);
264264

265265
return this;
@@ -274,7 +274,7 @@ public ConnectEncoder putReceivingChannel(
274274
final int headerLength = 4;
275275
final int limit = parentMessage.limit();
276276
parentMessage.limit(limit + headerLength + length);
277-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
277+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
278278
buffer.putBytes(limit + headerLength, src, srcOffset, length);
279279

280280
return this;
@@ -296,7 +296,7 @@ public ConnectEncoder receivingChannel(final String value) {
296296
final int headerLength = 4;
297297
final int limit = parentMessage.limit();
298298
parentMessage.limit(limit + headerLength + length);
299-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
299+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
300300
buffer.putBytes(limit + headerLength, bytes, 0, length);
301301

302302
return this;
@@ -336,7 +336,7 @@ public ConnectEncoder putClientManagementChannel(
336336
final int headerLength = 4;
337337
final int limit = parentMessage.limit();
338338
parentMessage.limit(limit + headerLength + length);
339-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
339+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
340340
buffer.putBytes(limit + headerLength, src, srcOffset, length);
341341

342342
return this;
@@ -351,7 +351,7 @@ public ConnectEncoder putClientManagementChannel(
351351
final int headerLength = 4;
352352
final int limit = parentMessage.limit();
353353
parentMessage.limit(limit + headerLength + length);
354-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
354+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
355355
buffer.putBytes(limit + headerLength, src, srcOffset, length);
356356

357357
return this;
@@ -373,7 +373,7 @@ public ConnectEncoder clientManagementChannel(final String value) {
373373
final int headerLength = 4;
374374
final int limit = parentMessage.limit();
375375
parentMessage.limit(limit + headerLength + length);
376-
buffer.putInt(limit, (int) length, java.nio.ByteOrder.LITTLE_ENDIAN);
376+
buffer.putInt(limit, length, java.nio.ByteOrder.LITTLE_ENDIAN);
377377
buffer.putBytes(limit + headerLength, bytes, 0, length);
378378

379379
return this;

0 commit comments

Comments
 (0)
0