removed unused imports

11 files changed, 33 insertions, 54 deletions

diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/model/Certificate.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Certificate.java
index 4938f87..9e4e932 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/model/Certificate.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Certificate.java
@@ -16,20 +16,20 @@
 package org.fedoraproject.candlepin.model;
 
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-import javax.persistence.Lob;
-import javax.persistence.Id;
-import javax.persistence.Column;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.hibernate.annotations.ForeignKey;
 
diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPool.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPool.java
index 3c5e117..b36e6bf 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPool.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPool.java
@@ -25,7 +25,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/resource/CertificateResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/CertificateResource.java
index ef3c81e..e8cc261 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/resource/CertificateResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/CertificateResource.java
@@ -27,7 +27,6 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-//import org.fedoraproject.candlepin.model.Certificate;
 import org.fedoraproject.candlepin.model.CertificateCurator;
 import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.EntitlementPoolCurator;
diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementResource.java
index b224ab5..91d62e6 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementResource.java
@@ -44,7 +44,6 @@ import org.fedoraproject.candlepin.resource.cert.CertGenerator;
 import org.fedoraproject.candlepin.util.EntityManagerUtil;
 
 import com.google.inject.Inject;
-import com.sun.jersey.api.representation.Form;
 
 
 /**
diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/resource/TestResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/TestResource.java
index ce961b5..3239ad1 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/resource/TestResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/TestResource.java
@@ -23,9 +23,6 @@ import javax.ws.rs.core.MediaType;
 
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.JsonTestObject;
-import org.fedoraproject.candlepin.model.OwnerCurator;
-
-import com.google.inject.Inject;
 
 
 /**
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
index 15fec87..da34e5b 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
@@ -14,8 +14,6 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
-import static org.junit.Assert.assertEquals;
-
 import static org.junit.Assert.*;
 
 import java.util.Map;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java
index 1558405..248d70a 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java
@@ -2,20 +2,12 @@ package org.fedoraproject.candlepin.model.test;
 
 import static org.junit.Assert.*;
 
-import org.fedoraproject.candlepin.model.Product;
-import org.fedoraproject.candlepin.util.EntityManagerUtil;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import java.util.List;
 
-import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
-import org.fedoraproject.candlepin.util.EntityManagerUtil;
 import org.junit.Test;
 
 public class ProductTest extends DatabaseTestFixture {
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index 121f4d0..31aba21 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -20,27 +20,30 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.fedoraproject.candlepin.model.Consumer;
-import org.fedoraproject.candlepin.model.ConsumerFact;
 import org.fedoraproject.candlepin.model.ConsumerCurator;
+import org.fedoraproject.candlepin.model.ConsumerFact;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ConsumerTypeCurator;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.OwnerCurator;
 import org.fedoraproject.candlepin.resource.ConsumerResource;
-import org.fedoraproject.candlepin.test.DatabaseTestFixture;
 import org.fedoraproject.candlepin.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.test.framework.JerseyTest;
 import com.wideplay.warp.persist.PersistenceService;
 import com.wideplay.warp.persist.UnitOfWork;
 
 /**
  * ConsumerResourceTest
  */
-public class ConsumerResourceTest extends DatabaseTestFixture {
+public class ConsumerResourceTest extends JerseyTest {
     
     private ConsumerCurator consumerCurator;
     private ConsumerTypeCurator consumerTypeCurator;
@@ -100,26 +103,25 @@ public class ConsumerResourceTest extends DatabaseTestFixture {
 //        assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
 //    }
 
-//    @Test
-//    public void testJSON() { 
-//        ClientConfig cc = new DefaultClientConfig();
-//        Client c = Client.create(cc);
-//
-//        ConsumerInfo ci = new ConsumerInfo();
-//        ci.setMetadataField("name", "jsontestname");
-//        ci.setType(new ConsumerType("standard-system"));
-//        
-//        WebResource res =
-//            c.resource("http://localhost:8080/candlepin/consumer/");
-//        Consumer rc = res.type("application/json").post(Consumer.class, ci);
-//        assertNotNull(rc);
-//        assertNotNull(rc.getUuid());
-//        System.out.println(rc.getUuid());
+    @Test
+    public void testJSON() { 
+        Client c = Client.create(new DefaultClientConfig());
+
+        ConsumerFact ci = new ConsumerFact();
+        ci.setMetadataField("name", "jsontestname");
+        //ci.setType(new ConsumerType("standard-system"));
         
-//        WebResource delres =
-//          c.resource("http://localhost:8080/candlepin/consumer/");
-//        delres.accept("application/json").delete(rc.getUuid());
-//        
-//        assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), rc.getUuid()));
-//    }
+        WebResource res =
+            c.resource("http://localhost:8080/candlepin/consumer/");
+        Consumer rc = res.type("application/json").post(Consumer.class, ci);
+        assertNotNull(rc);
+        assertNotNull(rc.getUuid());
+        System.out.println(rc.getUuid());
+        
+        WebResource delres =
+          c.resource("http://localhost:8080/candlepin/consumer/");
+        delres.accept("application/json").delete(rc.getUuid());
+        
+        //assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), rc.getUuid()));
+    }
 }
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index a136a29..b9dfaa4 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -21,15 +21,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.fedoraproject.candlepin.model.Consumer;
-import org.fedoraproject.candlepin.model.ConsumerCurator;
 import org.fedoraproject.candlepin.model.ConsumerType;
-import org.fedoraproject.candlepin.model.ConsumerTypeCurator;
 import org.fedoraproject.candlepin.model.EntitlementPool;
-import org.fedoraproject.candlepin.model.EntitlementPoolCurator;
 import org.fedoraproject.candlepin.model.Owner;
-import org.fedoraproject.candlepin.model.OwnerCurator;
 import org.fedoraproject.candlepin.model.Product;
-import org.fedoraproject.candlepin.model.ProductCurator;
 import org.fedoraproject.candlepin.resource.EntitlementResource;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
 import org.fedoraproject.candlepin.test.TestUtil;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index 2a41973..6454df4 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.resource.TestResource;
-import org.junit.Test;
 import org.junit.Ignore;
 
 import com.sun.jersey.api.client.Client;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/test/DatabaseTestFixture.java b/proxy/src/test/java/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
index 289d9bb..a373489 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
@@ -21,7 +21,6 @@ import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.ProductCurator;
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.resource.test.CandlepinTestingModule;
-import org.junit.After;
 import org.junit.Before;
 
 import com.google.inject.Guice;