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/08 09:23:23 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-189
fix CI problems and warnings for feature support async restTemplate
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
The following commit(s) were added to refs/heads/master by this push:
new 41228cb SCB-189 fix CI problems and warnings for feature support async restTemplate
41228cb is described below
commit 41228cb843a527c54e4d2585cef7f0ab723875cb
Author: lijasonvip <li...@huawei.com>
AuthorDate: Sun Apr 8 11:37:29 2018 +0800
SCB-189 fix CI problems and warnings for feature support async restTemplate
Signed-off-by: lijasonvip <li...@huawei.com>
---
.../apache/servicecomb/archetypes/HelloConsumer.java | 2 +-
.../reference/async/CseAsyncClientHttpRequest.java | 3 +--
.../reference/async/CseAsyncRestTemplate.java | 6 ++----
.../reference/async/CseAsyncClientHttpRequestTest.java | 18 +++++++++---------
.../reference/async/CseAsyncRequestCallbackTest.java | 13 +++++--------
.../springmvc/consumer/SpringmvcConsumerMain.java | 4 +---
6 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java
index 7007c11..e111383 100644
--- a/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java
+++ b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java
@@ -24,7 +24,7 @@ public class HelloConsumer {
private final RestTemplate restTemplate = RestTemplateBuilder.create();
public void invokeHello(){
- String result = restTemplate.getForObject("cse://business-service/hello", String.class);
+ restTemplate.getForObject("cse://business-service/hello", String.class);
}
}
diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java
index 1be86dc..d66a0c6 100644
--- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java
+++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java
@@ -50,12 +50,11 @@ public class CseAsyncClientHttpRequest extends CseClientHttpRequest implements A
return null;
}
- @SuppressWarnings("unchecked")
private ListenableFuture<ClientHttpResponse> invoke(Object[] args) {
Invocation invocation = prepareInvocation(args);
invocation.getHandlerContext().put(RestConst.CONSUMER_HEADER, this.getHeaders());
CompletableFuture<ClientHttpResponse> clientHttpResponseCompletableFuture = doAsyncInvoke(invocation);
- return new CompletableToListenableFutureAdapter(clientHttpResponseCompletableFuture);
+ return new CompletableToListenableFutureAdapter<ClientHttpResponse>(clientHttpResponseCompletableFuture);
}
protected CompletableFuture<ClientHttpResponse> doAsyncInvoke(Invocation invocation) {
diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java
index 6f16f99..4bf1ba5 100644
--- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java
+++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java
@@ -34,14 +34,12 @@ public class CseAsyncRestTemplate extends AsyncRestTemplate {
}
@Override
- @SuppressWarnings("unchecked")
protected <T> AsyncRequestCallback httpEntityCallback(HttpEntity<T> requestBody) {
- return new CseAsyncRequestCallback(requestBody);
+ return new CseAsyncRequestCallback<T>(requestBody);
}
@Override
- @SuppressWarnings("unchecked")
protected <T> AsyncRequestCallback httpEntityCallback(HttpEntity<T> requestBody, Type responseType) {
- return new CseAsyncRequestCallback(requestBody);
+ return new CseAsyncRequestCallback<T>(requestBody);
}
}
\ No newline at end of file
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java
index 4ae2bc7..35388cc 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java
@@ -59,10 +59,10 @@ public class CseAsyncClientHttpRequestTest {
ReferenceConfigUtils.setReady(false);
}
- @RequestMapping(path = "SpringmvcImpl")
- static class SpringmvcImpl {
- @RequestMapping(path = "/bytes", method = RequestMethod.POST)
- public byte[] bytes(@RequestBody byte[] input) {
+ @RequestMapping(path = "CseAsyncClientHttpRequestTestSchema")
+ static class CseAsyncClientHttpRequestTestSchema {
+ @RequestMapping(path = "/testbytes", method = RequestMethod.POST)
+ public byte[] testbytes(@RequestBody byte[] input) {
input[0] = (byte) (input[0] + 1);
return input;
}
@@ -89,17 +89,18 @@ public class CseAsyncClientHttpRequestTest {
serviceRegistry.init();
RegistryUtils.setServiceRegistry(serviceRegistry);
UnitTestMeta meta = new UnitTestMeta();
+
CseContext.getInstance()
.getSchemaListenerManager()
.setSchemaListenerList(Arrays.asList(new RestEngineSchemaListener()));
- SchemaMeta schemaMeta = meta.getOrCreateSchemaMeta(CseAsyncClientHttpRequestTest.SpringmvcImpl.class);
+ SchemaMeta schemaMeta = meta.getOrCreateSchemaMeta(CseAsyncClientHttpRequestTest.CseAsyncClientHttpRequestTestSchema.class);
CseContext.getInstance().getSchemaListenerManager().notifySchemaListener(schemaMeta);
Holder<Invocation> holder = new Holder<>();
CseAsyncClientHttpRequest client =
new CseAsyncClientHttpRequest(URI.create(
- "cse://app:test/" + CseAsyncClientHttpRequestTest.SpringmvcImpl.class.getSimpleName() + "/bytes"),
+ "cse://app:test/" + CseAsyncClientHttpRequestTest.CseAsyncClientHttpRequestTestSchema.class.getSimpleName() + "/testbytes"),
HttpMethod.POST) {
@Override
protected CompletableFuture<ClientHttpResponse> doAsyncInvoke(Invocation invocation) {
@@ -124,8 +125,7 @@ public class CseAsyncClientHttpRequestTest {
CseContext.getInstance()
.getSchemaListenerManager()
.setSchemaListenerList(Arrays.asList(new RestEngineSchemaListener()));
-
- SchemaMeta schemaMeta = meta.getOrCreateSchemaMeta(CseAsyncClientHttpRequestTest.SpringmvcImpl.class);
+ SchemaMeta schemaMeta = meta.getOrCreateSchemaMeta(CseAsyncClientHttpRequestTest.CseAsyncClientHttpRequestTestSchema.class);
CseContext.getInstance().getSchemaListenerManager().notifySchemaListener(schemaMeta);
Throwable error = new Error("failed");
@@ -133,7 +133,7 @@ public class CseAsyncClientHttpRequestTest {
CseAsyncClientHttpRequest client =
new CseAsyncClientHttpRequest(URI.create(
- "cse://app:test/" + CseAsyncClientHttpRequestTest.SpringmvcImpl.class.getSimpleName() + "/bytes"),
+ "cse://app:test/" + CseAsyncClientHttpRequestTest.CseAsyncClientHttpRequestTestSchema.class.getSimpleName() + "/testbytes"),
HttpMethod.POST) {
@Override
protected CompletableFuture<ClientHttpResponse> doAsyncInvoke(Invocation invocation) {
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java
index 5a41a4d..4e906e3 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java
@@ -28,27 +28,24 @@ public class CseAsyncRequestCallbackTest {
@Test
public void testNormal() {
CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest();
- @SuppressWarnings("unchecked")
- CseAsyncRequestCallback cb = new CseAsyncRequestCallback(null);
+ CseAsyncRequestCallback<HttpEntity<?>> cb = new CseAsyncRequestCallback<>(null);
cb.doWithRequest(request);
Assert.assertEquals(null, request.getContext());
}
@Test
- @SuppressWarnings("unchecked")
- public void testHttpEntity(@Injectable HttpEntity<?> entity) {
- CseAsyncRequestCallback cb = new CseAsyncRequestCallback(entity);
+ public void testHttpEntity(@Injectable HttpEntity<String> entity) {
+ CseAsyncRequestCallback<String> cb = new CseAsyncRequestCallback<>(entity);
CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest();
cb.doWithRequest(request);
Assert.assertEquals(entity.getBody(), request.getBody());
}
@Test
- @SuppressWarnings("unchecked")
- public void testCseEntity(@Injectable CseHttpEntity<?> entity) {
+ public void testCseEntity(@Injectable CseHttpEntity<String> entity) {
CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest();
entity.addContext("c1", "c2");
- CseAsyncRequestCallback cb = new CseAsyncRequestCallback(entity);
+ CseAsyncRequestCallback<String> cb = new CseAsyncRequestCallback<>(entity);
cb.doWithRequest(request);
Assert.assertEquals(entity.getContext(), request.getContext());
}
diff --git a/samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java b/samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java
index 417cac6..1519aca 100644
--- a/samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java
+++ b/samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java
@@ -16,8 +16,6 @@
*/
package org.apache.servicecomb.samples.springmvc.consumer;
-import java.lang.invoke.MethodHandles;
-
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
import org.apache.servicecomb.provider.pojo.RpcReference;
@@ -37,7 +35,7 @@ import org.springframework.web.client.RestTemplate;
@Component
public class SpringmvcConsumerMain {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger LOG = LoggerFactory.getLogger(SpringmvcConsumerMain.class);
private static RestTemplate restTemplate = RestTemplateBuilder.create();
@RpcReference(microserviceName = "springmvc", schemaId = "springmvcHello")
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.