Merge remote-tracking branch 'remotes/origin/new_id_generator' into feature/0.2.0

commons-spring/src/main/java/cn/quantgroup/tech/util/IDGenerator.java → commons-spring/src/main/java/cn/quantgroup/tech/util/OIDGenerator.java

@@ -35,7 +35,7 @@ import java.util.concurrent.locks.ReentrantLock;
 @Component
 @ConditionalOnClass(RedisTemplate.class)
 @ConditionalOnProperty(name = "data.center.id")
-public class IDGenerator {
+public class OIDGenerator {
 
     private static final String REDIS_WORK_ID_KEY = "GLOBAL:WORK:ID:";
     private static final String ID_FORMAT = "yyyyMMddHHmmss";

commons-spring/src/main/java/cn/quantgroup/tech/util/id/BitsAllocator.java

-/*
- * Copyright (c) 2017 Baidu, Inc. All Rights Reserve.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package cn.quantgroup.tech.util.id;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -24,8 +9,6 @@ import java.math.BigInteger;
 /**
  * Allocate 64 bits for the UID(long)<br>
  * sign (fixed 1bit) -> deltaSecond -> workerId -> sequence(within the same second)
- *
- * @author yutianbao
  */
 public class BitsAllocator {
     /**
@@ -81,7 +64,6 @@ public class BitsAllocator {
 
     /**
      * Allocate bits for UID according to delta seconds & workerId & sequence<br>
-     * <b>Note that: </b>The highest bit will always be 0 for sign
      *
      * @param deltaSeconds
      * @param workerId

commons-spring/src/main/java/cn/quantgroup/tech/util/id/DisposableWorkerIdAssigner.java

-/*
- * Copyright (c) 2017 Baidu, Inc. All Rights Reserve.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.quantgroup.tech.util.id;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DisposableWorkerIdAssigner {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DisposableWorkerIdAssigner.class);
-    private static final String REDIS_WORK_ID_KEY = "GLOBAL:WORK:ID:";
-
-    @Autowired
-    private StringRedisTemplate redisTemplate;
-
-    /**
-     * Assign worker id base on database.<p>
-     * If there is host name & port in the environment, we considered that the node runs in Docker container<br>
-     * Otherwise, the node runs on an actual machine.
-     *
-     * @param dataCenterId
-     * @param bitsAllocator
-     * @return assigned worker id
-     */
-    public long assignWorkerId(long dataCenterId, BitsAllocator bitsAllocator) {
-        return redisTemplate.opsForValue().increment(REDIS_WORK_ID_KEY + dataCenterId, 1) % bitsAllocator.getMaxWorkerId();
-    }
-
-
-}

commons-spring/src/main/java/cn/quantgroup/tech/util/id/UidGenerateException.java → commons-spring/src/main/java/cn/quantgroup/tech/util/id/IDGenerateException.java

@@ -16,11 +16,9 @@
 package cn.quantgroup.tech.util.id;
 
 /**
- * UidGenerateException
- * 
- * @author yutianbao
+ * IDGenerateException
  */
-public class UidGenerateException extends RuntimeException {
+public class IDGenerateException extends RuntimeException {
 
     /**
      * Serial Version UID
@@ -30,45 +28,16 @@ public class UidGenerateException extends RuntimeException {
     /**
      * Default constructor
      */
-    public UidGenerateException() {
+    public IDGenerateException() {
         super();
     }
 
-    /**
-     * Constructor with message & cause
-     * 
-     * @param message
-     * @param cause
-     */
-    public UidGenerateException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructor with message
-     * 
-     * @param message
-     */
-    public UidGenerateException(String message) {
-        super(message);
-    }
-    
-    /**
-     * Constructor with message format
-     * 
-     * @param msgFormat
-     * @param args
-     */
-    public UidGenerateException(String msgFormat, Object... args) {
-        super(String.format(msgFormat, args));
-    }
-
     /**
      * Constructor with cause
      * 
      * @param cause
      */
-    public UidGenerateException(Throwable cause) {
+    public IDGenerateException(Throwable cause) {
         super(cause);
     }
 

commons-spring/src/main/java/cn/quantgroup/tech/util/id/UidGenerator.java

-package cn.quantgroup.tech.util.id;
-
-/**
- * Represents a unique id generator.
- *
- * @author yutianbao
- */
-public interface UidGenerator {
-
-    /**
-     * Get a unique ID
-     *
-     * @return UID
-     * @throws UidGenerateException
-     */
-    String getUID(String preFix) throws UidGenerateException;
-
-    /**
-     * Parse the UID into elements which are used to generate the UID. <br>
-     * Such as timestamp & workerId & sequence...
-     *
-     * @param uid
-     * @return Parsed info
-     */
-    String parseUID(String uid);
-
-}