You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/04/27 06:25:19 UTC
[incubator-servicecomb-java-chassis] 03/03: [SCB-514] update code
to resolve std javac compile warnings.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 0c83e629c587587b9596f93bc65b2cf8e43f8e12
Author: wujimin <wu...@huawei.com>
AuthorDate: Wed Apr 25 10:12:37 2018 +0800
[SCB-514] update code to resolve std javac compile warnings.
---
.../servicecomb/common/rest/codec/RestObjectMapper.java | 8 +++-----
.../common/rest/codec/param/TestCookieProcessor.java | 10 +++++-----
.../common/rest/codec/param/TestFormProcessor.java | 7 +++----
.../common/rest/codec/param/TestHeaderProcessor.java | 10 +++++-----
.../servicecomb/demo/crossapp/CrossappBootListener.java | 6 +++---
.../servicecomb/demo/crossapp/CrossappBootListener.java | 6 +++---
.../apache/servicecomb/demo/springmvc/client/TestGeneric.java | 11 +++++------
.../foundation/vertx/http/AbstractHttpServletRequest.java | 2 ++
.../foundation/vertx/http/AbstractHttpServletResponse.java | 3 +++
.../vertx/http/VertxServerResponseToHttpServletResponse.java | 1 +
.../http/TestVertxServerResponseToHttpServletResponse.java | 1 +
.../servicecomb/bizkeeper/HystrixCommandPropertiesExt.java | 1 +
.../java/org/apache/servicecomb/loadbalance/LoadBalancer.java | 1 +
.../org/apache/servicecomb/loadbalance/TestLoadBalancer.java | 1 +
14 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestObjectMapper.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestObjectMapper.java
index fb76c90..6dc1bbb 100644
--- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestObjectMapper.java
+++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestObjectMapper.java
@@ -26,10 +26,7 @@ import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-@SuppressWarnings("deprecation")
public final class RestObjectMapper extends ObjectMapper {
public static final RestObjectMapper INSTANCE = new RestObjectMapper();
@@ -37,15 +34,16 @@ public final class RestObjectMapper extends ObjectMapper {
private static final JavaType STRING_JAVA_TYPE = TypeFactory.defaultInstance().constructType(String.class);
+ @SuppressWarnings("deprecation")
private RestObjectMapper() {
// swagger中要求date使用ISO8601格式传递，这里与之做了功能绑定，这在cse中是没有问题的
- setDateFormat(new ISO8601DateFormat() {
+ setDateFormat(new com.fasterxml.jackson.databind.util.ISO8601DateFormat() {
private static final long serialVersionUID = 7798938088541203312L;
// to support millis
@Override
public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
- String value = ISO8601Utils.format(date, true);
+ String value = com.fasterxml.jackson.databind.util.ISO8601Utils.format(date, true);
toAppendTo.append(value);
return toAppendTo;
}
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
index 16a2636..98fa39c 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java
@@ -30,14 +30,12 @@ import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-@SuppressWarnings("deprecation")
public class TestCookieProcessor {
@Mocked
HttpServletRequest request;
@@ -103,10 +101,11 @@ public class TestCookieProcessor {
Assert.assertEquals("c1v", value);
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetValueCookiesDate() throws Exception {
Date date = new Date();
- String strDate = ISO8601Utils.format(date);
+ String strDate = com.fasterxml.jackson.databind.util.ISO8601Utils.format(date);
Cookie[] cookies = new Cookie[] {new Cookie("c1", strDate)};
new Expectations() {
{
@@ -117,7 +116,7 @@ public class TestCookieProcessor {
CookieProcessor processor = createProcessor("c1", Date.class);
Object value = processor.getValue(request);
- Assert.assertEquals(strDate, ISO8601Utils.format((Date) value));
+ Assert.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
}
@Test
@@ -132,7 +131,8 @@ public class TestCookieProcessor {
@Test
public void testSetValueDate() throws Exception {
Date date = new Date();
- String strDate = ISO8601Utils.format(date, true);
+ @SuppressWarnings("deprecation")
+ String strDate = com.fasterxml.jackson.databind.util.ISO8601Utils.format(date, true);
createClientRequest();
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
index e204d91..efded34 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java
@@ -33,14 +33,12 @@ import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-@SuppressWarnings("deprecation")
public class TestFormProcessor {
@Mocked
HttpServletRequest request;
@@ -93,10 +91,11 @@ public class TestFormProcessor {
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetValueNormalDate() throws Exception {
Date date = new Date();
- String strDate = ISO8601Utils.format(date);
+ String strDate = com.fasterxml.jackson.databind.util.ISO8601Utils.format(date);
new Expectations() {
{
request.getParameter("name");
@@ -106,7 +105,7 @@ public class TestFormProcessor {
ParamValueProcessor processor = createProcessor("name", Date.class);
Object value = processor.getValue(request);
- Assert.assertEquals(strDate, ISO8601Utils.format((Date) value));
+ Assert.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
}
@Test
diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
index 5a9d13a..cb3edb9 100644
--- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
+++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java
@@ -34,14 +34,12 @@ import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-@SuppressWarnings("deprecation")
public class TestHeaderProcessor {
@Mocked
HttpServletRequest request;
@@ -78,10 +76,11 @@ public class TestHeaderProcessor {
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetValueNormalDate() throws Exception {
Date date = new Date();
- String strDate = ISO8601Utils.format(date);
+ String strDate = com.fasterxml.jackson.databind.util.ISO8601Utils.format(date);
new Expectations() {
{
request.getHeader("h1");
@@ -91,7 +90,7 @@ public class TestHeaderProcessor {
HeaderProcessor processor = createProcessor("h1", Date.class);
Object value = processor.getValue(request);
- Assert.assertEquals(strDate, ISO8601Utils.format((Date) value));
+ Assert.assertEquals(strDate, com.fasterxml.jackson.databind.util.ISO8601Utils.format((Date) value));
}
@Test
@@ -174,7 +173,8 @@ public class TestHeaderProcessor {
@Test
public void testSetValueDate() throws Exception {
Date date = new Date();
- String strDate = ISO8601Utils.format(date, true);
+ @SuppressWarnings("deprecation")
+ String strDate = com.fasterxml.jackson.databind.util.ISO8601Utils.format(date, true);
createClientRequest();
diff --git a/demo/demo-crossapp/crossapp-client/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java b/demo/demo-crossapp/crossapp-client/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java
index 3d912c4..491a535 100644
--- a/demo/demo-crossapp/crossapp-client/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java
+++ b/demo/demo-crossapp/crossapp-client/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java
@@ -18,17 +18,17 @@
package org.apache.servicecomb.demo.crossapp;
import org.apache.servicecomb.core.BootListener;
-import org.apache.servicecomb.core.definition.loader.DynamicSchemaLoader;
import org.springframework.stereotype.Component;
-@SuppressWarnings("deprecation")
@Component
public class CrossappBootListener implements BootListener {
+ @SuppressWarnings("deprecation")
@Override
public void onBootEvent(BootEvent event) {
if (EventType.BEFORE_CONSUMER_PROVIDER.equals(event.getEventType())) {
// 动态注册schemas目录下面的契约到当前服务
- DynamicSchemaLoader.INSTANCE.registerSchemas("appServer:appService", "classpath*:schemas/*.yaml");
+ org.apache.servicecomb.core.definition.loader.DynamicSchemaLoader.INSTANCE.registerSchemas("appServer:appService",
+ "classpath*:schemas/*.yaml");
}
}
}
diff --git a/demo/demo-crossapp/crossapp-server/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java b/demo/demo-crossapp/crossapp-server/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java
index f129642..8c8aa82 100644
--- a/demo/demo-crossapp/crossapp-server/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java
+++ b/demo/demo-crossapp/crossapp-server/src/main/java/org/apache/servicecomb/demo/crossapp/CrossappBootListener.java
@@ -18,17 +18,17 @@
package org.apache.servicecomb.demo.crossapp;
import org.apache.servicecomb.core.BootListener;
-import org.apache.servicecomb.core.definition.loader.DynamicSchemaLoader;
import org.springframework.stereotype.Component;
-@SuppressWarnings("deprecation")
@Component
public class CrossappBootListener implements BootListener {
+ @SuppressWarnings("deprecation")
@Override
public void onBootEvent(BootEvent event) {
if (EventType.BEFORE_PRODUCER_PROVIDER.equals(event.getEventType())) {
// 动态注册schemas目录下面的契约到当前服务
- DynamicSchemaLoader.INSTANCE.registerSchemas("classpath*:schemas/*.yaml");
+ org.apache.servicecomb.core.definition.loader.DynamicSchemaLoader.INSTANCE
+ .registerSchemas("classpath*:schemas/*.yaml");
}
}
}
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestGeneric.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestGeneric.java
index 3ca0a57..82103e8 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestGeneric.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestGeneric.java
@@ -28,9 +28,6 @@ import org.apache.servicecomb.provider.springmvc.reference.CseRestTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.RestTemplate;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-
-@SuppressWarnings("deprecation")
public class TestGeneric {
private CodeFirstSpringmvcIntf intf;
@@ -70,16 +67,18 @@ public class TestGeneric {
TestMgr.check(HttpStatus.class, result.value.getClass());
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation"})
private void testGenericDate_rest() {
Generic<Date> generic = new Generic<>();
generic.value = new Date(1001);
Generic<Date> result = intf.testGenericDate(generic);
- TestMgr.check("1970-01-01T00:00:01.001Z", ISO8601Utils.format(result.value, true));
+ TestMgr.check("1970-01-01T00:00:01.001Z",
+ com.fasterxml.jackson.databind.util.ISO8601Utils.format(result.value, true));
TestMgr.check(Date.class, result.value.getClass());
result = restTemplate.postForObject(prefix + "/genericDate", generic, Generic.class);
- TestMgr.check("1970-01-01T00:00:01.001Z", ISO8601Utils.format(result.value, true));
+ TestMgr.check("1970-01-01T00:00:01.001Z",
+ com.fasterxml.jackson.databind.util.ISO8601Utils.format(result.value, true));
TestMgr.check(Date.class, result.value.getClass());
}
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java
index 956f31b..b4bea0e 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java
@@ -171,6 +171,7 @@ public abstract class AbstractHttpServletRequest extends BodyBufferSupportImpl i
}
@Override
+ @Deprecated
public String getRealPath(String path) {
throw new Error("not supported method");
}
@@ -357,6 +358,7 @@ public abstract class AbstractHttpServletRequest extends BodyBufferSupportImpl i
}
@Override
+ @Deprecated
public boolean isRequestedSessionIdFromUrl() {
throw new Error("not supported method");
}
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java
index 2140429..8b1a9a6 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java
@@ -134,11 +134,13 @@ public abstract class AbstractHttpServletResponse extends BodyBufferSupportImpl
}
@Override
+ @Deprecated
public String encodeUrl(String url) {
throw new Error("not supported method");
}
@Override
+ @Deprecated
public String encodeRedirectUrl(String url) {
throw new Error("not supported method");
}
@@ -194,6 +196,7 @@ public abstract class AbstractHttpServletResponse extends BodyBufferSupportImpl
}
@Override
+ @Deprecated
public void setStatus(int sc, String sm) {
throw new Error("not supported method");
}
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java
index ed77609..75bf693 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java
@@ -62,6 +62,7 @@ public class VertxServerResponseToHttpServletResponse extends AbstractHttpServle
}
@Override
+ @Deprecated
public void setStatus(int sc, String sm) {
serverResponse.setStatusCode(sc);
serverResponse.setStatusMessage(sm);
diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java
index 6afd964..0626dab 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java
@@ -191,6 +191,7 @@ public class TestVertxServerResponseToHttpServletResponse {
Assert.assertEquals("json", headers.get(HttpHeaders.CONTENT_TYPE));
}
+ @SuppressWarnings("deprecation")
@Test
public void setStatus() {
response.setStatus(222, "test");
diff --git a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
index 0122d03..c95bc57 100644
--- a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
+++ b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
@@ -422,6 +422,7 @@ public class HystrixCommandPropertiesExt extends HystrixCommandProperties {
}
@Override
+ @Deprecated
public HystrixProperty<Integer> metricsRollingPercentileWindow() {
return metricsRollingPercentileWindowInMilliseconds;
}
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java
index bb50ad8..22f8b19 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java
@@ -92,6 +92,7 @@ public class LoadBalancer extends AbstractLoadBalancer {
}
@Override
+ @Deprecated
public List<Server> getServerList(boolean availableOnly) {
return getAllServers();
}
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java
index 092bc4e..0259d42 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java
@@ -51,6 +51,7 @@ public class TestLoadBalancer {
Assert.assertEquals("loadBalancerName", loadBalancer.getName());
}
+ @SuppressWarnings("deprecation")
@Test
public void testLoadBalancerFullOperationWithoutException() {
List<Server> newServers = new ArrayList<>();
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.