generators have been renamed

redisson · Oct 5, 2016 · e5e3ec1 · e5e3ec1
1 parent f026184
commit e5e3ec1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/...ver/DistributedAtomicLongIdGenerator.java → ...on/liveobject/resolver/LongGenerator.java b/...ver/DistributedAtomicLongIdGenerator.java → ...on/liveobject/resolver/LongGenerator.java
@@ -22,10 +22,10 @@
  *
  * @author Rui Gu (https://github.com/jackygurui)
  */
-public class DistributedAtomicLongIdGenerator implements RIdResolver<RId, Long> {
+public class LongGenerator implements RIdResolver<RId, Long> {
 
-    public static final DistributedAtomicLongIdGenerator INSTANCE
-            = new DistributedAtomicLongIdGenerator();
+    public static final LongGenerator INSTANCE
+            = new LongGenerator();
 
     @Override
     public Long resolve(Class value, RId id, String idFieldName, RedissonClient redisson) {

diff --git a/...resolver/RandomUUIDIdStringGenerator.java → ...on/liveobject/resolver/UUIDGenerator.java b/...resolver/RandomUUIDIdStringGenerator.java → ...on/liveobject/resolver/UUIDGenerator.java
@@ -24,9 +24,9 @@
  *
  * @author Rui Gu (https://github.com/jackygurui)
  */
-public class RandomUUIDIdStringGenerator implements RIdResolver<RId, String>{
+public class UUIDGenerator implements RIdResolver<RId, String>{
 
-    public static final RandomUUIDIdStringGenerator INSTANCE = new RandomUUIDIdStringGenerator();
+    public static final UUIDGenerator INSTANCE = new UUIDGenerator();
 
     @Override
     public String resolve(Class value, RId id, String idFieldName, RedissonClient redisson) {

diff --git a/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java b/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java
@@ -44,8 +44,8 @@
 import org.redisson.api.annotation.RFieldAccessor;
 import org.redisson.api.annotation.RId;
 import org.redisson.liveobject.resolver.DefaultNamingScheme;
-import org.redisson.liveobject.resolver.DistributedAtomicLongIdGenerator;
-import org.redisson.liveobject.resolver.RandomUUIDIdStringGenerator;
+import org.redisson.liveobject.resolver.LongGenerator;
+import org.redisson.liveobject.resolver.UUIDGenerator;
 
 /**
  *
@@ -151,7 +151,7 @@ public int compareTo(TestREntityWithRMap o) {
     @REntity
     public static class TestREntityWithMap implements Comparable<TestREntityWithMap>, Serializable {
 
-        @RId(generator = RandomUUIDIdStringGenerator.class)
+        @RId(generator = UUIDGenerator.class)
         private String name;
         private Map value;
 
@@ -392,7 +392,7 @@ public static class TestClass {
         @RCascade(RCascadeType.ALL)
         private Object content;
 
-        @RId(generator = RandomUUIDIdStringGenerator.class)
+        @RId(generator = UUIDGenerator.class)
         private Serializable id;
 
         public TestClass() {
@@ -760,7 +760,7 @@ public void testRemoveById() {
     @REntity
     public static class TestClassID1 {
 
-        @RId(generator = DistributedAtomicLongIdGenerator.class)
+        @RId(generator = LongGenerator.class)
         private Long name;
 
         public TestClassID1() {
@@ -779,7 +779,7 @@ public Long getName() {
     @REntity
     public static class TestClassID2 {
 
-        @RId(generator = DistributedAtomicLongIdGenerator.class)
+        @RId(generator = LongGenerator.class)
         private Long name;
 
         public TestClassID2() {
@@ -871,7 +871,7 @@ public static class TestClassNoTransformation {
         private String code;
         private Object content;
 
-        @RId(generator = RandomUUIDIdStringGenerator.class)
+        @RId(generator = UUIDGenerator.class)
         private Serializable id;
 
         public TestClassNoTransformation() {
@@ -990,7 +990,7 @@ public void testNoTransformation() {
     @REntity
     public static class MyObject implements Serializable {
 
-        @RId(generator = DistributedAtomicLongIdGenerator.class)
+        @RId(generator = LongGenerator.class)
         private Long id;
 
         private Long myId;
@@ -1073,7 +1073,7 @@ public void testRObject() {
     @REntity
     public static class SimpleObject {
 
-        @RId(generator = RandomUUIDIdStringGenerator.class)
+        @RId(generator = UUIDGenerator.class)
         private String id;
 
         private Long value;
@@ -1095,7 +1095,7 @@ public void setValue(Long value) {
     @REntity
     public static class ObjectWithList {
 
-        @RId(generator = RandomUUIDIdStringGenerator.class)
+        @RId(generator = UUIDGenerator.class)
         private String id;
 
         private List<SimpleObject> objects;
@@ -1264,7 +1264,7 @@ public String getId() {
     @REntity
     public static class Order {
 
-        @RId(generator = DistributedAtomicLongIdGenerator.class)
+        @RId(generator = LongGenerator.class)
         private Long id;
 
         @RCascade({RCascadeType.PERSIST, RCascadeType.DETACH})
@@ -1383,7 +1383,7 @@ public void testCyclicRefsDuringDetach() {
     @REntity
     public static class ClassWithoutIdSetterGetter {
 
-        @RId(generator = DistributedAtomicLongIdGenerator.class)
+        @RId(generator = LongGenerator.class)
         private Long id;
 
         private String name;