8000 remove unnecessary code (#384) · chakra-coder/rsocket-java@6755aef · GitHub
[go: up one dir, main page]
Skip to content

Commit 6755aef

Browse files
qweekyschimke
qweek
authored and
yschimke
committed
remove unnecessary code (rsocket#384)
remove deprecated API usage remove unnecessary interface modifier remove unused import
1 parent b40acf7 commit 6755aef

File tree

12 files changed

+12
-17
lines changed

12 files changed

+12
-17
lines changed

‎rsocket-core/src/test/java/io/rsocket/RSocketClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import static org.hamcrest.Matchers.instanceOf;
2727
import static org.hamcrest.Matchers.is;
2828
import static org.hamcrest.Matchers.not;
29-
import static org.mockito.Matchers.any;
29+
import static org.mockito.ArgumentMatchers.any;
3030
import static org.mockito.Mockito.verify;
3131

3232
import io.rsocket.exceptions.ApplicationException;

‎rsocket-core/src/test/java/io/rsocket/RSocketTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static org.hamcrest.Matchers.empty;
2020
import static org.hamcrest.Matchers.is;
21-
import static org.mockito.Matchers.any;
21+
import static org.mockito.ArgumentMatchers.any;
2222
import static org.mockito.Mockito.verify;
2323

2424
import io.rsocket.exceptions.ApplicationException;

‎rsocket-core/src/test/java/io/rsocket/test/util/TestSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.rsocket.test.util;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55

66
import io.rsocket.Payload;

‎rsocket-examples/src/test/java/io/rsocket/integration/IntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.hamcrest.Matchers.is;
2020
import static org.junit.Assert.assertThat;
2121
import static org.junit.Assert.assertTrue;
22-
import static org.mockito.Matchers.any;
22+
import static org.mockito.ArgumentMatchers.any;
2323
import static org.mockito.Mockito.verify;
2424
import static org.mockito.Mockito.verifyNoMoreInteractions;
2525

‎rsocket-load-balancer/src/main/java/io/rsocket/stat/Quantile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
public interface Quantile {
1919
/** @return the estimation of the current value of the quantile */
20-
public double estimation();
20+
double estimation();
2121

2222
/**
2323
* Insert a data point `x` in the quantile estimator.
2424
*
2525
* @param x the data point to add.
2626
*/
27-
public void insert(double x);
27+
void insert(double x);
2828
}

‎rsocket-load-balancer/src/test/java/io/rsocket/client/RSocketSupplierTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.junit.Assert.assertEquals;
1919
import static org.junit.Assert.assertTrue;
2020
import static org.junit.Assert.fail;
21-
import static org.mockito.Matchers.any;
21+
import static org.mockito.ArgumentMatchers.any;
2222
import static org.mockito.Mockito.verify;
2323

2424
import io.rsocket.Payload;

‎rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/client/JavaClientDriver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import static org.junit.Assert.*;
1717

18-
import com.google.common.base.Throwables;
1918
import com.google.common.cache.CacheBuilder;
2019
import com.google.common.cache.CacheLoader;
2120
import com.google.common.cache.LoadingCache;
@@ -169,7 +168,7 @@ private RSocket getClient(String id) {
169168
try {
170169
return clientMap.get(id);
171170
} catch (ExecutionException e) {
172-
throw Throwables.propagate(e);
171+
throw new RuntimeException(e);
173172
}
174173
}
175174

‎rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/common/TckClientTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import static java.util.stream.Collectors.toList;
1717

18-
import com.google.common.base.Throwables;
1918
import com.google.common.io.Files;
2019
import java.io.File;
2120
import java.io.IOException;
@@ -43,7 +42,7 @@ public static List<TckClientTest> extractTests(File file) {
4342
.map(testLines -> new TckClientTest(parseName(testLines.remove(0)), testLines))
4443
.collect(toList());
4544
} catch (IOException e) {
46-
throw Throwables.propagate(e);
45+
throw new RuntimeException(e);
4746
}
4847
}
4948

‎rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/common/TckTestSuite.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static java.util.stream.Collectors.toList;
44

5-
import com.google.common.base.Throwables;
65
import com.google.common.io.Files;
76
import io.rsocket.tckdrivers.server.JavaServerDriver;
87
import java.io.File;
@@ -54,7 +53,7 @@ private static TckTestSuite extractTests(File serverFile) {
5453

5554
return tckTestSuite;
5655
} catch (IOException e) {
57-
throw Throwables.propagate(e);
56+
throw new RuntimeException(e);
5857
}
5958
}
6059

‎rsocket-tck-drivers/src/main/java/io/rsocket/tckdrivers/runner/JsonUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.core.type.TypeReference;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.google.common.base.Throwables;
65
import io.rsocket.Payload;
76
import java.io.IOException;
87
import java.util.Map;
@@ -20,7 +19,7 @@ public static Map<String, Object> parseTCKMessage(Payload content, String messag
2019
content.getDataUtf8(), new TypeReference<Map<String, Map<String, Object>>>() {});
2120
return message.get(messageType);
2221
} catch (IOException e) {
23-
throw Throwables.propagate(e);
22+
throw new RuntimeException(e);
2423
}
2524
}
2625

0 commit comments

Comments
 (0)
0