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/08/09 00:59:58 UTC
[incubator-servicecomb-java-chassis] 02/02: [SCB-800] update
related IT
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 3edca801fe18fd6f93805bdf97f62aae58c99284
Author: yaohaishi <ya...@huawei.com>
AuthorDate: Mon Aug 6 17:14:26 2018 +0800
[SCB-800] update related IT
---
.../client/beanParam/BeanParamPojoClient.java | 8 +++----
.../client/beanParam/BeanParamTestServiceIntf.java | 4 ++--
.../jaxrs/server/beanParam/TestBeanParameter.java | 26 +++++++++++++++-------
.../beanParam/TestBeanParameterWithUpload.java | 9 +++-----
4 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamPojoClient.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamPojoClient.java
index fe15bda..cf70f8e 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamPojoClient.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamPojoClient.java
@@ -24,7 +24,7 @@ import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.provider.pojo.Invoker;
public class BeanParamPojoClient {
- BeanParamTestServiceIntf beanParamTestServiceIntf;
+ private BeanParamTestServiceIntf beanParamTestServiceIntf;
public BeanParamPojoClient() {
beanParamTestServiceIntf = Invoker.createProxy("jaxrs", "beanParamTest", BeanParamTestServiceIntf.class);
@@ -35,15 +35,15 @@ public class BeanParamPojoClient {
testUpload();
}
- public void testBeanParam() {
- String result = beanParamTestServiceIntf.beanParameterTest("querySwaggerValue", 10, 2, "pathSwaggerValue", "extra");
+ private void testBeanParam() {
+ String result = beanParamTestServiceIntf.beanParameterTest("querySwaggerValue", 2, "pathSwaggerValue", 10, "extra");
TestMgr.check(
"invocationContextConsistency=true|testBeanParameter=TestBeanParameter{queryStr='querySwaggerValue', headerInt=2, "
+ "pathStr='pathSwaggerValue', cookieLong=10}|extraQuery=extra",
result);
}
- public void testUpload() {
+ private void testUpload() {
BufferedInputStream bufferedInputStream0 = new BufferedInputStream(new ByteArrayInputStream("up0".getBytes()));
BufferedInputStream bufferedInputStream1 = new BufferedInputStream(new ByteArrayInputStream("up1".getBytes()));
BufferedInputStream bufferedInputStream2 = new BufferedInputStream(new ByteArrayInputStream("up2".getBytes()));
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamTestServiceIntf.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamTestServiceIntf.java
index 1d8c602..4149adc 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamTestServiceIntf.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/beanParam/BeanParamTestServiceIntf.java
@@ -20,8 +20,8 @@ package org.apache.servicecomb.demo.jaxrs.client.beanParam;
import java.io.InputStream;
public interface BeanParamTestServiceIntf {
- String beanParameterTest(String querySwaggerStr, long cookieSwaggerLong, Integer headerSwaggerInt,
- String pathSwaggerStr, String extraQuery);
+ String beanParameterTest(String querySwaggerStr, Integer headerSwaggerInt, String pathSwaggerStr,
+ long cookieSwaggerLong, String extraQuery);
String beanParameterTestUpload(InputStream up0, String query, InputStream up1, InputStream up2, String extraQuery);
}
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java
index 9e8c319..489b29c 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java
@@ -23,6 +23,8 @@ import javax.ws.rs.HeaderParam;
import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
public class TestBeanParameter {
@DefaultValue("defaultQueryValue")
@QueryParam("querySwaggerStr")
@@ -35,13 +37,15 @@ public class TestBeanParameter {
@CookieParam("cookieSwaggerLong")
private long cookieLong;
+ @JsonIgnore
+ private String ignoredField;
+
public String getQueryStr() {
return queryStr;
}
- public TestBeanParameter setQueryStr(String queryStr) {
+ public void setQueryStr(String queryStr) {
this.queryStr = queryStr;
- return this;
}
public Integer getHeaderInt() {
@@ -50,9 +54,8 @@ public class TestBeanParameter {
@DefaultValue("12")
@HeaderParam("headerSwaggerInt")
- public TestBeanParameter setHeaderInt(Integer headerInt) {
+ public void setHeaderInt(Integer headerInt) {
this.headerInt = headerInt;
- return this;
}
public String getPathStr() {
@@ -60,18 +63,25 @@ public class TestBeanParameter {
}
@PathParam("pathSwaggerStr")
- public TestBeanParameter setPathStr(String pathStr) {
+ public void setPathStr(String pathStr) {
this.pathStr = pathStr;
- return this;
}
public long getCookieLong() {
return cookieLong;
}
- public TestBeanParameter setCookieLong(long cookieLong) {
+ public void
+ setCookieLong(long cookieLong) {
this.cookieLong = cookieLong;
- return this;
+ }
+
+ public String getIgnoredField() {
+ return ignoredField;
+ }
+
+ public void setIgnoredField(String ignoredField) {
+ this.ignoredField = ignoredField;
}
@Override
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java
index fdef568..80530ab 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java
@@ -34,18 +34,16 @@ public class TestBeanParameterWithUpload {
return queryStr;
}
- public TestBeanParameterWithUpload setQueryStr(String queryStr) {
+ public void setQueryStr(String queryStr) {
this.queryStr = queryStr;
- return this;
}
public Part getUp1() {
return up1;
}
- public TestBeanParameterWithUpload setUp1(Part up1) {
+ public void setUp1(Part up1) {
this.up1 = up1;
- return this;
}
public Part getUp2() {
@@ -53,9 +51,8 @@ public class TestBeanParameterWithUpload {
}
@FormParam("up2")
- public TestBeanParameterWithUpload setUp2(Part up2) {
+ public void setUp2(Part up2) {
this.up2 = up2;
- return this;
}
@Override