You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by GitBox <gi...@apache.org> on 2018/10/27 00:22:30 UTC
[GitHub] wujimin closed pull request #970: [SCB-982] Compile with show
warnings
wujimin closed pull request #970: [SCB-982] Compile with show warnings
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/970
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java b/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java
index dd8383cf8..b7a6ff3f2 100644
--- a/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java
+++ b/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java
@@ -22,6 +22,7 @@
import com.google.protobuf.CodedOutputStream;
+@SuppressWarnings({"cast"})
public final class ModelProtobuf {
private ModelProtobuf() {
}
diff --git a/common/common-rest/pom.xml b/common/common-rest/pom.xml
index 55f922501..b142aa39e 100644
--- a/common/common-rest/pom.xml
+++ b/common/common-rest/pom.xml
@@ -39,6 +39,12 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
index baff89771..2692cb331 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -100,14 +100,14 @@ void fastFail(String input, Class<?> cls, Class<?> eCls) {
fastFail(() -> mapper.readValue(new ByteArrayInputStream(input.getBytes()), cls), eCls);
}
- void batFastFail(Class cls, Class<?> e1, Class<?> e2) {
+ void batFastFail(Class<?> cls, Class<?> e1, Class<?> e2) {
fastFail(invalidNum, cls, e1);
fastFail(invalidStr, cls, e2);
fastFail(invalidArrNum, cls, e1);
fastFail(invalidArrStr, cls, e2);
}
- void batFastFail(Class cls) {
+ void batFastFail(Class<?> cls) {
batFastFail(cls, JsonParseException.class, InvalidFormatException.class);
}
@@ -195,7 +195,7 @@ Object fastSucc(InputStream input, Class<?> cls) {
});
}
- void batFastSucc(Class cls, Object expected) {
+ void batFastSucc(Class<?> cls, Object expected) {
Assert.assertEquals(expected, fastSucc(invalidNum, cls));
Assert.assertEquals(expected, fastSucc(new ByteArrayInputStream(invalidNum.getBytes()), cls));
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
index 295b6f94d..f5b0e77e7 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java
@@ -52,6 +52,7 @@ public void testCreate() {
Assert.assertEquals(null, result);
}
+ @SuppressWarnings("UnusedAssignment")
@Test
public void testCreateNullAsEmpty() throws Exception {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
@@ -70,12 +71,12 @@ public void testCreateNullAsEmpty() throws Exception {
Assert.assertEquals("Hello", result);
Mockito.when(request.getParameter("query")).thenReturn("");
- result = (String) (String) processor.getValue(request);
+ result = (String) processor.getValue(request);
Assert.assertEquals(null, result);
Mockito.when(request.getParameter("query")).thenReturn(null);
result = (String) processor.convertValue(null, TypeFactory.defaultInstance().constructType(String.class));
- result = (String) (String) processor.getValue(request);
+ result = (String) processor.getValue(request);
Assert.assertEquals(null, result);
}
}
diff --git a/core/pom.xml b/core/pom.xml
index 0a3f06c5d..e780a6832 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -69,5 +69,10 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-test-scaffolding</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/SmartCareImpl.java b/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/SmartCareImpl.java
index 6416b2e58..69a4abdac 100644
--- a/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/SmartCareImpl.java
+++ b/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/SmartCareImpl.java
@@ -37,6 +37,7 @@ public Response addApplication(Application application) {
return resp;
}
+ @SuppressWarnings("divzero")
@Override
public Response delApplication(String appName) {
// TODO: delete application
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
index 6b7313545..0436382be 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownload.java
@@ -31,6 +31,8 @@
import org.apache.servicecomb.provider.springmvc.reference.CseRestTemplate;
import org.springframework.web.client.RestTemplate;
+import com.google.common.collect.Iterables;
+
public class TestDownload {
private File dir = new File("target/download");
@@ -89,6 +91,7 @@ private ReadStreamPart templateGet(String methodPath) {
content);
}
+ @SuppressWarnings("unchecked")
public void runRest() {
futures.add(checkFile(intf.tempFileEntity(content)));
futures.add(checkFuture(templateGet("tempFileEntity").saveAsBytes()));
@@ -126,7 +129,7 @@ public void runRest() {
try {
CompletableFuture
- .allOf(futures.toArray(new CompletableFuture[futures.size()]))
+ .allOf(Iterables.toArray((List<CompletableFuture<Object>>) (Object) futures, CompletableFuture.class))
.get();
} catch (InterruptedException | ExecutionException e1) {
TestMgr.failed("test download failed.", e1);
diff --git a/dynamic-config/config-cc/pom.xml b/dynamic-config/config-cc/pom.xml
index 9a727b664..16d211c30 100644
--- a/dynamic-config/config-cc/pom.xml
+++ b/dynamic-config/config-cc/pom.xml
@@ -29,7 +29,6 @@
<name>Java Chassis::Foundations::Config CC</name>
<dependencies>
-
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-config</artifactId>
@@ -42,6 +41,12 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-vertx</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/edge/edge-core/pom.xml b/edge/edge-core/pom.xml
index 38b31493b..468949989 100644
--- a/edge/edge-core/pom.xml
+++ b/edge/edge-core/pom.xml
@@ -32,6 +32,12 @@
<artifactId>transport-rest-vertx</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/XmlLoader.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/XmlLoader.java
index 4f95e2d5a..254b1eda3 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/XmlLoader.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/XmlLoader.java
@@ -67,7 +67,7 @@ public XmlLoader(List<String> locationPatternList, String suffix) {
}
Element clone = (Element) doc.importNode(child, true);
- Element exist = findAndSetExist((Element) clone);
+ Element exist = findAndSetExist(clone);
if (exist == null) {
root.appendChild(clone);
continue;
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java
index c8f4743a6..d8515eea1 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java
@@ -19,6 +19,8 @@
import java.net.InetSocketAddress;
+import com.google.common.base.Objects;
+
public class IpPort {
private String hostOrIp;
@@ -53,6 +55,11 @@ public void setPort(int port) {
this.port = port;
}
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(port, hostOrIp);
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
index a25ec9ab3..6024b6d29 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
@@ -199,7 +199,7 @@ public static String getRealListenAddress(String schema, String address) {
public static String getHostName() {
//If failed to get host name ,micro-service will registry failed
//So I add retry mechanism
- if(hostName == null) {
+ if (hostName == null) {
doGetHostNameAndHostAddress();
}
return hostName;
@@ -208,7 +208,7 @@ public static String getHostName() {
public static String getHostAddress() {
//If failed to get host address ,micro-service will registry failed
//So I add retry mechanism
- if(hostAddress == null) {
+ if (hostAddress == null) {
doGetHostNameAndHostAddress();
}
return hostAddress;
@@ -226,6 +226,7 @@ public static InetAddress ensureGetInterfaceAddress(String interfaceName) {
return address;
}
+ @SuppressWarnings({"unused", "try"})
public static boolean canTcpListen(InetAddress address, int port) {
try (ServerSocket ss = new ServerSocket(port, 0, address)) {
return true;
diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java
index 6dbe9f0df..ec7def620 100644
--- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java
+++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java
@@ -3,7 +3,7 @@
package org.apache.servicecomb.foundation.protobuf.internal.model;
-@SuppressWarnings("all")
+@SuppressWarnings({"all", "cast"})
public final class ProtobufRoot {
private ProtobufRoot() {
}
diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/CertificateUtilTest.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/CertificateUtilTest.java
index 4fa45e503..0285b8b31 100644
--- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/CertificateUtilTest.java
+++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/CertificateUtilTest.java
@@ -44,6 +44,8 @@
public class CertificateUtilTest {
class MyX509Certificate extends X509Certificate {
+ private static final long serialVersionUID = -3585440601605666278L;
+
public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException {
}
diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java
index 008d56beb..22f8cb740 100644
--- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java
+++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TrustManagerExtTest.java
@@ -84,6 +84,8 @@ public void checkServerTrusted(X509Certificate[] paramArrayOfX509Certificate, St
}
class MyX509Certificate extends X509Certificate {
+ private static final long serialVersionUID = -3585440601605666276L;
+
public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException {
}
@@ -262,9 +264,8 @@ public void testConstructor() {
Assert.assertNotNull(trustManagerExt);
}
- @SuppressWarnings("static-access")
@Test
- public void testConstructorWithParam(@Mocked CertificateUtil certificateUtil) {
+ public void testConstructorWithParam() {
MyX509Certificate myX509Certificate1 = new MyX509Certificate();
MyX509Certificate myX509Certificate2 = new MyX509Certificate();
@@ -272,12 +273,12 @@ public void testConstructorWithParam(@Mocked CertificateUtil certificateUtil) {
MyX509CertificateArray[0] = myX509Certificate1;
MyX509CertificateArray[1] = myX509Certificate2;
- new Expectations() {
+ new Expectations(CertificateUtil.class) {
{
- certificateUtil.findOwner((X509Certificate[]) any);
+ CertificateUtil.findOwner((X509Certificate[]) any);
result = any;
- certificateUtil.getCN((X509Certificate) any);
+ CertificateUtil.getCN((X509Certificate) any);
result = "10.67.147.115";
}
};
diff --git a/foundations/foundation-test-scaffolding/pom.xml b/foundations/foundation-test-scaffolding/pom.xml
index fe26b86e6..518f82d13 100644
--- a/foundations/foundation-test-scaffolding/pom.xml
+++ b/foundations/foundation-test-scaffolding/pom.xml
@@ -44,6 +44,12 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>com.netflix.spectator</groupId>
<artifactId>spectator-reg-servo</artifactId>
diff --git a/foundations/foundation-vertx/pom.xml b/foundations/foundation-vertx/pom.xml
index c78c48d56..8a50e76f4 100644
--- a/foundations/foundation-vertx/pom.xml
+++ b/foundations/foundation-vertx/pom.xml
@@ -43,6 +43,13 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-common</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/handlers/handler-fault-injection/pom.xml b/handlers/handler-fault-injection/pom.xml
index 94f165a0d..1f673c1f2 100755
--- a/handlers/handler-fault-injection/pom.xml
+++ b/handlers/handler-fault-injection/pom.xml
@@ -30,6 +30,13 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/handlers/handler-loadbalance/pom.xml b/handlers/handler-loadbalance/pom.xml
index b7e4d9f37..143fd71dc 100644
--- a/handlers/handler-loadbalance/pom.xml
+++ b/handlers/handler-loadbalance/pom.xml
@@ -60,6 +60,18 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.netflix.servo</groupId>
+ <artifactId>servo-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-test-scaffolding</artifactId>
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java
index 5a61dc7b3..7176d7af5 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java
@@ -49,20 +49,19 @@ public boolean isSupport(String key, String value) {
return ACCEPT_KEYS.contains(key) && ACCEPT_VALUES.contains(value);
}
- @SuppressWarnings("unchecked")
public RetryHandler createRetryHandler(String retryName, String microservice) {
return new DefaultLoadBalancerRetryHandler(
Configuration.INSTANCE.getRetryOnSame(microservice),
Configuration.INSTANCE.getRetryOnNext(microservice), true) {
private List<Class<? extends Throwable>> retriable = Lists
- .newArrayList(new Class[] {ConnectException.class, SocketTimeoutException.class});
+ .newArrayList(ConnectException.class, SocketTimeoutException.class);
Map<Class<? extends Throwable>, List<String>> strictRetriable =
ImmutableMap.<Class<? extends Throwable>, List<String>>builder()
.put(ConnectException.class, Lists.newArrayList())
.put(SocketTimeoutException.class, Lists.newArrayList())
/*
- * deal with some special exceptions caused by the server side close the connection
+ * deal with some special exceptions caused by the server side close the connection
*/
.put(IOException.class, Lists.newArrayList(new String[] {"Connection reset by peer"}))
.put(VertxException.class, Lists.newArrayList(new String[] {"Connection was closed"}))
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java
index eab708cc6..707651da2 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java
@@ -229,7 +229,7 @@ private void clearLoadBalancer() {
private void send(Invocation invocation, AsyncResponse asyncResp, final LoadBalancer chosenLB) throws Exception {
long time = System.currentTimeMillis();
- ServiceCombServer server = (ServiceCombServer) chosenLB.chooseServer(invocation);
+ ServiceCombServer server = chosenLB.chooseServer(invocation);
if (null == server) {
asyncResp.consumerFail(ExceptionUtils.lbAddressNotFound(invocation.getMicroserviceName(),
invocation.getMicroserviceVersionRule(),
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java
index 8ac41a7d2..339c522be 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceHandler2.java
@@ -146,26 +146,26 @@ public void testZoneAwareAndIsolationFilterWorks() throws Exception {
handler = new LoadbalanceHandler();
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server, null);
data.put("noneMatchInstance", noneMatchInstance);
parent.cacheVersion(1);
handler = new LoadbalanceHandler();
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9092");
data.put("regionMatchInstance", regionMatchInstance);
parent.cacheVersion(parent.cacheVersion() + 1);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9091");
data.put("allmatchInstance", allmatchInstance);
parent.cacheVersion(parent.cacheVersion() + 1);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9090");
ServiceCombLoadBalancerStats.INSTANCE.markSuccess(server);
@@ -177,7 +177,7 @@ public void testZoneAwareAndIsolationFilterWorks() throws Exception {
//if errorThresholdPercentage is 0,that means errorThresholdPercentage is not active.
ArchaiusUtils.setProperty("servicecomb.loadbalance.isolation.errorThresholdPercentage", "0");
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9090");
//if errorThresholdPercentage greater than 0, it will activate.
@@ -185,20 +185,20 @@ public void testZoneAwareAndIsolationFilterWorks() throws Exception {
ArchaiusUtils.setProperty("servicecomb.loadbalance.isolation.minIsolationTime", "10");
ServiceCombServer server2 = server;
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9091");
ServiceCombLoadBalancerStats.INSTANCE.markSuccess(server2);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9091");
TimeUnit.MILLISECONDS.sleep(20);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9090");
ServiceCombLoadBalancerStats.INSTANCE.markFailure(server2);
ServiceCombLoadBalancerStats.INSTANCE.markFailure(server2);
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
- server = (ServiceCombServer) loadBalancer.chooseServer(invocation);
+ server = loadBalancer.chooseServer(invocation);
Assert.assertEquals(server.getEndpoint().getEndpoint(), "rest://localhost:9091");
}
diff --git a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingHandler.java b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingHandler.java
index bd188de01..7990d0dfa 100644
--- a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingHandler.java
+++ b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingHandler.java
@@ -40,6 +40,7 @@
this.tracingDelegate = tracingDelegate;
}
+ @SuppressWarnings({"try", "unused"})
@Override
public void handle(Invocation invocation, AsyncResponse asyncResp) throws Exception {
Span span = tracingDelegate.createSpan(invocation);
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestRestServerConfigEdge.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestRestServerConfigEdge.java
index ac4c55202..d2e24484d 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestRestServerConfigEdge.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestRestServerConfigEdge.java
@@ -32,7 +32,7 @@
import org.springframework.web.client.RestClientException;
public class TestRestServerConfigEdge {
- static GateRestTemplate client = (GateRestTemplate) GateRestTemplate.createEdgeRestTemplate("dataTypeJaxrs");
+ static GateRestTemplate client = GateRestTemplate.createEdgeRestTemplate("dataTypeJaxrs");
@Test
public void testIllegalPathParam() throws IOException {
diff --git a/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/SmartCareImpl.java b/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/SmartCareImpl.java
index 5d04697f7..3b629078e 100644
--- a/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/SmartCareImpl.java
+++ b/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/SmartCareImpl.java
@@ -40,6 +40,7 @@ public Response addApplication(Application application) {
return resp;
}
+ @SuppressWarnings("divzero")
@Override
public Response delApplication(String appName) {
// TODO: delete application
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index db0dd91a8..6ab39942c 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -449,6 +449,11 @@
<artifactId>jsr305</artifactId>
<version>3.0.1</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>2.0.0</version>
+ </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
@@ -647,6 +652,11 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <version>${vertx.version}</version>
+ </dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
@@ -1048,9 +1058,13 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Werror</arg>
<arg>-Xlint:all</arg>
+ <!--not care for jdk8/jdk7 compatible problem-->
+ <arg>-Xlint:-classfile</arg>
</compilerArgs>
</configuration>
</plugin>
diff --git a/metrics/metrics-core/pom.xml b/metrics/metrics-core/pom.xml
index 0bbcbc3d9..5d66dbd82 100644
--- a/metrics/metrics-core/pom.xml
+++ b/metrics/metrics-core/pom.xml
@@ -42,6 +42,12 @@
<artifactId>swagger-generator-jaxrs</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java
index ae0c40d8c..d5725065a 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java
@@ -48,6 +48,7 @@ public void onBootEvent(BootEvent event) {
break;
case BEFORE_CLOSE:
metricsBootstrap.shutdown();
+ break;
default:
break;
}
diff --git a/service-registry/pom.xml b/service-registry/pom.xml
index a599d3bd9..58635367e 100644
--- a/service-registry/pom.xml
+++ b/service-registry/pom.xml
@@ -42,6 +42,13 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-common</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java b/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java
index 175f567e4..974b84c65 100644
--- a/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java
+++ b/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java
@@ -43,6 +43,7 @@
implements ServletContextInitializer {
private static final Logger LOGGER = LoggerFactory.getLogger(RestServletInitializer.class);
+ @SuppressWarnings("try")
@Override
public void onStartup(ServletContext servletContext) throws ServletException {
if (getPort() == 0) {
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/TestPojoConsumerEqualSwagger.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/TestPojoConsumerEqualSwagger.java
index 0c553c612..f4c39872a 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/TestPojoConsumerEqualSwagger.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/TestPojoConsumerEqualSwagger.java
@@ -124,7 +124,7 @@ public void testBytes() {
Assert.assertEquals(bytes, invoker.getSwaggerArgument(0));
- Assert.assertArrayEquals(bytes, (byte[]) result);
+ Assert.assertArrayEquals(bytes, result);
}
@Test
diff --git a/tracing/tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviser.java b/tracing/tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviser.java
index 58d2aba9b..42ec0bb38 100644
--- a/tracing/tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviser.java
+++ b/tracing/tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviser.java
@@ -31,6 +31,7 @@
this.tracer = tracer;
}
+ @SuppressWarnings({"unused", "try"})
<T> T invoke(String spanName, String path, ThrowableSupplier<T> supplier) throws Throwable {
Span span = createSpan(spanName, path);
try (SpanInScope spanInScope = tracer.withSpanInScope(span)) {
diff --git a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
index c9e05fe40..e6416fbf0 100644
--- a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
+++ b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -27,6 +27,7 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import java.lang.reflect.Array;
import java.util.List;
import java.util.Map;
import java.util.Queue;
@@ -104,11 +105,12 @@ public void includesExceptionInTags() throws Throwable {
assertThat(tracedValues(span), containsInAnyOrder(this.getClass().getCanonicalName(), "RuntimeException: oops"));
}
+ @SuppressWarnings({"unused", "try"})
@Test
- public void startsNewChildSpan() throws Exception {
+ public void startsNewChildSpan() {
CyclicBarrier cyclicBarrier = new CyclicBarrier(nThreads);
- CompletableFuture<?>[] futures = new CompletableFuture[nThreads];
+ CompletableFuture<?>[] futures = (CompletableFuture<?>[]) Array.newInstance(CompletableFuture.class, nThreads);
for (int i = 0; i < nThreads; i++) {
futures[i] = CompletableFuture.runAsync(() -> {
Span currentSpan = tracing.tracer().newTrace().start();
diff --git a/transports/transport-highway/pom.xml b/transports/transport-highway/pom.xml
index 2824517b9..950b5f4e1 100644
--- a/transports/transport-highway/pom.xml
+++ b/transports/transport-highway/pom.xml
@@ -38,6 +38,13 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>common-protobuf</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/transports/transport-rest/transport-rest-client/pom.xml b/transports/transport-rest/transport-rest-client/pom.xml
index 62c366a47..60a38bf47 100644
--- a/transports/transport-rest/transport-rest-client/pom.xml
+++ b/transports/transport-rest/transport-rest-client/pom.xml
@@ -36,6 +36,13 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>common-rest</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/transports/transport-rest/transport-rest-vertx/pom.xml b/transports/transport-rest/transport-rest-vertx/pom.xml
index a27d7077f..89bb290e9 100644
--- a/transports/transport-rest/transport-rest-vertx/pom.xml
+++ b/transports/transport-rest/transport-rest-vertx/pom.xml
@@ -33,6 +33,12 @@
<artifactId>transport-rest-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-codegen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
index a2079ebf0..27d8e0ca4 100644
--- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
+++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
@@ -23,6 +23,8 @@
import org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogPatternParser;
import org.apache.servicecomb.transport.rest.vertx.accesslog.parser.impl.VertxRestAccessLogPatternParser;
+import com.google.common.collect.Iterables;
+
import io.vertx.ext.web.RoutingContext;
/*
@@ -41,7 +43,7 @@
@SuppressWarnings("unchecked")
public AccessLogGenerator(String rawPattern) {
List<AccessLogItem<RoutingContext>> accessLogItemList = accessLogPatternParser.parsePattern(rawPattern);
- accessLogItems = accessLogItemList.toArray(new AccessLogItem[0]);
+ accessLogItems = Iterables.toArray(accessLogItemList, AccessLogItem.class);
}
public String generateLog(AccessLogParam<RoutingContext> accessLogParam) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services