[HippoCMS-svn] [53302] hippo-cms7/essentials: ESSENTIALS-673 Rest (remote) client is broken

[mmilicevic]

Revision: 53302
Author:   mmilicevic
Date:     2015-04-21 15:54:23 +0200 (Tue, 21 Apr 2015)
Log Message:
-----------
ESSENTIALS-673 Rest (remote) client is broken

Modified Paths:
--------------
    hippo-cms7/essentials/trunk/dashboard/pom.xml
    
hippo-cms7/essentials/trunk/dashboard/src/main/java/org/onehippo/cms7/essentials/rest/client/RestClient.java

Modified: hippo-cms7/essentials/trunk/dashboard/pom.xml
===================================================================
--- hippo-cms7/essentials/trunk/dashboard/pom.xml       2015-04-21 13:51:38 UTC 
(rev 53301)
+++ hippo-cms7/essentials/trunk/dashboard/pom.xml       2015-04-21 13:54:23 UTC 
(rev 53302)
@@ -60,6 +60,11 @@
       <version>${jaxb-api.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-client</artifactId>
+      <version>${cxf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: 
hippo-cms7/essentials/trunk/dashboard/src/main/java/org/onehippo/cms7/essentials/rest/client/RestClient.java
===================================================================
--- 
hippo-cms7/essentials/trunk/dashboard/src/main/java/org/onehippo/cms7/essentials/rest/client/RestClient.java
        2015-04-21 13:51:38 UTC (rev 53301)
+++ 
hippo-cms7/essentials/trunk/dashboard/src/main/java/org/onehippo/cms7/essentials/rest/client/RestClient.java
        2015-04-21 13:54:23 UTC (rev 53302)
@@ -16,11 +16,9 @@
 
 package org.onehippo.cms7.essentials.rest.client;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
 
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.transport.http.HTTPConduit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,22 +50,16 @@
     }
 
     public String getPluginList() {
-        final Client client = ClientBuilder.newBuilder().newClient();
-        final WebTarget target = client.target(baseResourceUri);
-        final Invocation.Builder builder = target.request();
-        return builder.get(String.class);
+        final WebClient client = WebClient.create(baseResourceUri);
+        return client.get(String.class);
     }
 
 
     public String getJson() {
-
-        final Client client = ClientBuilder.newBuilder().newClient();
-        final WebTarget target = client.target(baseResourceUri);
-        final Invocation.Builder builder = target.request();
-
+        final WebClient client = WebClient.create(baseResourceUri);
         setTimeouts(client, connectionTimeout, receiveTimeout);
         try {
-            return builder.get(String.class);
+            return client.get(String.class);
         } catch (Exception e) {
             log.error("Error requesting remote plugin descriptors for 
repository: " + baseResourceUri, e);
         }
@@ -75,14 +67,14 @@
     }
 
 
-    private void setTimeouts(final Client client, final long 
connectionTimeout, final long receiveTimeout) {
+    private void setTimeouts(final WebClient client, final long 
connectionTimeout, final long receiveTimeout) {
         // TODO: figure out how to set timeout with new JAXRS API
-       /* HTTPConduit conduit = WebClient.getConfig(client).getHttpConduit();
+        HTTPConduit conduit = WebClient.getConfig(client).getHttpConduit();
         if (receiveTimeout != 0) {
             conduit.getClient().setReceiveTimeout(receiveTimeout);
         }
         if (connectionTimeout != 0) {
             conduit.getClient().setConnectionTimeout(connectionTimeout);
-        }*/
     }
 }
+}

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn