Renamed TPS connection to TPS connector (part 4).

The TPS connection REST service has been renamed to TPS connector.

Ticket #977

2 files changed, 28 insertions, 28 deletions

diff --git a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
index 4a86f1eae..7870a7d4d 100644
--- a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorClient.java
@@ -29,7 +29,7 @@ import com.netscape.certsrv.client.PKIClient;
  */
 public class ConnectorClient extends Client {
 
-    public ConnectionResource resource;
+    public ConnectorResource resource;
 
     public ConnectorClient(PKIClient client, String subsystem) throws URISyntaxException {
         super(client, subsystem, "connector");
@@ -37,36 +37,36 @@ public class ConnectorClient extends Client {
     }
 
     public void init() throws URISyntaxException {
-        resource = createProxy(ConnectionResource.class);
+        resource = createProxy(ConnectorResource.class);
     }
 
     public ConnectorCollection findConnectors(String filter, Integer start, Integer size) {
-        Response response = resource.findConnections(filter, start, size);
+        Response response = resource.findConnectors(filter, start, size);
         return client.getEntity(response, ConnectorCollection.class);
     }
 
     public ConnectorData getConnector(String connectorID) {
-        Response response = resource.getConnection(connectorID);
+        Response response = resource.getConnector(connectorID);
         return client.getEntity(response, ConnectorData.class);
     }
 
     public ConnectorData addConnector(ConnectorData connectorData) {
-        Response response = resource.addConnection(connectorData);
+        Response response = resource.addConnector(connectorData);
         return client.getEntity(response, ConnectorData.class);
     }
 
     public ConnectorData updateConnector(String connectorID, ConnectorData connectorData) {
-        Response response = resource.updateConnection(connectorID, connectorData);
+        Response response = resource.updateConnector(connectorID, connectorData);
         return client.getEntity(response, ConnectorData.class);
     }
 
     public ConnectorData changeConnectorStatus(String connectorID, String action) {
-        Response response = resource.changeConnectionStatus(connectorID, action);
+        Response response = resource.changeConnectorStatus(connectorID, action);
         return client.getEntity(response, ConnectorData.class);
     }
 
     public void removeConnector(String connectorID) {
-        Response response = resource.removeConnection(connectorID);
+        Response response = resource.removeConnector(connectorID);
         client.getEntity(response, Void.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/tps/connector/ConnectionResource.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
index 1fb9fa33c..9df4bffca 100644
--- a/base/common/src/com/netscape/certsrv/tps/connector/ConnectionResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
@@ -35,47 +35,47 @@ import com.netscape.certsrv.base.PATCH;
 /**
  * @author Endi S. Dewata
  */
-@Path("connections")
-@AuthMethodMapping("connections")
-@ACLMapping("connections.read")
-public interface ConnectionResource {
+@Path("connectors")
+@AuthMethodMapping("connectors")
+@ACLMapping("connectors.read")
+public interface ConnectorResource {
 
     @GET
     @ClientResponseType(entityType=ConnectorCollection.class)
-    public Response findConnections(
+    public Response findConnectors(
             @QueryParam("filter") String filter,
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
 
     @GET
-    @Path("{connectionID}")
+    @Path("{connectorID}")
     @ClientResponseType(entityType=ConnectorData.class)
-    public Response getConnection(@PathParam("connectionID") String connectionID);
+    public Response getConnector(@PathParam("connectorID") String connectorID);
 
     @POST
-    @ACLMapping("connections.add")
+    @ACLMapping("connectors.add")
     @ClientResponseType(entityType=ConnectorData.class)
-    public Response addConnection(ConnectorData connectorData);
+    public Response addConnector(ConnectorData connectorData);
 
     @PATCH
-    @Path("{connectionID}")
-    @ACLMapping("connections.modify")
+    @Path("{connectorID}")
+    @ACLMapping("connectors.modify")
     @ClientResponseType(entityType=ConnectorData.class)
-    public Response updateConnection(
-            @PathParam("connectionID") String connectionID,
+    public Response updateConnector(
+            @PathParam("connectorID") String connectorID,
             ConnectorData connectorData);
 
     @POST
-    @Path("{connectionID}")
-    @ACLMapping("connections.approve")
+    @Path("{connectorID}")
+    @ACLMapping("connectors.approve")
     @ClientResponseType(entityType=ConnectorData.class)
-    public Response changeConnectionStatus(
-            @PathParam("connectionID") String connectionID,
+    public Response changeConnectorStatus(
+            @PathParam("connectorID") String connectorID,
             @QueryParam("action") String action);
 
     @DELETE
-    @Path("{connectionID}")
+    @Path("{connectorID}")
     @ClientResponseType(entityType=Void.class)
-    @ACLMapping("connections.remove")
-    public Response removeConnection(@PathParam("connectionID") String connectionID);
+    @ACLMapping("connectors.remove")
+    public Response removeConnector(@PathParam("connectorID") String connectorID);
 }