rename *Api to *Resource

12 files changed, 31 insertions, 31 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
index de437d0..37c51c2 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
@@ -33,12 +33,12 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 
-public abstract class BaseApi {
+public abstract class BaseResource {
 
     /**
      * Logger for this class
      */
-    private static final Logger log = Logger.getLogger(BaseApi.class);
+    private static final Logger log = Logger.getLogger(BaseResource.class);
 
     @GET @Path("/{uuid}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
index 3d450be..4395f9f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
@@ -33,7 +33,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 @Path("/consumer")
-public class ConsumerApi extends BaseApi {
+public class ConsumerResource extends BaseResource {
 
     @Override
     protected Class getApiClass() {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java
index 4c2aab6..d86f9ca 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java
@@ -26,7 +26,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 @Path("/entitlementpool")
-public class EntitlementPoolApi extends BaseApi {
+public class EntitlementPoolApi extends BaseResource {
 
     @Override
     protected Class getApiClass() {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
index 22b57d6..9d50639 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
@@ -43,12 +43,12 @@ import javax.ws.rs.core.MediaType;
  * REST api gateway for the User object.
  */
 @Path("/entitlement")
-public class EntitlementApi extends BaseApi {
+public class EntitlementResource extends BaseResource {
 
     /**
      * Logger for this class
      */
-    private static final Logger log = Logger.getLogger(EntitlementApi.class);
+    private static final Logger log = Logger.getLogger(EntitlementResource.class);
 
     /**
      * {@inheritDoc}
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
index c35d250..ad94c59 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 @Path("/owner")
-public class OwnerApi extends BaseApi {
+public class OwnerResource extends BaseResource {
     
     @Override
     protected Class getApiClass() {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/TestApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
index c2b036c..a36c5e2 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/TestApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
@@ -25,17 +25,17 @@ import javax.ws.rs.core.MediaType;
 
 
 /**
- * TestApi - used to prototype RESTful things without mucking up real
+ * TestResource - used to prototype RESTful things without mucking up real
  * test classes.
  * @version $Rev$
  */
 @Path("/test")
-public class TestApi {
+public class TestResource {
 
     private static JsonTestObject jto = null;
     
-    public TestApi() {
-        System.out.println("hello from TestApi ctor");
+    public TestResource() {
+        System.out.println("hello from TestResource ctor");
     }
     
     @GET
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
index b2c084f..5b5b08e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
@@ -34,7 +34,7 @@ import javax.ws.rs.core.MediaType;
  * REST api gateway for the User object.
  */
 @Path("/user")
-public class UserApi extends BaseApi {
+public class UserResource extends BaseResource {
 
     /**
      * Returns the User identified by the given login.
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
index e8b1aa0..14af87a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
@@ -8,7 +8,7 @@ import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.resource.ApiHandler;
-import org.fedoraproject.candlepin.resource.OwnerApi;
+import org.fedoraproject.candlepin.resource.OwnerResource;
 
 import junit.framework.TestCase;
 
@@ -43,7 +43,7 @@ public class ApiTest extends TestCase {
 		
 		String token = ApiHandler.get().login(u.getLogin(), u.getPassword());
 		
-		OwnerApi oapi = new OwnerApi();
+		OwnerResource oapi = new OwnerResource();
 		Owner lookedup = (Owner) oapi.get("BAD-UUID-NOTFOUND");
 		assertNull(lookedup);
 		lookedup = ApiHandler.get().getOwner(token, o.getUuid());
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index 4104e51..f76501e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -18,7 +18,7 @@ import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerInfo;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.test.TestUtil;
-import org.fedoraproject.candlepin.resource.ConsumerApi;
+import org.fedoraproject.candlepin.resource.ConsumerResource;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
@@ -30,15 +30,15 @@ import junit.framework.TestCase;
 
 
 /**
- * ConsumerApiTest
+ * ConsumerResourceTest
  * @version $Rev$
  */
-public class ConsumerApiTest extends TestCase {
+public class ConsumerResourceTest extends TestCase {
 
     public void testCreateConsumer() throws Exception {
         String newname = "test-consumer-" + System.currentTimeMillis();
         
-        ConsumerApi capi = new ConsumerApi();
+        ConsumerResource capi = new ConsumerResource();
         Form f = new Form();
         f.add("name", newname);
         f.add("type", "standard-system");
@@ -52,7 +52,7 @@ public class ConsumerApiTest extends TestCase {
     public void testDelete() {
         Consumer c = TestUtil.createConsumer();
         String uuid = c.getUuid();
-        ConsumerApi capi = new ConsumerApi();
+        ConsumerResource capi = new ConsumerResource();
         assertNotNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
         capi.delete(c);
         assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index 260f49d..6b3df4a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -25,7 +25,7 @@ import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.test.TestUtil;
-import org.fedoraproject.candlepin.resource.EntitlementApi;
+import org.fedoraproject.candlepin.resource.EntitlementResource;
 
 import java.sql.Date;
 import java.util.ArrayList;
@@ -35,10 +35,10 @@ import junit.framework.TestCase;
 
 
 /**
- * ConsumerApiTest
+ * ConsumerResourceTest
  * @version $Rev$
  */
-public class EntitlementApiTest extends TestCase {
+public class EntitlementResourceTest extends TestCase {
     
     private Consumer consumer;
     private Product product;
@@ -68,7 +68,7 @@ public class EntitlementApiTest extends TestCase {
     public void testEntitle() throws Exception {
         
         
-        EntitlementApi eapi = new EntitlementApi();
+        EntitlementResource eapi = new EntitlementResource();
         Form f = new Form();
         f.add("consumer_uuid", consumer.getUuid());
         f.add("product_uuid", product.getUuid());
@@ -112,14 +112,14 @@ public class EntitlementApiTest extends TestCase {
     public void testHasEntitlement() {
         System.out.println("Foo");
         
-        EntitlementApi eapi = new EntitlementApi();
+        EntitlementResource eapi = new EntitlementResource();
         eapi.entitle(consumer, product);
 
         assertTrue(eapi.hasEntitlement(consumer.getUuid(), product.getUuid()));
     }
 
     public void testListAvailableEntitlements() {
-        EntitlementApi eapi = new EntitlementApi();
+        EntitlementResource eapi = new EntitlementResource();
         Form f = new Form();
         f.add("consumer_uuid", consumer.getUuid());
         
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index bc65685..ee627c4 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -28,10 +28,10 @@ import junit.framework.TestCase;
 
 
 /**
- * TestApiTest
+ * TestResourceTest
  * @version $Rev$
  */
-public class TestApiTest extends TestCase {
+public class TestResourceTest extends TestCase {
     public void testJson() {
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
index 6f07267..0dc9956 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
@@ -16,7 +16,7 @@ package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.model.test.TestUtil;
-import org.fedoraproject.candlepin.resource.UserApi;
+import org.fedoraproject.candlepin.resource.UserResource;
 
 import com.sun.jersey.api.representation.Form;
 
@@ -24,11 +24,11 @@ import junit.framework.TestCase;
 
 
 /**
- * UserApiTest
+ * UserResourceTest
  * @version $Rev$
  */
-public class UserApiTest extends TestCase {
-    private UserApi api = new UserApi();
+public class UserResourceTest extends TestCase {
+    private UserResource api = new UserResource();
    
     public void testNewUser() {
         Form f = new Form();