more refactoring

6 files changed, 47 insertions, 32 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
index 37c51c2..e671dec 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
@@ -34,8 +34,17 @@ import javax.ws.rs.core.MediaType;
 
 
 public abstract class BaseResource {
+    private Class model;
 
     /**
+     * Ctor
+     * @param model
+     */
+    public BaseResource(Class modelClass) {
+        this.model = modelClass;
+    }
+    
+    /**
      * Logger for this class
      */
     private static final Logger log = Logger.getLogger(BaseResource.class);
@@ -79,6 +88,8 @@ public abstract class BaseResource {
         log.debug("Deleted.");
     }
     
-    protected abstract Class getApiClass();
+    protected Class getApiClass() {
+        return model;
+    }
 
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
index 4395f9f..54f5577 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
@@ -35,9 +35,11 @@ import javax.ws.rs.core.MediaType;
 @Path("/consumer")
 public class ConsumerResource extends BaseResource {
 
-    @Override
-    protected Class getApiClass() {
-        return Consumer.class;
+    /**
+     * default ctor
+     */
+    public ConsumerResource() {
+        super(Consumer.class);
     }
     
     @GET
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
index d86f9ca..3c2d956 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
@@ -26,11 +26,13 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 @Path("/entitlementpool")
-public class EntitlementPoolApi extends BaseResource {
+public class EntitlementPoolResource extends BaseResource {
 
-    @Override
-    protected Class getApiClass() {
-        return EntitlementPool.class;
+    /**
+     * default ctor
+     */
+    public EntitlementPoolResource() {
+        super(EntitlementPool.class);
     }
     
     @GET
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
index 9d50639..4619bbc 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
@@ -14,18 +14,18 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import com.sun.jersey.api.representation.Form;
-
-import org.apache.log4j.Logger;
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.Entitlement;
 import org.fedoraproject.candlepin.model.EntitlementPool;
-import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.resource.cert.CertGenerator;
 
+import com.sun.jersey.api.representation.Form;
+
+import org.apache.log4j.Logger;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,18 +46,17 @@ import javax.ws.rs.core.MediaType;
 public class EntitlementResource extends BaseResource {
 
     /**
-     * Logger for this class
+     * default ctor
      */
-    private static final Logger log = Logger.getLogger(EntitlementResource.class);
+    public EntitlementResource() {
+        super(Entitlement.class);
+    }
 
     /**
-     * {@inheritDoc}
+     * Logger for this class
      */
-    @Override
-    protected Class getApiClass() {
-        return Entitlement.class;
-    }
- 
+    private static final Logger log = Logger.getLogger(EntitlementResource.class);
+
     private Object validateObjectInput(Form form, String fieldName, Class clazz) {
         String uuid = form.getFirst(fieldName);
         log.debug("UUID: " + uuid);
@@ -160,7 +159,7 @@ public class EntitlementResource extends BaseResource {
     @Path("/listavailable")
     public List<EntitlementPool> listAvailableEntitlements(@PathParam("uuid") String uuid) {
         Consumer c = (Consumer) validateObjectInput(uuid, Consumer.class);
-        List<EntitlementPool> entitlementPools = new EntitlementPoolApi().list();
+        List<EntitlementPool> entitlementPools = new EntitlementPoolResource().list();
         List<EntitlementPool> retval = new ArrayList<EntitlementPool>();
         EntitlementMatcher matcher = new EntitlementMatcher();
         for (EntitlementPool ep : entitlementPools) {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
index ad94c59..c66747c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
@@ -28,9 +28,11 @@ import javax.ws.rs.core.MediaType;
 @Path("/owner")
 public class OwnerResource extends BaseResource {
     
-    @Override
-    protected Class getApiClass() {
-        return Owner.class;
+    /**
+     * @param modelClassIn
+     */
+    public OwnerResource() {
+        super(Owner.class);
     }
 
     @GET
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
index 5b5b08e..f88cb3f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
@@ -37,6 +37,13 @@ import javax.ws.rs.core.MediaType;
 public class UserResource extends BaseResource {
 
     /**
+     * default ctor
+     */
+    public UserResource() {
+        super(User.class);
+    }
+
+    /**
      * Returns the User identified by the given login.
      * @return user whose login is 'login'
      */
@@ -47,14 +54,6 @@ public class UserResource extends BaseResource {
     }
 
     /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Class getApiClass() {
-        return User.class;
-    }
-
-    /**
      * Returns a list of Users.
      * @return a list of Users.
      */