Return-Path: 
 <commits-return-22096-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 294ACDA00
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 24 Sep 2012 12:02:30 +0000 (UTC)
Received: (qmail 2718 invoked by uid 500); 24 Sep 2012 12:02:29 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 2595 invoked by uid 500); 24 Sep 2012 12:02:29 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 2575 invoked by uid 99); 24 Sep 2012 12:02:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2012 12:02:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2012 12:02:26 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BFAA723888E4;
	Mon, 24 Sep 2012 12:01:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1389318 - in /cxf/trunk:
 rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
Date: Mon, 24 Sep 2012 12:01:43 -0000
To: commits@cxf.apache.org
From: sergeyb@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120924120143.BFAA723888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sergeyb
Date: Mon Sep 24 12:01:43 2012
New Revision: 1389318

URL: http://svn.apache.org/viewvc?rev=1389318&view=rev
Log:
Populating AsyncInvoker implementation

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1389318&r1=1389317&r2=1389318&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Mon Sep 24 12:01:43 2012
@@ -488,7 +488,7 @@ public class WebClient extends AbstractC
      * @return the future
      */
     public <T> Future<T> get(InvocationCallback<T> callback) {
-        return doInvokeAsync("GET", null, null, null, callback);
+        return doInvokeAsyncCallback("GET", null, null, null, callback);
     }
     
     /**
@@ -780,15 +780,26 @@ public class WebClient extends AbstractC
         return null;
     }
     
+    protected <T> Future<T> doInvokeAsyncCallback(String httpMethod, 
+                                                  Object body, 
+                                                  Class<?> requestClass,
+                                                  Type inType,
+                                                  InvocationCallback<T> callback) {
+        
+        Type outType = getCallbackType(callback);
+        Class<?> respClass = outType instanceof Class ? (Class<?>) outType : null;
+        
+        return doInvokeAsync(httpMethod, body, requestClass, inType, respClass, outType, callback);
+    }
+    
     protected <T> Future<T> doInvokeAsync(String httpMethod, 
                                           Object body, 
                                           Class<?> requestClass,
                                           Type inType,
+                                          Class<?> respClass,
+                                          Type outType,
                                           InvocationCallback<T> callback) {
         
-        Type outType = getCallbackType(callback);
-        Class<?> respClass = outType instanceof Class ? (Class<?>) outType : null;
-        
         MultivaluedMap<String, String> headers = prepareHeaders(respClass, body);
         resetResponse();
 
@@ -1059,206 +1070,178 @@ public class WebClient extends AbstractC
 
         @Override
         public Future<Response> get() {
-            // TODO Auto-generated method stub
-            return null;
+            return get(Response.class);
         }
 
         @Override
         public <T> Future<T> get(Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("GET", responseType);
         }
 
         @Override
         public <T> Future<T> get(GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("GET", responseType);
         }
 
         @Override
         public <T> Future<T> get(InvocationCallback<T> callback) {
-            return doInvokeAsync("GET", null, null, null, callback);
+            return method("GET", callback);
         }
 
         @Override
         public Future<Response> put(Entity<?> entity) {
-            // TODO Auto-generated method stub
-            return null;
+            return put(entity, Response.class);
         }
 
         @Override
         public <T> Future<T> put(Entity<?> entity, Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("PUT", entity, responseType);
         }
 
         @Override
         public <T> Future<T> put(Entity<?> entity, GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("PUT", entity, responseType);
         }
 
         @Override
         public <T> Future<T> put(Entity<?> entity, InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("PUT", entity, callback);
         }
 
         @Override
         public Future<Response> post(Entity<?> entity) {
-            // TODO Auto-generated method stub
-            return null;
+            return post(entity, Response.class);
         }
 
         @Override
         public <T> Future<T> post(Entity<?> entity, Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("POST", entity, responseType);
         }
 
         @Override
         public <T> Future<T> post(Entity<?> entity, GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("POST", entity, responseType);
         }
 
         @Override
         public <T> Future<T> post(Entity<?> entity, InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("POST", entity, callback);
         }
 
         @Override
         public Future<Response> delete() {
-            // TODO Auto-generated method stub
-            return null;
+            return delete(Response.class);
         }
 
         @Override
         public <T> Future<T> delete(Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("DELETE", responseType);
         }
 
         @Override
         public <T> Future<T> delete(GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("DELETE", responseType);
         }
 
         @Override
         public <T> Future<T> delete(InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("DELETE", callback);
         }
 
         @Override
         public Future<Response> head() {
-            // TODO Auto-generated method stub
-            return null;
+            return method("HEAD");
         }
 
         @Override
         public Future<Response> head(InvocationCallback<Response> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("HEAD", callback);
         }
 
         @Override
         public Future<Response> options() {
-            // TODO Auto-generated method stub
-            return null;
+            return options(Response.class);
         }
 
         @Override
         public <T> Future<T> options(Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("OPTIONS", responseType);
         }
 
         @Override
         public <T> Future<T> options(GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("OPTIONS", responseType);
         }
 
         @Override
         public <T> Future<T> options(InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("OPTIONS", callback);
         }
 
         @Override
         public Future<Response> trace() {
-            // TODO Auto-generated method stub
-            return null;
+            return trace(Response.class);
         }
 
         @Override
         public <T> Future<T> trace(Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("TRACE", responseType);
         }
 
         @Override
         public <T> Future<T> trace(GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("TRACE", responseType);
         }
 
         @Override
         public <T> Future<T> trace(InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return method("TRACE", callback);
         }
 
         @Override
         public Future<Response> method(String name) {
-            // TODO Auto-generated method stub
-            return null;
+            return method(name, Response.class);
         }
 
         @Override
         public <T> Future<T> method(String name, Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return doInvokeAsync(name, null, null, null, responseType, responseType, null);
         }
 
         @Override
         public <T> Future<T> method(String name, GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return doInvokeAsync(name, null, null, null, responseType.getRawType(),
+                                 responseType.getType(), null);
         }
 
         @Override
         public <T> Future<T> method(String name, InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return doInvokeAsyncCallback(name, null, null, null, callback);
         }
 
         @Override
         public Future<Response> method(String name, Entity<?> entity) {
-            // TODO Auto-generated method stub
-            return null;
+            return method(name, entity, Response.class);
         }
 
         @Override
         public <T> Future<T> method(String name, Entity<?> entity, Class<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return doInvokeAsync(name, entity.getEntity(), entity.getClass(), entity.getClass(), 
+                                 responseType, responseType, null);
         }
 
         @Override
         public <T> Future<T> method(String name, Entity<?> entity, GenericType<T> responseType) {
-            // TODO Auto-generated method stub
-            return null;
+            return doInvokeAsync(name, entity.getEntity(), entity.getClass(), entity.getClass(), 
+                                 responseType.getRawType(), responseType.getType(), null);
         }
 
         @Override
         public <T> Future<T> method(String name, Entity<?> entity, InvocationCallback<T> callback) {
-            // TODO Auto-generated method stub
-            return null;
+            return doInvokeAsync(name, entity.getEntity(), entity.getClass(), entity.getClass(), 
+                                 Response.class, Response.class, callback);
         }
         
     }
+    
 }

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java?rev=1389318&r1=1389317&r2=1389318&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Mon Sep 24 12:01:43 2012
@@ -69,6 +69,16 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    public void testGetBookAsyncNoCallback() throws Exception {
+        String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple";
+        WebClient wc = createWebClient(address);
+        Future<Book> future = wc.async().get(Book.class);
+        Book book = future.get();
+        assertEquals(124L, book.getId());
+        validateResponse(wc);
+    }
+    
+    @Test
     public void testGetBookAsyncResponse() throws Exception {
         String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple";
         doTestGetBookAsyncResponse(address, false);