You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/10/18 16:43:38 UTC
cxf git commit: Minor update to the bean param test
Repository: cxf
Updated Branches:
refs/heads/master 1f7439c1a -> 5bfdacda5
Minor update to the bean param test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5bfdacda
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5bfdacda
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5bfdacda
Branch: refs/heads/master
Commit: 5bfdacda5152b2a0e73fb2ddc6455da8eec7edaa
Parents: 1f7439c
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Sun Oct 18 15:43:21 2015 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Sun Oct 18 15:43:21 2015 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java | 6 +++---
.../apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5bfdacda/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 25c4053..5cf6ef1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -342,10 +342,10 @@ public class BookStore {
}
@GET
- @Path("/beanparam2/{id}")
+ @Path("/twoBeanParams/{id}")
@Produces("application/xml")
- public Book getBeanParamBook2(@BeanParam BookBean2 bean1,
- @BeanParam BookBeanNested bean2) {
+ public Book getTwoBeanParamsBook(@BeanParam BookBean2 bean1,
+ @BeanParam BookBeanNested bean2) {
long id = bean1.getId() + bean1.getId2() + bean1.getId3();
if (bean2.getId4() != id) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/5bfdacda/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index d1b5f81..2bb461b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -473,7 +473,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
bean.setId2(23L);
BookStore.BookBeanNested nested = new BookStore.BookBeanNested();
nested.setId4(123);
- Book book = store.getBeanParamBook2(bean, nested);
+ Book book = store.getTwoBeanParamsBook(bean, nested);
assertEquals(123L, book.getId());
}