Some cleanups

Author: arjantijms

jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBook.java

@@ -4,20 +4,17 @@
 import java.util.List;
 
 /**
- * 
+ *
  * @author Fermin Gallego
  *
  */
 public class EBook {
+
     private String title;
     private int numPages;
     private double price;
     private List<String> notes;
 
-    public EBook() {
-        super();
-    }
-
     public String getTitle() {
         return title;
     }

jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java

@@ -6,12 +6,13 @@
 import javax.jws.WebService;
 
 /**
- * 
+ *
  * @author Fermin Gallego
  *
  */
 @WebService
 public interface EBookStore {
+
     @WebMethod
     public String welcomeMessage(String name);
 

jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java

@@ -7,11 +7,12 @@
 import javax.jws.WebService;
 
 /**
- * 
+ *
  * @author Fermin Gallego
  *
  */
-@WebService(endpointInterface = "org.javaee7.jaxws.endpoint.EBookStore",
+@WebService(
+    endpointInterface = "org.javaee7.jaxws.endpoint.EBookStore",
     serviceName = "EBookStoreImplService")
 public class EBookStoreImpl implements EBookStore {
 
@@ -41,7 +42,6 @@ public EBook takeBook(String title) {
     @Override
     public void saveBook(EBook eBook) {
         eBookCollection.put(eBook.getTitle(), eBook);
-
     }
 
     @Override

jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/Employee.java

@@ -1,10 +1,12 @@
 package org.javaee7.jpa.defaultdatasource;
 
+import static javax.persistence.GenerationType.IDENTITY;
+
 import java.io.Serializable;
+
 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;
@@ -15,13 +17,16 @@
  */
 @Entity
 @Table(name = "EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE")
-@NamedQueries({
-    @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e")
-})
+@NamedQueries(
+    @NamedQuery(
+        name = "Employee.findAll",
+        query = "SELECT e FROM Employee e") )
 public class Employee implements Serializable {
+
     private static final long serialVersionUID = 1L;
+
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = IDENTITY)
     private int id;
 
     @Column(length = 40)

jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/EmployeeBean.java

@@ -0,0 +1,26 @@
+package org.javaee7.jpa.defaultdatasource;
+
+import java.util.List;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * @author Arun Gupta
+ */
+@Stateless
+public class EmployeeService {
+
+    @PersistenceContext
+    EntityManager entityManager;
+
+    public void persist(Employee employee) {
+        entityManager.persist(employee);
+    }
+
+    public List<Employee> findAll() {
+        return entityManager.createNamedQuery("Employee.findAll", Employee.class)
+                 .getResultList();
+    }
+}

jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/EmployeeService.java

@@ -1,8 +1,8 @@
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (1, 'Penny')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (2, 'Sheldon')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (3, 'Amy')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (4, 'Leonard')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (5, 'Bernadette')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (6, 'Raj')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (7, 'Howard')
-INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("ID", "NAME") VALUES (8, 'Priya')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Penny')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Sheldon')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Amy')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Leonard')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Bernadette')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Raj')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Howard')
+INSERT INTO EMPLOYEE_SCHEMA_DEFAULT_DATASOURCE("NAME") VALUES ('Priya')

jpa/default-datasource/src/main/resources/META-INF/load.sql

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence 
-    version="2.1" 
-    xmlns="http://xmlns.jcp.org/xml/ns/persistence" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-    <persistence-unit name="MyPU" transaction-type="JTA">
+    
+    <persistence-unit name="MyPU">
         <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="javax.persistence.schema-generation.create-source" value="metadata"/> 
-            <property name="javax.persistence.schema-generation.drop-source" value="metadata"/> 
-            <property name="javax.persistence.sql-load-script-source" value="META-INF/load.sql"/> 
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" />
+            <property name="javax.persistence.schema-generation.create-source" value="metadata" />
+            <property name="javax.persistence.schema-generation.drop-source" value="metadata" />
+            <property name="javax.persistence.sql-load-script-source" value="META-INF/load.sql" />
         </properties>
     </persistence-unit>
+    
 </persistence>

jpa/default-datasource/src/main/resources/META-INF/persistence.xml

@@ -0,0 +1,82 @@
+package org.javaee7.jpa.defaultdatasource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.runners.MethodSorters.NAME_ASCENDING;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Arun Gupta
+ */
+@RunWith(Arquillian.class)
+@FixMethodOrder(NAME_ASCENDING)
+public class EmployeeServiceTest {
+
+    @Inject
+    EmployeeService employeeService;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class)
+            .addClasses(
+                Employee.class,
+                EmployeeService.class)
+            .addAsResource("META-INF/persistence.xml")
+            .addAsResource("META-INF/load.sql");
+    }
+
+    @Test
+    public void T1_testGet() throws Exception {
+        assertNotNull(employeeService);
+
+        List<Employee> employees = employeeService.findAll();
+
+        assertNotNull(employees);
+        assertEquals(8, employees.size());
+
+        assertFalse(employees.contains(new Employee("Penny")));
+        assertFalse(employees.contains(new Employee("Sheldon")));
+        assertFalse(employees.contains(new Employee("Amy")));
+        assertFalse(employees.contains(new Employee("Leonard")));
+        assertFalse(employees.contains(new Employee("Bernadette")));
+        assertFalse(employees.contains(new Employee("Raj")));
+        assertFalse(employees.contains(new Employee("Howard")));
+        assertFalse(employees.contains(new Employee("Priya")));
+    }
+
+    @Test
+    public void T2_testPersist() throws Exception {
+
+        Employee newEmployee = new Employee("Reza");
+
+        employeeService.persist(newEmployee);
+
+        List<Employee> employees = employeeService.findAll();
+        assertNotNull(employees);
+        assertEquals(9, employees.size());
+
+        boolean rezaInList = false;
+        for (Employee employee : employees) {
+            if (employee.getName().equals("Reza")) {
+                rezaInList = true;
+                break;
+            }
+        }
+
+        assertTrue(rezaInList);
+    }
+
+}