From c6e3685c0d6e88f57aaa5f0abc8a4e456c6a59ef Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 1 Dec 2009 15:16:31 -0400 Subject: Remove the now obsolete BaseModel class. --- .../fedoraproject/candlepin/model/BaseModel.java | 130 --------------------- .../candlepin/model/JsonTestObject.java | 12 +- .../candlepin/model/ObjectFactory.java | 6 +- .../candlepin/resource/BaseResource.java | 3 +- .../candlepin/resource/ConsumerResource.java | 1 - .../candlepin/resource/EntitlementResource.java | 1 - .../candlepin/resource/TestResource.java | 1 - .../candlepin/resource/UserResource.java | 1 - .../candlepin/resource/test/TestResourceTest.java | 2 - 9 files changed, 15 insertions(+), 142 deletions(-) delete mode 100644 proxy/code/src/org/fedoraproject/candlepin/model/BaseModel.java diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/BaseModel.java b/proxy/code/src/org/fedoraproject/candlepin/model/BaseModel.java deleted file mode 100644 index e071fc3..0000000 --- a/proxy/code/src/org/fedoraproject/candlepin/model/BaseModel.java +++ /dev/null @@ -1,130 +0,0 @@ -/** - * 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.model; - -import java.util.UUID; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * @author mmccune - * - */ -@XmlRootElement -@XmlAccessorType(XmlAccessType.PROPERTY) -public class BaseModel { - - private String uuid; - private String name; - - /** - * Construct new with UUID - * @param uuid unique idea for the model object - */ - public BaseModel(String uuid) { - this.uuid = uuid; - } - - /** - * Default constructor - */ - public BaseModel() { - - } - - /** - * Returns the unique id of the model object. - * @return the unique id of the model object. - */ - public String getUuid() { - return uuid; - } - - /** - * Sets the unique id of the model object. - * @param uuid unique id of the model. - */ - public void setUuid(String uuid) { - this.uuid = uuid; - } - - /** - * Returns the name of the object. - * @return the name of the object. - */ - public String getName() { - return name; - } - - /** - * Set the name of the model object. - * @param name name of the object - */ - public void setName(String name) { - this.name = name; - } - - /** - * Generate a UUID for an object. - * @return String UUID. - */ - public static String generateUUID() { - return UUID.randomUUID().toString(); - } - - /** - * {@inheritDoc} - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((uuid == null) ? 0 : uuid.hashCode()); - return result; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (getClass() != obj.getClass()) { - return false; - } - - BaseModel other = (BaseModel) obj; - - if (this.getUuid() == null) { - if (other.getUuid() != null) { - return false; - } - } - else if (!this.getUuid().equals(other.getUuid())) { - return false; - } - - return true; - } -} diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/JsonTestObject.java b/proxy/code/src/org/fedoraproject/candlepin/model/JsonTestObject.java index fb44d11..040ab59 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/JsonTestObject.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/JsonTestObject.java @@ -28,12 +28,22 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement @XmlAccessorType(XmlAccessType.PROPERTY) -public class JsonTestObject extends BaseModel { +public class JsonTestObject { private List stringlist = new ArrayList(); //private String[] stringarray = new String[1]; private JsonTestObject parent; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** * sets the parent * @param p Parent diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java index 51249e4..44dbcd7 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java @@ -98,8 +98,8 @@ public class ObjectFactory { * @param uuid to lookup * @return BaseModel if found, null otherwise. */ - public BaseModel lookupByUUID(Class clazz, String uuid) { - return (BaseModel) lookupByFieldName(clazz, "uuid", uuid); + public Object lookupByUUID(Class clazz, String uuid) { + return (Object) lookupByFieldName(clazz, "uuid", uuid); } /** @@ -152,7 +152,7 @@ public class ObjectFactory { * @param clazz to lookup * @param removeMe model to remove */ - public void delete(Class clazz, BaseModel removeMe) { + public void delete(Class clazz, Object removeMe) { String key = clazz.getName(); List typelist = (List) objects.get(key); typelist.remove(removeMe); diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java index ec21fe2..f697d3a 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java +++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java @@ -14,7 +14,6 @@ */ package org.fedoraproject.candlepin.resource; -import org.fedoraproject.candlepin.model.BaseModel; import org.fedoraproject.candlepin.model.ObjectFactory; import org.apache.log4j.Logger; @@ -90,7 +89,7 @@ public abstract class BaseResource { @DELETE @Path("/{uuid}") public void delete(String uuid) { System.out.println("Delete called: " + uuid); - BaseModel obj = ObjectFactory.get().lookupByUUID(getApiClass(), uuid); + Object obj = ObjectFactory.get().lookupByUUID(getApiClass(), uuid); ObjectFactory.get().delete(getApiClass(), obj); } diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java index 478c49d..0ae494c 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java +++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java @@ -14,7 +14,6 @@ */ package org.fedoraproject.candlepin.resource; -import org.fedoraproject.candlepin.model.BaseModel; import org.fedoraproject.candlepin.model.Consumer; import org.fedoraproject.candlepin.model.ConsumerInfo; import org.fedoraproject.candlepin.model.ConsumerType; diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java index fed729b..3354782 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java +++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java @@ -14,7 +14,6 @@ */ package org.fedoraproject.candlepin.resource; -import org.fedoraproject.candlepin.model.BaseModel; import org.fedoraproject.candlepin.model.Consumer; import org.fedoraproject.candlepin.model.Entitlement; import org.fedoraproject.candlepin.model.EntitlementPool; diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java index 14ba04f..8d7c3d1 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java +++ b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java @@ -62,7 +62,6 @@ public class TestResource { jto = obj; System.out.println("object.name:" + obj.getName()); System.out.println("jto.name:" + jto.getName()); - System.out.println("jto.uuid:" + jto.getUuid()); System.out.println("jto.list:" + jto.getStringList()); System.out.println("jto.parent.name:" + jto.getParent() == null ? jto.getParent().getName() : ""); diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java index c3e541e..1dea70e 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java +++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java @@ -14,7 +14,6 @@ */ package org.fedoraproject.candlepin.resource; -import org.fedoraproject.candlepin.model.BaseModel; import org.fedoraproject.candlepin.model.ObjectFactory; import org.fedoraproject.candlepin.model.User; 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 7fc3648..6e2dcc3 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java @@ -39,7 +39,6 @@ public class TestResourceTest { private JsonTestObject createTestObject() { JsonTestObject jto = new JsonTestObject(); jto.setName("testname"); - jto.setUuid("AEF"); List l = new ArrayList(); l.add("hey there"); l.add("how are you?"); @@ -62,7 +61,6 @@ public class TestResourceTest { System.out.println(jto.getName()); jto = getresource.accept("application/json").get(JsonTestObject.class); assertEquals("testname", jto.getName()); - assertEquals("AEF", jto.getUuid()); assertNotNull(jto.getStringList()); assertEquals(2, jto.getStringList().size()); assertNull(jto.getParent()); -- cgit