From 46cb0cef9303940ade51ffe16831f55ee9cd8e1f Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 10 Aug 2013 18:28:36 +0200
Subject: o Start of loading referenced (singular) entities.

---
 .../main/java/io/trygvis/container/myapp/AddressBookDirect.java  | 9 ++-------
 .../src/main/java/io/trygvis/container/myapp/AddressBookJpa.java | 3 ++-
 myapp/src/main/java/io/trygvis/container/myapp/Contact.java      | 5 ++---
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'myapp')

diff --git a/myapp/src/main/java/io/trygvis/container/myapp/AddressBookDirect.java b/myapp/src/main/java/io/trygvis/container/myapp/AddressBookDirect.java
index 86e8641..b272649 100644
--- a/myapp/src/main/java/io/trygvis/container/myapp/AddressBookDirect.java
+++ b/myapp/src/main/java/io/trygvis/container/myapp/AddressBookDirect.java
@@ -1,15 +1,9 @@
 package io.trygvis.container.myapp;
 
-import io.trygvis.persistence.sql.SqlExecutor;
-
 import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.InputStreamReader;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 
 import static io.trygvis.container.myapp.Contact.Gender.FEMALE;
@@ -215,7 +209,8 @@ public class AddressBookDirect {
         }
 
         Company company = null;
-        Contact o = new Contact(name, g, company);
+        Contact o = new Contact(name, g);
+        o.company = session.company.selectById(1l);
         session.contact.insert(o);
     }
 
diff --git a/myapp/src/main/java/io/trygvis/container/myapp/AddressBookJpa.java b/myapp/src/main/java/io/trygvis/container/myapp/AddressBookJpa.java
index 3981805..75e923a 100644
--- a/myapp/src/main/java/io/trygvis/container/myapp/AddressBookJpa.java
+++ b/myapp/src/main/java/io/trygvis/container/myapp/AddressBookJpa.java
@@ -18,7 +18,7 @@ import static io.trygvis.container.myapp.Contact.Gender.FEMALE;
 import static io.trygvis.container.myapp.Contact.Gender.MALE;
 
 public class AddressBookJpa {
-
+/*
     private BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
 
     private EntityManager entityManager;
@@ -239,4 +239,5 @@ public class AddressBookJpa {
         }
         System.out.println();
     }
+*/
 }
diff --git a/myapp/src/main/java/io/trygvis/container/myapp/Contact.java b/myapp/src/main/java/io/trygvis/container/myapp/Contact.java
index 5ce87c7..1ef5adb 100644
--- a/myapp/src/main/java/io/trygvis/container/myapp/Contact.java
+++ b/myapp/src/main/java/io/trygvis/container/myapp/Contact.java
@@ -16,11 +16,10 @@ public class Contact extends AbstractEntity {
 
     public final Gender gender;
 
-    public final Company company;
+    public Company company;
 
-    public Contact(String name, Gender gender, Company company) {
+    public Contact(String name, Gender gender) {
         this.name = name;
         this.gender = gender;
-        this.company = company;
     }
 }
-- 
cgit v1.2.3