You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/07/20 23:46:19 UTC
[incubator-servicecomb-java-chassis] 01/02: [SCB-762] resolve
eclipse compile warnings
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit f510197f93f95d5fd498abeac61d8bdfa1ceb034
Author: wujimin <wu...@huawei.com>
AuthorDate: Fri Jul 20 08:31:48 2018 +0800
[SCB-762] resolve eclipse compile warnings
---
.../servicecomb/foundation/common/net/TestNetUtils.java | 3 +--
.../servicecomb/bizkeeper/CustomizeCommandGroupKey.java | 17 +++++++++--------
.../servicecomb/loadbalance/ServiceCombServer.java | 2 --
.../loadbalance/TestLoadBalanceHandler2.java | 1 -
.../servicecomb/loadbalance/TestLoadbalanceHandler.java | 4 ----
.../diagnosis/instance/TestInstanceCacheCheckTask.java | 2 +-
6 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
index 8766b84..a9f8fba 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.foundation.common.net;
import java.io.IOException;
-import java.lang.reflect.Field;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.util.HashMap;
@@ -108,7 +107,7 @@ public class TestNetUtils {
Assert.assertTrue(NetUtils.canTcpListen(address, port));
}
-
+
@Test
public void testGetHostName() {
Assert.assertNotEquals(null, NetUtils.getHostName());
diff --git a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
index c80e926..79183b7 100644
--- a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
+++ b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
@@ -24,7 +24,7 @@ import com.netflix.hystrix.HystrixKey;
import com.netflix.hystrix.util.InternMap;
/**
- * ͨ������CommandGroupKey��Ŀ����Я��Invocation���־�̬��Ϣ������CircutBreakerEvent��ȡ��
+ * 通过定制CommandGroupKey，目的是携带Invocation部分静态信息，便于CircutBreakerEvent获取
*/
public class CustomizeCommandGroupKey extends HystrixKey.HystrixKeyDefault implements HystrixCommandGroupKey {
@@ -34,13 +34,14 @@ public class CustomizeCommandGroupKey extends HystrixKey.HystrixKeyDefault imple
super(key);
}
- private static final InternMap<String, CustomizeCommandGroupKey> intern = new InternMap<String, CustomizeCommandGroupKey>(
- new InternMap.ValueConstructor<String, CustomizeCommandGroupKey>() {
- @Override
- public CustomizeCommandGroupKey create(String key) {
- return new CustomizeCommandGroupKey(key);
- }
- });
+ private static final InternMap<String, CustomizeCommandGroupKey> intern =
+ new InternMap<String, CustomizeCommandGroupKey>(
+ new InternMap.ValueConstructor<String, CustomizeCommandGroupKey>() {
+ @Override
+ public CustomizeCommandGroupKey create(String key) {
+ return new CustomizeCommandGroupKey(key);
+ }
+ });
public static HystrixCommandGroupKey asKey(String key, Invocation invocation) {
CustomizeCommandGroupKey result = intern.interned(key);
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombServer.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombServer.java
index b544a75..1d4edf3 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombServer.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombServer.java
@@ -17,8 +17,6 @@
package org.apache.servicecomb.loadbalance;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
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 b640ce2..8a29167 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
@@ -133,7 +133,6 @@ public class TestLoadBalanceHandler2 {
LoadbalanceHandler handler = null;
LoadBalancer loadBalancer = null;
ServiceCombServer server = null;
- boolean failed = false;
handler = new LoadbalanceHandler();
loadBalancer = handler.getOrCreateLoadBalancer(invocation);
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java
index 2302d82..faa86f9 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java
@@ -38,12 +38,10 @@ import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.apache.servicecomb.serviceregistry.ServiceRegistry;
-import org.apache.servicecomb.serviceregistry.api.registry.DataCenterInfo;
import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.cache.CacheEndpoint;
import org.apache.servicecomb.serviceregistry.cache.InstanceCacheManager;
import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter;
-import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.apache.servicecomb.swagger.invocation.Response;
import org.hamcrest.Matchers;
@@ -78,8 +76,6 @@ public class TestLoadbalanceHandler {
Map<String, LoadBalancerCreator> loadBalancerMap;
- private LoadBalancerCreator loadBalancerCreator = new LoadBalancerCreator(rule, "test");
-
@Injectable
Invocation invocation;
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java
index 862cf6f..bed55da 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java
@@ -117,7 +117,7 @@ public class TestInstanceCacheCheckTask {
@Test
public void autoTask_clearOldTask() {
Holder<Boolean> cancelResult = new Holder<>();
- ScheduledFuture<?> scheduledFuture = new MockUp<ScheduledFuture>() {
+ ScheduledFuture<?> scheduledFuture = new MockUp<ScheduledFuture<?>>() {
@Mock
boolean cancel(boolean mayInterruptIfRunning) {
cancelResult.value = true;