Changes to TPSConnectorService based on review

3 files changed, 15 insertions, 5 deletions

diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java
index 09ba9db45..fa5ae4f2d 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java
@@ -2,6 +2,8 @@ package com.netscape.certsrv.system;
 
 import java.net.URISyntaxException;
 
+import org.jboss.resteasy.client.ClientResponse;
+
 import com.netscape.certsrv.client.Client;
 import com.netscape.certsrv.client.PKIClient;
 import com.netscape.certsrv.key.KeyData;
@@ -36,7 +38,10 @@ public class TPSConnectorClient extends Client {
     }
 
     public TPSConnectorData createConnector(String tpsHost, String tpsPort) {
-        return tpsConnectorClient.createConnector(tpsHost, tpsPort);
+        @SuppressWarnings("unchecked")
+        ClientResponse<TPSConnectorData> response = (ClientResponse<TPSConnectorData>)
+                tpsConnectorClient.createConnector(tpsHost, tpsPort);
+        return client.getEntity(response);
     }
 
     public void deleteConnector(String id) {
diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorData.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorData.java
index d5e1480eb..5483fa8ed 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorData.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorData.java
@@ -44,7 +44,7 @@ public class TPSConnectorData {
         this.id = id;
     }
 
-    @XmlAttribute(name="Host")
+    @XmlElement(name="Host")
     public String getHost() {
         return host;
     }
@@ -53,7 +53,7 @@ public class TPSConnectorData {
         this.host = host;
     }
 
-    @XmlAttribute(name="Port")
+    @XmlElement(name="Port")
     public String getPort() {
         return port;
     }
@@ -71,7 +71,7 @@ public class TPSConnectorData {
         this.userID = userID;
     }
 
-    @XmlAttribute(name="Nickname")
+    @XmlElement(name="Nickname")
     public String getNickname() {
         return nickname;
     }
@@ -80,6 +80,7 @@ public class TPSConnectorData {
         this.nickname = nickname;
     }
 
+    @XmlElement(name="Link")
     public Link getLink() {
         return link;
     }
diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
index 8a76ee696..54519f0ff 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
@@ -26,6 +26,9 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.ClientResponseType;
 
 import com.netscape.certsrv.acls.ACLMapping;
 import com.netscape.certsrv.authentication.AuthMethodMapping;
@@ -53,8 +56,9 @@ public interface TPSConnectorResource {
             @QueryParam("port") String port);
 
     @POST
+    @ClientResponseType(entityType=TPSConnectorData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TPSConnectorData createConnector(@QueryParam("host") String host,
+    public Response createConnector(@QueryParam("host") String host,
             @QueryParam("port") String port);
 
     @DELETE