javaee-samples
diff --git a/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/Movie.java‎
Lines changed: 21 additions & 29 deletions b/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/Movie.java‎
Lines changed: 21 additions & 29 deletions
diff --git a/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/MySessionBean.java‎
Lines changed: 3 additions & 6 deletions b/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/MySessionBean.java‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/ProducerBean.java‎
Lines changed: 4 additions & 3 deletions b/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/ProducerBean.java‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/ProductCode.java‎
Lines changed: 0 additions & 103 deletions b/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/ProductCode.java‎
Lines changed: 0 additions & 103 deletions
diff --git a/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/TestServlet.java‎
Lines changed: 0 additions & 105 deletions b/‎jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/TestServlet.java‎
Lines changed: 0 additions & 105 deletions
diff --git a/‎jpa/pu-typesafe/src/main/webapp/WEB-INF/beans.xml‎
Lines changed: 0 additions & 8 deletions b/‎jpa/pu-typesafe/src/main/webapp/WEB-INF/beans.xml‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎jpa/pu-typesafe/src/main/webapp/index.jsp‎
Lines changed: 0 additions & 55 deletions b/‎jpa/pu-typesafe/src/main/webapp/index.jsp‎
Lines changed: 0 additions & 55 deletions
@@ -1,54 +1,31 @@
 package org.javaee7.jpa.pu.typesafe;
 
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
 
 /**
  * @author Arun Gupta
  */
 @Entity
 @Table(name = "MOVIE_PU_TYPESAFE")
-@XmlRootElement
 @NamedQueries({
     @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"),
-    @NamedQuery(name = "Movie.findById", query = "SELECT m FROM Movie m WHERE m.id = :id"),
-    @NamedQuery(name = "Movie.findByName", query = "SELECT m FROM Movie m WHERE m.name = :name"),
-    @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors")})
+})
 public class Movie implements Serializable {
-
-    private static final long serialVersionUID = 1L;
     @Id
     @NotNull
     private Integer id;
-    
+
     @NotNull
     @Size(min = 1, max = 50)
     private String name;
-    
+
     @NotNull
     @Size(min = 1, max = 200)
     private String actors;
 
-    public Movie() {
-    }
-
-    public Movie(Integer id) {
-        this.id = id;
-    }
-
-    public Movie(Integer id, String name, String actors) {
-        this.id = id;
-        this.name = name;
-        this.actors = actors;
-    }
-
     public Integer getId() {
         return id;
     }
@@ -73,8 +50,23 @@ public void setActors(String actors) {
         this.actors = actors;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+
+        Movie movie = (Movie) o;
+
+        return id.equals(movie.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
     @Override
     public String toString() {
-        return name;
+        return "Movie{" + "id=" + id + ", name='" + name + '\'' + ", actors='" + actors + '\'' + '}';
     }
 }
@@ -10,13 +10,10 @@
  */
 @Stateless
 public class MySessionBean {
-    
-    @Inject @DefaultDatabase
-    EntityManager defaultEM;
+    @Inject
+    @DefaultDatabase
+    private EntityManager defaultEM;
 
-//    @PersistenceContext(unitName = "defaultPU")
-//    EntityManager defaultEM;
-//
     public List<Movie> listMovies() {
         return defaultEM.createNamedQuery("Movie.findAll", Movie.class).getResultList();
     }
 
@@ -10,7 +10,8 @@
  */
 @ManagedBean
 public class ProducerBean {
-
-    static @Produces @PersistenceContext(unitName = "defaultPU") @DefaultDatabase EntityManager defaultEM;
-
+    @Produces
+    @PersistenceContext(unitName = "defaultPU")
+    @DefaultDatabase
+    private static EntityManager defaultEM;
 }