Refactoring, Hibernate still failing

Author: mswatosh

Diff for: src/main/java/io/openliberty/sample/data/Package.java

@@ -7,15 +7,15 @@
 public class Package {
 
     @Id
-    public int id;
+    public Integer id;
 
     public String destination;
 
     public Package() {
 
     }
 
-    public Package(int id, String destination) {
+    public Package(Integer id, String destination) {
         this.id = id;
         this.destination = destination;
     }

Diff for: src/main/java/io/openliberty/sample/rest/PackagesApplication.java renamed to src/main/java/io/openliberty/sample/data/PackagesApplication.java

@@ -1,4 +1,4 @@
-package io.openliberty.sample.rest;
+package io.openliberty.sample.data;
 
 import jakarta.ws.rs.ApplicationPath;
 import jakarta.ws.rs.core.Application;

Diff for: src/main/java/io/openliberty/sample/rest/PackagesService.java renamed to src/main/java/io/openliberty/sample/data/PackagesService.java

@@ -1,9 +1,9 @@
-package io.openliberty.sample.rest;
+package io.openliberty.sample.data;
 
-import io.openliberty.sample.data.Packages;
-import io.openliberty.sample.data.Package;
+import jakarta.annotation.Resource;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.transaction.UserTransaction;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
@@ -17,6 +17,9 @@ public class PackagesService {
     @Inject
     Packages packages;
 
+    @Resource
+    UserTransaction tran;
+
     @GET //For testing eventually change to POST
     @Path("/{id}") 
     public void add(@PathParam("id") Integer id) {

Diff for: src/main/liberty/config/server.xml

@@ -21,6 +21,7 @@
     <logging traceSpecification="*=info:data=all:org.hibernate=all:persistenceService=all"/>
 
 
+
     <featureManager>
         <feature>dataContainer-1.0</feature>
         <feature>persistenceContainer-3.2</feature>
@@ -30,10 +31,12 @@
 		<fileset dir="${server.config.dir}/lib/derby" includes="*.jar"/>
 	</library>
 
+
     <library id="hibernate">
     	<fileset dir="${server.config.dir}/lib/hibernate" includes="*.jar"/>
 	</library>
 
+
 	<dataSource id="DefaultDataSource">
         <jdbcDriver libraryRef="derby"/>
         <properties.derby.embedded databaseName="memory:testDB" createDatabase="create"/>

Diff for: src/main/resources/META-INF/persistence.xml

@@ -9,10 +9,14 @@
         <properties>
             <property name="jakarta.persistence.schema-generation.database.action" value="create"/>
             <property name="hibernate.show_sql" value="true"/>
+            
             <property name="hibernate.allow_update_outside_transaction" value="true"/>
             <property name="hibernate.enhancer.enableDirtyTracking" value="false"/>
             <property name="hibernate.enhancer.enableLazyInitialization" value="false"/>
+            
             <property name="hibernate.dialect" value="org.hibernate.community.dialect.DerbyDialect"/>
+            <property name="hibernate.archive.autodetection" value="class, hbm"/>
+        
         </properties>
     </persistence-unit>