generators have been renamed

pull/660/head
Nikita 8 years ago
parent f026184fb3
commit e5e3ec18ea

@ -22,10 +22,10 @@ import org.redisson.api.annotation.RId;
* *
* @author Rui Gu (https://github.com/jackygurui) * @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 public static final LongGenerator INSTANCE
= new DistributedAtomicLongIdGenerator(); = new LongGenerator();
@Override @Override
public Long resolve(Class value, RId id, String idFieldName, RedissonClient redisson) { public Long resolve(Class value, RId id, String idFieldName, RedissonClient redisson) {

@ -24,9 +24,9 @@ import org.redisson.api.annotation.RId;
* *
* @author Rui Gu (https://github.com/jackygurui) * @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 @Override
public String resolve(Class value, RId id, String idFieldName, RedissonClient redisson) { public String resolve(Class value, RId id, String idFieldName, RedissonClient redisson) {

@ -44,8 +44,8 @@ import org.redisson.api.annotation.REntity;
import org.redisson.api.annotation.RFieldAccessor; import org.redisson.api.annotation.RFieldAccessor;
import org.redisson.api.annotation.RId; import org.redisson.api.annotation.RId;
import org.redisson.liveobject.resolver.DefaultNamingScheme; import org.redisson.liveobject.resolver.DefaultNamingScheme;
import org.redisson.liveobject.resolver.DistributedAtomicLongIdGenerator; import org.redisson.liveobject.resolver.LongGenerator;
import org.redisson.liveobject.resolver.RandomUUIDIdStringGenerator; import org.redisson.liveobject.resolver.UUIDGenerator;
/** /**
* *
@ -151,7 +151,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class TestREntityWithMap implements Comparable<TestREntityWithMap>, Serializable { public static class TestREntityWithMap implements Comparable<TestREntityWithMap>, Serializable {
@RId(generator = RandomUUIDIdStringGenerator.class) @RId(generator = UUIDGenerator.class)
private String name; private String name;
private Map value; private Map value;
@ -392,7 +392,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@RCascade(RCascadeType.ALL) @RCascade(RCascadeType.ALL)
private Object content; private Object content;
@RId(generator = RandomUUIDIdStringGenerator.class) @RId(generator = UUIDGenerator.class)
private Serializable id; private Serializable id;
public TestClass() { public TestClass() {
@ -760,7 +760,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class TestClassID1 { public static class TestClassID1 {
@RId(generator = DistributedAtomicLongIdGenerator.class) @RId(generator = LongGenerator.class)
private Long name; private Long name;
public TestClassID1() { public TestClassID1() {
@ -779,7 +779,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class TestClassID2 { public static class TestClassID2 {
@RId(generator = DistributedAtomicLongIdGenerator.class) @RId(generator = LongGenerator.class)
private Long name; private Long name;
public TestClassID2() { public TestClassID2() {
@ -871,7 +871,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
private String code; private String code;
private Object content; private Object content;
@RId(generator = RandomUUIDIdStringGenerator.class) @RId(generator = UUIDGenerator.class)
private Serializable id; private Serializable id;
public TestClassNoTransformation() { public TestClassNoTransformation() {
@ -990,7 +990,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class MyObject implements Serializable { public static class MyObject implements Serializable {
@RId(generator = DistributedAtomicLongIdGenerator.class) @RId(generator = LongGenerator.class)
private Long id; private Long id;
private Long myId; private Long myId;
@ -1073,7 +1073,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class SimpleObject { public static class SimpleObject {
@RId(generator = RandomUUIDIdStringGenerator.class) @RId(generator = UUIDGenerator.class)
private String id; private String id;
private Long value; private Long value;
@ -1095,7 +1095,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class ObjectWithList { public static class ObjectWithList {
@RId(generator = RandomUUIDIdStringGenerator.class) @RId(generator = UUIDGenerator.class)
private String id; private String id;
private List<SimpleObject> objects; private List<SimpleObject> objects;
@ -1264,7 +1264,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class Order { public static class Order {
@RId(generator = DistributedAtomicLongIdGenerator.class) @RId(generator = LongGenerator.class)
private Long id; private Long id;
@RCascade({RCascadeType.PERSIST, RCascadeType.DETACH}) @RCascade({RCascadeType.PERSIST, RCascadeType.DETACH})
@ -1383,7 +1383,7 @@ public class RedissonLiveObjectServiceTest extends BaseTest {
@REntity @REntity
public static class ClassWithoutIdSetterGetter { public static class ClassWithoutIdSetterGetter {
@RId(generator = DistributedAtomicLongIdGenerator.class) @RId(generator = LongGenerator.class)
private Long id; private Long id;
private String name; private String name;

Loading…
Cancel
Save