Changed Person entity id generation to be manually assigned.

Removed hibernate sequence.

Author: radcortez

batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemProcessor.java

@@ -50,7 +50,8 @@
  */
 @Named
 public class MyItemProcessor implements ItemProcessor {
-    SimpleDateFormat format = new SimpleDateFormat("M/dd/yy");
+    private static int id = 1;
+    private SimpleDateFormat format = new SimpleDateFormat("M/dd/yy");
 
     @Override
     public Person processItem(Object t) {
@@ -69,6 +70,6 @@ public Person processItem(Object t) {
             return null;
         }
 
-        return new Person(name, date);
+        return new Person(id++, name, date);
     }
 }

batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/Person.java

@@ -39,19 +39,11 @@
  */
 package org.javaee7.batch.chunk.csv.database;
 
-import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-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
@@ -66,7 +58,6 @@
 public class Person implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
     private static final long serialVersionUID = 1L;
@@ -94,6 +85,12 @@ public Person(String name, String hiredate) {
         this.hiredate = hiredate;
     }
 
+    public Person(int id, String name, String hiredate) {
+        this.id = id;
+        this.name = name;
+        this.hiredate = hiredate;
+    }
+
     public int getId() {
         return id;
     }
@@ -132,15 +129,12 @@ public boolean equals(Object object) {
             return false;
         }
         Person other = (Person) object;
-        if ((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name))) {
-            return false;
-        }
-        return true;
+        return !((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name)));
     }
 
     @Override
     public String toString() {
-        return name;
+        return name + id;
     }
 
 }

batch/chunk-csv-database/src/main/resources/META-INF/create.sql

@@ -1,2 +1 @@
-CREATE SEQUENCE HIBERNATE_SEQUENCE
 CREATE TABLE CHUNK_CSV_DATABASE ("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "HIREDATE" VARCHAR(50) not null)

batch/chunk-csv-database/src/main/resources/META-INF/drop.sql

@@ -1,2 +1 @@
-DROP TABLE CHUNK_CSV_DATABASE
-DROP SEQUENCE HIBERNATE_SEQUENCE
+DROP TABLE CHUNK_CSV_DATABASE

batch/chunk-csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java

@@ -56,15 +56,14 @@ public void testBatchCSVDatabase() throws Exception {
         for (StepExecution stepExecution : stepExecutions) {
             if (stepExecution.getStepName().equals("myStep")) {
                 Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
-                System.out.println(metricsMap);
 
                 assertEquals(7L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
                 assertEquals(7L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
                 assertEquals(3L, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
             }
         }
 
-        Query query = entityManager.createQuery("SELECT p FROM Person p");
+        Query query = entityManager.createNamedQuery("Person.findAll");
         @SuppressWarnings("unchecked")
         List<Person> persons = query.getResultList();