JPA mapping updates

[utils] / security / impl / src / main / java / org / wamblee / security / AbstractPersistent.java

diff --git a/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java b/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
index f5944843ab7a5cd9017da1ed44ee44257d50b306..ced29a3f4c11d670816100971185f1d1ffb5df2c 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
+++ b/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
@@ -17,11 +17,6 @@ package org.wamblee.security;
 
 import java.io.Serializable;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
 import org.wamblee.persistence.Persistent;
 
 /**
@@ -30,16 +25,13 @@ import org.wamblee.persistence.Persistent;
  * @author Erik Brakkee
  */
 public abstract class AbstractPersistent implements Persistent {
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+   
+    private Serializable id;
 
-    @Version
-    private int version;
+    private Number version;
 
     protected AbstractPersistent() {
-        primaryKey = null;
+        id = null;
         version = -1;
     }
 
@@ -50,7 +42,7 @@ public abstract class AbstractPersistent implements Persistent {
      *            Object to copy.
      */
     protected AbstractPersistent(AbstractPersistent aPersistent) {
-        primaryKey = aPersistent.primaryKey;
+        id = aPersistent.id;
         version = aPersistent.version;
     }
 
@@ -60,8 +52,8 @@ public abstract class AbstractPersistent implements Persistent {
      * @see org.wamblee.persistence.Persistent#getPrimaryKey()
      */
     @Override
-    public Long getPrimaryKey() {
-        return primaryKey;
+    public Serializable getPrimaryKey() {
+        return id;
     }
 
     /*
@@ -71,8 +63,8 @@ public abstract class AbstractPersistent implements Persistent {
      * org.wamblee.persistence.Persistent#setPrimaryKey(java.io.Serializable)
      */
     @Override
-    public void setPrimaryKey(Long aKey) {
-        primaryKey = aKey;
+    public void setPrimaryKey(Serializable aKey) {
+        id = aKey;
     }
 
     /*
@@ -80,7 +72,7 @@ public abstract class AbstractPersistent implements Persistent {
      * 
      * @see org.wamblee.persistence.Persistent#getPersistedVersion()
      */
-    public int getPersistedVersion() {
+    public Number getPersistedVersion() {
         return version;
     }
 
@@ -89,7 +81,7 @@ public abstract class AbstractPersistent implements Persistent {
      * 
      * @see org.wamblee.persistence.Persistent#setPersistedVersion(int)
      */
-    public void setPersistedVersion(int aVersion) {
+    public void setPersistedVersion(Number aVersion) {
         version = aVersion;
     }
 }