svn commit: r1024093 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence: datacache/CachedEntityStatistics.java kernel/common/apps/State.java kernel/common/apps/Transition.java

[al...@apache.org]

Author: allee8285
Date: Tue Oct 19 02:31:15 2010
New Revision: 1024093

URL: http://svn.apache.org/viewvc?rev=1024093&view=rev
Log:
OPENJPA-1842 - replace @GeneratedValue type from IDENTITY to AUTO.

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java?rev=1024093&r1=1024092&r2=1024093&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java Tue Oct 19 02:31:15 2010
@@ -25,6 +25,8 @@ import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
@@ -32,8 +34,8 @@ import javax.persistence.Version;
 @Entity
 public class CachedEntityStatistics {
     @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     protected int id;
-    private static int simulateAutoIdGen = 0;
 
     @Version
     protected int version;
@@ -45,7 +47,6 @@ public class CachedEntityStatistics {
     Set<CachedEntityStatistics> lazyList = new HashSet<CachedEntityStatistics>();
 
     public CachedEntityStatistics() {
-        id = ++simulateAutoIdGen;
     }
 
     private String firstName, lastName;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java?rev=1024093&r1=1024092&r2=1024093&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java Tue Oct 19 02:31:15 2010
@@ -49,7 +49,7 @@ import org.apache.openjpa.persistence.ke
         @FetchGroup(name = "State_IncomingTransitions", attributes = { @FetchAttribute(name = "incomingTransitions")})})
 public class State implements Serializable {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(length = 64)
@@ -60,7 +60,7 @@ public class State implements Serializab
 
     @OneToMany(mappedBy = "toState", cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH })
     private List<Transition> incomingTransitions;
-    
+
     public Long getId() {
         return id;
     }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java?rev=1024093&r1=1024092&r2=1024093&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java Tue Oct 19 02:31:15 2010
@@ -42,7 +42,7 @@ import org.apache.openjpa.persistence.ke
 @Entity
 public class Transition implements Serializable {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(length = 64)