cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Minor update to the bean param test
Date Sun, 18 Oct 2015 14:45:03 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 37051f5b7 -> 9bc19b6f9


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/9bc19b6f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9bc19b6f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9bc19b6f

Branch: refs/heads/3.0.x-fixes
Commit: 9bc19b6f9c56884e96f5cb46d42a66886ca00abf
Parents: 37051f5
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Sun Oct 18 15:43:21 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Sun Oct 18 15:44:40 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/9bc19b6f/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 7621ab3..544f326 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/9bc19b6f/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 9ac9fb5..7c6293e 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());
         
     }


Mime
View raw message