complete checkstyle fixes

16 files changed, 204 insertions, 150 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
index 5db9bda..fe11886 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
@@ -165,7 +165,7 @@ public class Consumer extends BaseModel {
      */
     public void setMetadataField(String name, String value) {
         if (this.getInfo().getMetadata() == null) {
-            this.getInfo().setMetadata(new HashMap<String,String>());
+            this.getInfo().setMetadata(new HashMap<String, String>());
         }
         this.getInfo().getMetadata().put(name, value);
     }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java
index 8a983b4..8d18894 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java
@@ -89,7 +89,7 @@ public class ConsumerInfo {
     public void setMetadataField(String name, String value) {
         System.out.println("set meta field called");
         if (this.metadata == null) {
-            metadata = new HashMap<String,String>();
+            metadata = new HashMap<String, String>();
         }
         metadata.put(name, value);
         
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
index 75138e1..1e5d72b 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
@@ -33,57 +33,57 @@ import junit.framework.TestCase;
 public class OwnerTest extends TestCase {
 
     
-	public void testOwner() throws Exception {
-		Owner o = new Owner(BaseModel.generateUUID());
-		assertNotNull(o);
-	}
-	
-	public void testLookup() throws Exception {
-		
-		Owner o = TestUtil.createOwner();
-		String lookedUp = o.getUuid();
-		o = (Owner) ObjectFactory.get().
-			lookupByUUID(Owner.class, lookedUp);
-		assertNotNull(o);
-	}
-	
-	public void testList() throws Exception {
-	    for (int i = 0; i < 10; i++) {
-	        TestUtil.createOwner();
-	    }
-	    
-	    List orgs =  ObjectFactory.get().listObjectsByClass(Owner.class);
-	    assertNotNull(orgs);
-	    assertTrue(orgs.size() >= 10);
-	}
-	
-	public void testObjectRelationships() throws Exception {
-		Owner owner = new Owner(BaseModel.generateUUID());
-		owner.setName("test-owner");
-		// Product
-		Product rhel = new Product(BaseModel.generateUUID());
-		rhel.setName("Red Hat Enterprise Linux");
-		
-		// User
-		User u = new User();
-		u.setLogin("test-login");
-		u.setPassword("redhat");
-		owner.addUser(u);
-		assertEquals(1, owner.getUsers().size());
-		
-		// Consumer
-		Consumer c = new Consumer(BaseModel.generateUUID());
-		c.setOwner(owner);
-		owner.addConsumer(c);
-		c.addConsumedProduct(rhel);
-		assertEquals(1, owner.getConsumers().size());
-		assertEquals(1, c.getConsumedProducts().size());
-		
-		// EntitlementPool
-		EntitlementPool pool = new EntitlementPool(BaseModel.generateUUID());
-		owner.addEntitlementPool(pool);
-		pool.setProduct(rhel);
-		assertEquals(1, owner.getEntitlementPools().size());
-		
-	}
+    public void testOwner() throws Exception {
+        Owner o = new Owner(BaseModel.generateUUID());
+        assertNotNull(o);
+    }
+    
+    public void testLookup() throws Exception {
+        
+        Owner o = TestUtil.createOwner();
+        String lookedUp = o.getUuid();
+        o = (Owner) ObjectFactory.get().
+            lookupByUUID(Owner.class, lookedUp);
+        assertNotNull(o);
+    }
+    
+    public void testList() throws Exception {
+        for (int i = 0; i < 10; i++) {
+            TestUtil.createOwner();
+        }
+        
+        List orgs =  ObjectFactory.get().listObjectsByClass(Owner.class);
+        assertNotNull(orgs);
+        assertTrue(orgs.size() >= 10);
+    }
+    
+    public void testObjectRelationships() throws Exception {
+        Owner owner = new Owner(BaseModel.generateUUID());
+        owner.setName("test-owner");
+        // Product
+        Product rhel = new Product(BaseModel.generateUUID());
+        rhel.setName("Red Hat Enterprise Linux");
+        
+        // User
+        User u = new User();
+        u.setLogin("test-login");
+        u.setPassword("redhat");
+        owner.addUser(u);
+        assertEquals(1, owner.getUsers().size());
+        
+        // Consumer
+        Consumer c = new Consumer(BaseModel.generateUUID());
+        c.setOwner(owner);
+        owner.addConsumer(c);
+        c.addConsumedProduct(rhel);
+        assertEquals(1, owner.getConsumers().size());
+        assertEquals(1, c.getConsumedProducts().size());
+        
+        // EntitlementPool
+        EntitlementPool pool = new EntitlementPool(BaseModel.generateUUID());
+        owner.addEntitlementPool(pool);
+        pool.setProduct(rhel);
+        assertEquals(1, owner.getEntitlementPools().size());
+        
+    }
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/TestUtil.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/TestUtil.java
index 2573f3b..b2e2ad3 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/TestUtil.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/TestUtil.java
@@ -23,6 +23,8 @@ import org.fedoraproject.candlepin.model.Product;
 
 
 public class TestUtil {
+    private TestUtil() {
+    }
 
     public static Owner createOwner() {
         String lookedUp = BaseModel.generateUUID();
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
index 83f40f3..ec21fe2 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
@@ -53,15 +53,15 @@ public abstract class BaseResource {
      * @return the model object matching the given uuid.
      */
     @GET @Path("/{uuid}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({  MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML  })
     public Object get(@PathParam("uuid") String uuid) {
         Object o = ObjectFactory.get().lookupByUUID(getApiClass(), uuid);
         return o;
     }
 
 //    @POST
-//    @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_FORM_URLENCODED})
-//    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+//    @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_FORM_URLENCODED })
+//    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
 //    public Object create(Form form) {
 //        String newuuid = BaseModel.generateUUID();
 //        Object args[] = new Object[1];
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
index 0356edd..718da5d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
@@ -48,7 +48,7 @@ public class ConsumerResource extends BaseResource {
      * @return list of available consumers.
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public List<Consumer> list() {
         List<Object> u = ObjectFactory.get().listObjectsByClass(getApiClass());
         List<Consumer> consumers = new ArrayList<Consumer>();
@@ -65,7 +65,7 @@ public class ConsumerResource extends BaseResource {
      */
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public Consumer create(ConsumerInfo ci) {
         System.out.println("metadata: " + ci.getMetadata());
         System.out.println("ci: " + ci);
@@ -83,7 +83,7 @@ public class ConsumerResource extends BaseResource {
      * @return the ConsumerInfo for the given Consumer.
      */
     @GET @Path("/info")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public ConsumerInfo getInfo() {
         ConsumerInfo ci = new ConsumerInfo();
         ci.setType(new ConsumerType("system"));
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
index 8c93aa3..1e692fe 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
@@ -43,7 +43,7 @@ public class EntitlementPoolResource extends BaseResource {
      * @return the list of available entitlement pools.
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public List<EntitlementPool> list() {
         List<Object> u = ObjectFactory.get().listObjectsByClass(getApiClass());
         List<EntitlementPool> pools = new ArrayList<EntitlementPool>();
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
index 05b29c5..27887f6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
@@ -80,8 +80,8 @@ public class EntitlementResource extends BaseResource {
      * @return test object
      */
     @POST
-    @Consumes({MediaType.APPLICATION_JSON})
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("/foo")
     public Object foo(Consumer c) {
         System.out.println("Consumer uuid: " + c.getUuid());
@@ -95,8 +95,8 @@ public class EntitlementResource extends BaseResource {
      * @return Entitled object
      */
     @POST
-    @Consumes({MediaType.APPLICATION_JSON})
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("/entitle")
     public Object entitle(Consumer c, Product p) {
 
@@ -143,7 +143,7 @@ public class EntitlementResource extends BaseResource {
      * @return boolean if entitled or not
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("/has")
     public boolean hasEntitlement(@PathParam("consumer_uuid") String consumerUuid, 
             @PathParam("product_uuid") String productUuid) {
@@ -164,7 +164,7 @@ public class EntitlementResource extends BaseResource {
      * @return List<Entitlement> of applicable 
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("/listavailable")
     public List<EntitlementPool> listAvailableEntitlements(
         @PathParam("uuid") String uuid) {
@@ -198,7 +198,7 @@ public class EntitlementResource extends BaseResource {
      * @return list of Entitlements
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public List<Entitlement> list() {
         List<Object> u = ObjectFactory.get().listObjectsByClass(getApiClass());
         List<Entitlement> entitlements = new ArrayList<Entitlement>();
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
index a5311b3..b390a01 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
@@ -43,7 +43,7 @@ public class OwnerResource extends BaseResource {
      * @return list of Owners
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public List<Owner> list() {
         List<Object> u = ObjectFactory.get().listObjectsByClass(getApiClass());
         List<Owner> owners = new ArrayList<Owner>();
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
index fcfbff6..14ba04f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
@@ -47,7 +47,7 @@ public class TestResource {
      * @return the test object
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public JsonTestObject get() {
         return jto;
     }
@@ -75,7 +75,7 @@ public class TestResource {
      * @return a ConsumerType
      */
     @GET @Path("/consumertype")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public ConsumerType getConsumerType() {
         return new ConsumerType("testtype");
     }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
index ea71c67..e41744f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
@@ -49,7 +49,7 @@ public class UserResource extends BaseResource {
      * @return user whose login is 'login'
      */
     @GET @Path("/{login}")
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public User get(@PathParam("login") String login) {
         return (User) ObjectFactory.get().lookupByFieldName(User.class, "login", login);
     }
@@ -59,7 +59,7 @@ public class UserResource extends BaseResource {
      * @return a list of Users.
      */
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public List<User> list() {
         List<Object> u = ObjectFactory.get().listObjectsByClass(getApiClass());
         List<User> users = new ArrayList<User>();
@@ -77,7 +77,7 @@ public class UserResource extends BaseResource {
      */
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public User create(String login, String password) {
         String newuuid = BaseModel.generateUUID();
         User u = new User(newuuid);
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
index 917e7c8..e7eb425 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
@@ -59,36 +59,71 @@ public class CertTest extends TestCase {
         // personal keys
         //
         RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-                new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16), 
-                new BigInteger("11", 16));
+            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419" + 
+                           "be12872a4bdba626cfae9900f76abfb12139dce5de5" +
+                           "6564fab2b6543165a040c606887420e33d91ed7ed7", 16), 
+            new BigInteger("11", 16));
 
         RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
+            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419" + 
+                           "be12872a4bdba626cfae9900f76abfb12139dce5de5" +
+                           "6564fab2b6543165a040c606887420e33d91ed7ed7", 16),
             new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
+            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34" +
+                           "d4e32bf824d0dde6028ae79c5f07b580f5dce240d71" +
+                           "11f7ddb130a7945cd7d957d1920994da389f490c89", 16),
+            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6" +
+                           "c5c703e2168fbf37884cb", 16),
+            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae1" +
+                           "8451d5e56c734a5aab8a5", 16),
+            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a31942" +
+                           "9c069a3e335a1d6171391", 16),
+            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6" +
+                           "fc483533d8297dd7884cd", 16),
+            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1" +
+                           "bce78a95b132b4e5b5d19", 16));
 
         //
         // ca keys
         //
         RSAPublicKeySpec caPubKeySpec = new RSAPublicKeySpec(
-                new BigInteger(
-                        "b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5",
-                        16), new BigInteger("11", 16));
+            new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab925" +
+                           "3140e5bf17751197731d6f7540d2509e7b9ffee0a70" +
+                           "a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf" +
+                           "3c298e05842535d9f064e6b0391cb7d306e0a2d20c4" +
+                           "dfb4e7b49a9640bdea26c10ad69c3f05007ce2513ce" +
+                           "e44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
+            new BigInteger("11", 16));
 
         RSAPrivateCrtKeySpec caPrivKeySpec = new RSAPrivateCrtKeySpec(
-                new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
-                new BigInteger("11", 16),
-                new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6288fcc4304424ab8f56388f72652d8fafc65a4b9020896f2cde297080f2a540e7b7ce5af0b3446e1258d1dd7f245cf54124b4c6e17da21b90a0ebd22605e6f45c9f136d7a13eaac1c0f7487de8bd6d924972408ebb58af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16),
-                new BigInteger("f75e80839b9b9379f1cf1128f321639757dba514642c206bbbd99f9a4846208b3e93fbbe5e0527cc59b1d4b929d9555853004c7c8b30ee6a213c3d1bb7415d03", 16),
-                new BigInteger("b892d9ebdbfc37e397256dd8a5d3123534d1f03726284743ddc6be3a709edb696fc40c7d902ed804c6eee730eee3d5b20bf6bd8d87a296813c87d3b3cc9d7947", 16),
-                new BigInteger("1d1a2d3ca8e52068b3094d501c9a842fec37f54db16e9a67070a8b3f53cc03d4257ad252a1a640eadd603724d7bf3737914b544ae332eedf4f34436cac25ceb5", 16),
-                new BigInteger("6c929e4e81672fef49d9c825163fec97c4b7ba7acb26c0824638ac22605d7201c94625770984f78a56e6e25904fe7db407099cad9b14588841b94f5ab498dded", 16),
-                new BigInteger("dae7651ee69ad1d081ec5e7188ae126f6004ff39556bde90e0b870962fa7b926d070686d8244fe5a9aa709a95686a104614834b0ada4b10f53197a5cb4c97339", 16));
+            new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab925" +
+                           "3140e5bf17751197731d6f7540d2509e7b9ffee0a70" +
+                           "a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf" +
+                           "3c298e05842535d9f064e6b0391cb7d306e0a2d20c4" +
+                           "dfb4e7b49a9640bdea26c10ad69c3f05007ce2513ce" +
+                           "e44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
+            new BigInteger("11", 16),
+            new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6" +
+                           "288fcc4304424ab8f56388f72652d8fafc65a4b9020" +
+                           "896f2cde297080f2a540e7b7ce5af0b3446e1258d1d" +
+                           "d7f245cf54124b4c6e17da21b90a0ebd22605e6f45c" +
+                           "9f136d7a13eaac1c0f7487de8bd6d924972408ebb58" +
+                           "af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16),
+            new BigInteger("f75e80839b9b9379f1cf1128f321639757dba514642" +
+                           "c206bbbd99f9a4846208b3e93fbbe5e0527cc59b1d4" +
+                           "b929d9555853004c7c8b30ee6a213c3d1bb7415d03", 16),
+            new BigInteger("b892d9ebdbfc37e397256dd8a5d3123534d1f037262" +
+                           "84743ddc6be3a709edb696fc40c7d902ed804c6eee7" +
+                           "30eee3d5b20bf6bd8d87a296813c87d3b3cc9d7947", 16),
+            new BigInteger("1d1a2d3ca8e52068b3094d501c9a842fec37f54db16" + 
+                           "e9a67070a8b3f53cc03d4257ad252a1a640eadd6037" +
+                           "24d7bf3737914b544ae332eedf4f34436cac25ceb5", 16),
+            new BigInteger("6c929e4e81672fef49d9c825163fec97c4b7ba7acb2" +
+                           "6c0824638ac22605d7201c94625770984f78a56e6e2" +
+                           "5904fe7db407099cad9b14588841b94f5ab498dded", 16),
+            new BigInteger("dae7651ee69ad1d081ec5e7188ae126f6004ff39556" + 
+                           "bde90e0b870962fa7b926d070686d8244fe5a9aa709" +
+                           "a95686a104614834b0ada4b10f53197a5cb4c97339", 16));
 
         //
         // set up the keys
@@ -114,7 +149,8 @@ public class CertTest extends TestCase {
         System.out.println("CaCert: " + caCert);
         System.out.println("clientCert: " + clientCert);
         // Instantiate a new AC generator
-        X509V2AttributeCertificateGenerator acGen = new X509V2AttributeCertificateGenerator();
+        X509V2AttributeCertificateGenerator acGen =
+            new X509V2AttributeCertificateGenerator();
 
         acGen.reset();
 
@@ -180,13 +216,13 @@ public class CertTest extends TestCase {
         AttributeCertificateHolder h = att.getHolder();
         if (h.match(clientCert)) {
             if (h.getEntityNames() != null) {
-                System.out.println(h.getEntityNames().length
-                        + " entity names found");
+                System.out.println(h.getEntityNames().length +
+                    " entity names found");
             }
             if (h.getIssuer() != null) {
-                System.out.println(h.getIssuer().length
-                        + " issuer names found, serial number "
-                        + h.getSerialNumber());
+                System.out.println(h.getIssuer().length +
+                    " issuer names found, serial number " +
+                    h.getSerialNumber());
             }
             System.out.println("Matches original client x509 cert");
         }
@@ -196,8 +232,8 @@ public class CertTest extends TestCase {
         AttributeCertificateIssuer issuer = att.getIssuer();
         if (issuer.match(caCert)) {
             if (issuer.getPrincipals() != null) {
-                System.out.println(issuer.getPrincipals().length
-                        + " entity names found");
+                System.out.println(issuer.getPrincipals().length +
+                    " entity names found");
             }
             System.out.println("Matches original ca x509 cert");
         }
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 14af87a..e4bd5fa 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
@@ -1,5 +1,16 @@
 /**
- * 
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
  */
 package org.fedoraproject.candlepin.resource.test;
 
@@ -18,45 +29,46 @@ import junit.framework.TestCase;
  */
 public class ApiTest extends TestCase {
 
-	public void testAuthentication() throws Exception {
-		User u = new User();
-		u.setLogin("admin");
-		u.setPassword("password");
-		
-		ObjectFactory.get().store(u);
-		
-		ApiHandler handler = ApiHandler.get();
-		String token = handler.login(u.getLogin(), "bad-password");
-		assertNull(token);
-		token = handler.login(u.getLogin(), u.getPassword());
-		assertNotNull(token);
-	}
-	
-	public void testLookupOwner() throws Exception {
-		Owner o = new Owner(BaseModel.generateUUID());
-		ObjectFactory.get().store(o);
+    public void testAuthentication() throws Exception {
+        User u = new User();
+        u.setLogin("admin");
+        u.setPassword("password");
+        
+        ObjectFactory.get().store(u);
+        
+        ApiHandler handler = ApiHandler.get();
+        String token = handler.login(u.getLogin(), "bad-password");
+        assertNull(token);
+        token = handler.login(u.getLogin(), u.getPassword());
+        assertNotNull(token);
+    }
+    
+    public void testLookupOwner() throws Exception {
+        Owner o = new Owner(BaseModel.generateUUID());
+        ObjectFactory.get().store(o);
 
-		User u = new User();
-		u.setLogin("admin");
-		u.setPassword("password");
-		ObjectFactory.get().store(u);
-		
-		String token = ApiHandler.get().login(u.getLogin(), u.getPassword());
-		
-		OwnerResource oapi = new OwnerResource();
-		Owner lookedup = (Owner) oapi.get("BAD-UUID-NOTFOUND");
-		assertNull(lookedup);
-		lookedup = ApiHandler.get().getOwner(token, o.getUuid());
-		assertNotNull(lookedup);
-		
-		// Check bad token
-		boolean failed = false;
-		try {
-			lookedup = ApiHandler.get().getOwner("BAD-TOKEN", o.getUuid());
-		} catch (Exception e) {
-			failed = true;
-		}
-		assertTrue(failed);
-		
-	}
+        User u = new User();
+        u.setLogin("admin");
+        u.setPassword("password");
+        ObjectFactory.get().store(u);
+        
+        String token = ApiHandler.get().login(u.getLogin(), u.getPassword());
+        
+        OwnerResource oapi = new OwnerResource();
+        Owner lookedup = (Owner) oapi.get("BAD-UUID-NOTFOUND");
+        assertNull(lookedup);
+        lookedup = ApiHandler.get().getOwner(token, o.getUuid());
+        assertNotNull(lookedup);
+        
+        // Check bad token
+        boolean failed = false;
+        try {
+            lookedup = ApiHandler.get().getOwner("BAD-TOKEN", o.getUuid());
+        }
+        catch (Exception e) {
+            failed = true;
+        }
+        assertTrue(failed);
+        
+    }
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index 2f3de80..9fb7743 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -64,14 +64,16 @@ public class ConsumerResourceTest extends TestCase {
         ci.setMetadataField("name", "jsontestname");
         ci.setType(new ConsumerType("standard-system"));
         
-        WebResource createResource = c.resource("http://localhost:8080/candlepin/consumer/");
-        Consumer rc = createResource.type("application/json").post(Consumer.class, ci);
+        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 deleteResource = c.resource("http://localhost:8080/candlepin/consumer/");
-//        deleteResource.accept("application/json").delete(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/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index d6dfafa..4d66bd1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -100,7 +100,8 @@ public class EntitlementResourceTest extends TestCase {
         failed = false;
         try {
             eapi.entitle(consumer, product);
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             System.out.println("expired:  ? " + e);
             failed = true;
         }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index 2346399..0bb7e97 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -80,7 +80,8 @@ public class TestResourceTest extends TestCase {
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
 
-        WebResource getresource = c.resource("http://localhost:8080/candlepin/test/consumertype");
+        WebResource getresource =
+            c.resource("http://localhost:8080/candlepin/test/consumertype");
         ConsumerType ct = getresource.accept("application/json").get(ConsumerType.class);
         assertNotNull(ct);
         assertEquals("testtype", ct.getLabel());