diff options
Diffstat (limited to 'proxy/code/src/org/fedoraproject/candlepin/model')
15 files changed, 26 insertions, 30 deletions
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java b/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java index 3e7af7b..2078fef 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java @@ -1,8 +1,6 @@ package org.fedoraproject.candlepin.model; import java.io.Serializable; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import javax.persistence.EntityManager; diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java index 6bc0019..6869420 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java @@ -36,6 +36,7 @@ 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/code/src/org/fedoraproject/candlepin/model/Entitlement.java b/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java index 3f7bb94..0ee2735 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java @@ -27,6 +27,7 @@ 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/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java b/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java index 9619e2b..cf02fae 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java @@ -16,7 +16,6 @@ package org.fedoraproject.candlepin.model; import java.util.Date; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -29,6 +28,7 @@ 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/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java index fa939b7..5dac3b1 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java @@ -14,15 +14,14 @@ */ package org.fedoraproject.candlepin.model; -import org.fedoraproject.candlepin.util.MethodUtil; - -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; +import org.fedoraproject.candlepin.util.MethodUtil; + /** * ObjectFactory is used to create and persist the data model. * @author mmccune diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java b/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java index 6367817..91959a5 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java @@ -24,7 +24,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Product.java b/proxy/code/src/org/fedoraproject/candlepin/model/Product.java index 7eae3dd..07d7846 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/Product.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/Product.java @@ -30,6 +30,7 @@ import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; + import org.hibernate.annotations.ForeignKey; /** diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java index 589cdd0..9ff0ebb 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java @@ -14,13 +14,13 @@ */ package org.fedoraproject.candlepin.model; -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + /** * ProductFactory diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/User.java b/proxy/code/src/org/fedoraproject/candlepin/model/User.java index dd67521..e1d0c4e 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/User.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/User.java @@ -15,6 +15,7 @@ package org.fedoraproject.candlepin.model; import java.util.Formatter; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -26,6 +27,7 @@ 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/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java index aedd2b3..d9a986f 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java @@ -14,6 +14,8 @@ */ package org.fedoraproject.candlepin.model.test; +import static org.junit.Assert.*; + import java.util.Map; import javax.persistence.PersistenceException; @@ -27,10 +29,8 @@ import org.fedoraproject.candlepin.model.Owner; import org.fedoraproject.candlepin.model.Product; import org.fedoraproject.candlepin.test.DatabaseTestFixture; import org.fedoraproject.candlepin.test.TestUtil; - import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java index cf6cc5e..a2cd553 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java @@ -1,17 +1,14 @@ package org.fedoraproject.candlepin.model.test; +import static org.junit.Assert.*; + import java.util.List; import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Persistence; import org.fedoraproject.candlepin.model.ConsumerType; import org.fedoraproject.candlepin.test.DatabaseTestFixture; -import org.fedoraproject.candlepin.util.EntityManagerUtil; import org.junit.Test; -import static org.junit.Assert.*; public class ConsumerTypeTest extends DatabaseTestFixture { diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java index 2391ce0..30057ef 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java @@ -14,16 +14,15 @@ */ package org.fedoraproject.candlepin.model.test; +import static org.junit.Assert.*; + import org.fedoraproject.candlepin.model.EntitlementPool; import org.fedoraproject.candlepin.model.Owner; import org.fedoraproject.candlepin.model.Product; - import org.fedoraproject.candlepin.test.DatabaseTestFixture; import org.fedoraproject.candlepin.test.TestUtil; - import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; public class EntitlementPoolTest extends DatabaseTestFixture { diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java index f0926ab..5186fb6 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java @@ -14,14 +14,13 @@ */ package org.fedoraproject.candlepin.model.test; -import org.fedoraproject.candlepin.model.ObjectFactory; -import org.fedoraproject.candlepin.model.Owner; - +import static org.junit.Assert.*; import java.util.List; +import org.fedoraproject.candlepin.model.ObjectFactory; +import org.fedoraproject.candlepin.model.Owner; import org.junit.Test; -import static org.junit.Assert.*; /** * ObjectFactoryTest 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 83e6299..ecce6ca 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java @@ -14,6 +14,10 @@ */ package org.fedoraproject.candlepin.model.test; +import static org.junit.Assert.*; + +import java.util.List; + import org.fedoraproject.candlepin.model.Consumer; import org.fedoraproject.candlepin.model.ConsumerType; import org.fedoraproject.candlepin.model.EntitlementPool; @@ -22,11 +26,7 @@ import org.fedoraproject.candlepin.model.Product; import org.fedoraproject.candlepin.model.User; import org.fedoraproject.candlepin.test.DatabaseTestFixture; import org.fedoraproject.candlepin.test.TestUtil; - -import java.util.List; - import org.junit.Test; -import static org.junit.Assert.*; public class OwnerTest extends DatabaseTestFixture { diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java index 88af7ff..fb5829f 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java @@ -14,12 +14,12 @@ */ package org.fedoraproject.candlepin.model.test; +import static org.junit.Assert.*; + import org.fedoraproject.candlepin.model.Owner; import org.fedoraproject.candlepin.model.User; import org.fedoraproject.candlepin.test.DatabaseTestFixture; - import org.junit.Test; -import static org.junit.Assert.*; public class UserTest extends DatabaseTestFixture { |