优化参数判断逻辑

Java/source/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.yitter</groupId>
     <artifactId>yitter-idgenerator</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
 
     <name>yitter-idgenerator</name>

Java/source/src/main/java/com/github/yitter/core/SnowWorkerM1.java

@@ -50,8 +50,8 @@ public class SnowWorkerM1 implements ISnowWorker {
     protected final static byte[] _SyncLock = new byte[0];
 
     protected short _CurrentSeqNumber;
-    protected long _LastTimeTick = -1L;
-    protected long _TurnBackTimeTick = -1L;
+    protected long _LastTimeTick = 0;
+    protected long _TurnBackTimeTick = 0;
     protected byte _TurnBackIndex = 0;
 
     protected boolean _IsOverCost = false;
@@ -60,15 +60,15 @@ public class SnowWorkerM1 implements ISnowWorker {
     protected int _TermIndex = 0;
 
     public SnowWorkerM1(IdGeneratorOptions options) {
-        WorkerId = options.WorkerId;
-        WorkerIdBitLength = options.WorkerIdBitLength == 0 ? 6 : options.WorkerIdBitLength;
-        SeqBitLength = options.SeqBitLength == 0 ? 6 : options.SeqBitLength;
-        MaxSeqNumber = options.MaxSeqNumber > 0 ? options.MaxSeqNumber : (1 << SeqBitLength) - 1;
-        MinSeqNumber = options.MinSeqNumber;
-        TopOverCostCount = options.TopOverCostCount;
         BaseTime = options.BaseTime != 0 ? options.BaseTime : 1582136402000L;
+        WorkerIdBitLength = options.WorkerIdBitLength == 0 ? 6 : options.WorkerIdBitLength;
+        WorkerId = options.WorkerId;
+        SeqBitLength = options.SeqBitLength == 0 ? 6 : options.SeqBitLength;
+        MaxSeqNumber = options.MaxSeqNumber <= 0 ? (1 << SeqBitLength) - 1 : options.MaxSeqNumber;
+        MinSeqNumber = options.MinSeqNumber;
+        TopOverCostCount = options.TopOverCostCount == 0 ? 2000 : options.TopOverCostCount;
         _TimestampShift = (byte) (WorkerIdBitLength + SeqBitLength);
-        _CurrentSeqNumber = options.MinSeqNumber;
+        _CurrentSeqNumber = MinSeqNumber;
     }
 
     private void DoGenIdAction(OverCostActionArg arg) {
@@ -182,11 +182,12 @@ public class SnowWorkerM1 implements ISnowWorker {
                 BeginTurnBackAction(_TurnBackTimeTick);
             }
 
-            try {
-                // Thread.sleep(1);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+//            try {
+//                 Thread.sleep(1);
+//            } catch (InterruptedException e) {
+//                e.printStackTrace();
+//            }
+
             return CalcTurnBackId(_TurnBackTimeTick);
         }
 

Java/source/src/main/java/com/github/yitter/idgen/DefaultIdGenerator.java

@@ -21,34 +21,45 @@ public class DefaultIdGenerator implements IIdGenerator {
             throw new IdGeneratorException("options error.");
         }
 
+        // 1.BaseTime
         if (options.BaseTime < 315504000000L || options.BaseTime > System.currentTimeMillis()) {
             throw new IdGeneratorException("BaseTime error.");
         }
 
+        // 2.WorkerIdBitLength
         if (options.WorkerIdBitLength <= 0) {
             throw new IdGeneratorException("WorkerIdBitLength error.(range:[1, 21])");
         }
-        if (options.SeqBitLength + options.WorkerIdBitLength > 22) {
+        if (options.WorkerIdBitLength + options.SeqBitLength > 22) {
             throw new IdGeneratorException("error：WorkerIdBitLength + SeqBitLength <= 22");
         }
 
+        // 3.WorkerId
         int maxWorkerIdNumber = (1 << options.WorkerIdBitLength) - 1;
+        if (maxWorkerIdNumber == 0) {
+            maxWorkerIdNumber = 63;
+        }
         if (options.WorkerId < 0 || options.WorkerId > maxWorkerIdNumber) {
             throw new IdGeneratorException("WorkerId error. (range:[0, " + (maxWorkerIdNumber > 0 ? maxWorkerIdNumber : 63) + "]");
         }
 
+        // 4.SeqBitLength
         if (options.SeqBitLength < 2 || options.SeqBitLength > 21) {
             throw new IdGeneratorException("SeqBitLength error. (range:[2, 21])");
         }
 
+        // 5.MaxSeqNumber
         int maxSeqNumber = (1 << options.SeqBitLength) - 1;
+        if (maxSeqNumber == 0) {
+            maxSeqNumber = 63;
+        }
         if (options.MaxSeqNumber < 0 || options.MaxSeqNumber > maxSeqNumber) {
             throw new IdGeneratorException("MaxSeqNumber error. (range:[1, " + maxSeqNumber + "]");
         }
 
-        int maxValue = maxSeqNumber;
-        if (options.MinSeqNumber < 5 || options.MinSeqNumber > maxValue) {
-            throw new IdGeneratorException("MinSeqNumber error. (range:[5, " + maxValue + "]");
+        // 6.MinSeqNumber
+        if (options.MinSeqNumber < 5 || options.MinSeqNumber > maxSeqNumber) {
+            throw new IdGeneratorException("MinSeqNumber error. (range:[5, " + maxSeqNumber + "]");
         }
 
         switch (options.Method) {

Java/source/src/main/java/com/github/yitter/test/StartUp.java

@@ -53,3 +53,5 @@ public class StartUp {
         }
     }
 }
+
+// mvn clean deploy -P release