diff options
Diffstat (limited to 'proxy/code/src/org/fedoraproject/candlepin')
3 files changed, 8 insertions, 4 deletions
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java index 3ffea28..5d44d9e 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java @@ -104,16 +104,14 @@ public class Consumer { this.owner = owner; this.type = type; - this.info = new ConsumerInfo(); - this.info.setConsumer(this); // TODO: ??? + this.info = new ConsumerInfo(this); this.childConsumers = new HashSet<Consumer>(); this.consumedProducts = new HashSet<Product>(); this.entitlements = new HashSet<Entitlement>(); } public Consumer() { - this.info = new ConsumerInfo(); - this.info.setConsumer(this); // TODO: ??? + this.info = new ConsumerInfo(this); this.childConsumers = new HashSet<Consumer>(); this.consumedProducts = new HashSet<Product>(); this.entitlements = new HashSet<Entitlement>(); diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java index 6ea48bc..c1c2eaa 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java @@ -66,6 +66,11 @@ public class ConsumerInfo { metadata = new HashMap<String, String>(); } + public ConsumerInfo(Consumer consumerIn) { + metadata = new HashMap<String, String>(); + consumer = consumerIn; + } + /** * @return the id */ 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 dc03056..aedd2b3 100644 --- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java +++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java @@ -109,6 +109,7 @@ public class ConsumerTest extends DatabaseTestFixture { assertEquals("bar", lookedUp.getInfo().getMetadataField("foo")); assertEquals("bar1", metadata.get("foo1")); assertEquals("bar1", lookedUp.getInfo().getMetadataField("foo1")); + assertEquals(consumer.getId(), lookedUp.getInfo().getConsumer().getId()); commitTransaction(); } |