Removed ValueType.bitMask

xerial · xerial · commit 53557e9cc695 · 2015-06-15T13:46:31.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java b/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java
@@ -95,7 +95,7 @@ public static MessageFormat valueOf(final byte b) {
      * @return
      */
     @VisibleForTesting
-    public static MessageFormat toMessageFormat(final byte b) {
+    static MessageFormat toMessageFormat(final byte b) {
         if (Code.isPosFixInt(b)) {
             return POSFIXINT;
         }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueType.java b/msgpack-core/src/main/java/org/msgpack/value/ValueType.java
@@ -34,30 +34,10 @@ public enum ValueType {
 
     private final boolean numberType;
     private final boolean rawType;
-    private final int bitMask;
 
     private ValueType(boolean numberType, boolean rawType) {
         this.numberType = numberType;
         this.rawType = rawType;
-        this.bitMask = 1 << this.ordinal();
-    }
-
-    /**
-     * Returns a bit mask representing this value type for quickly cheking
-     * this value type
-     * @return bit mask representing this value type
-     */
-    public int getBitMask() {
-        return bitMask;
-    }
-
-    /**
-     * Check whether the given bit mask represents this value type
-     * @param bitMask
-     * @return
-     */
-    public boolean isTypeOf(int bitMask) {
-        return (this.bitMask & bitMask) != 0;
     }
 
     public boolean isNilType() {
@@ -104,10 +84,6 @@ public boolean isExtensionType() {
         return this == EXTENSION;
     }
 
-    public static ValueType valueOf(byte b) {
-        return MessageFormat.valueOf(b).getValueType();
-    }
-
     public String toTypeName() {
         return this.name().substring(0, 1) + this.name().substring(1).toLowerCase();
     }
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/ValueTypeTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/ValueTypeTest.scala
@@ -13,97 +13,56 @@ class ValueTypeTest extends MessagePackSpec {
 
   "ValueType" should {
 
-    "lookup ValueType from a byte value" taggedAs("code") in {
+    "lookup ValueType from a byte value" taggedAs ("code") in {
 
-      def check(b:Byte, tpe:ValueType) {
-        ValueType.valueOf(b) shouldBe tpe
+      def check(b: Byte, tpe: ValueType) {
+        MessageFormat.valueOf(b).getValueType shouldBe tpe
       }
 
-      for(i <- 0 until 0x7f)
+      for (i <- 0 until 0x7f)
         check(i.toByte, ValueType.INTEGER)
 
-      for(i <- 0x80 until 0x8f)
+      for (i <- 0x80 until 0x8f)
         check(i.toByte, ValueType.MAP)
 
-      for(i <- 0x90 until 0x9f)
+      for (i <- 0x90 until 0x9f)
         check(i.toByte, ValueType.ARRAY)
 
       check(NIL, ValueType.NIL)
 
       try {
-        ValueType.valueOf(NEVER_USED)
+        MessageFormat.valueOf(NEVER_USED).getValueType
         fail("NEVER_USED type should not have ValueType")
       }
       catch {
-        case e:MessageFormatException =>
-          // OK
+        case e: MessageFormatException =>
+        // OK
       }
 
       check(TRUE, ValueType.BOOLEAN)
       check(FALSE, ValueType.BOOLEAN)
 
-      for(t <- Seq(BIN8, BIN16, BIN32))
+      for (t <- Seq(BIN8, BIN16, BIN32))
         check(t, ValueType.BINARY)
 
-      for(t <- Seq(FIXEXT1, FIXEXT2, FIXEXT4, FIXEXT8, FIXEXT16, EXT8, EXT16, EXT32))
+      for (t <- Seq(FIXEXT1, FIXEXT2, FIXEXT4, FIXEXT8, FIXEXT16, EXT8, EXT16, EXT32))
         check(t, ValueType.EXTENSION)
 
-      for(t <- Seq(INT8, INT16, INT32, INT64, UINT8, UINT16, UINT32, UINT64))
+      for (t <- Seq(INT8, INT16, INT32, INT64, UINT8, UINT16, UINT32, UINT64))
         check(t, ValueType.INTEGER)
 
-      for(t <- Seq(STR8, STR16, STR32))
+      for (t <- Seq(STR8, STR16, STR32))
         check(t, ValueType.STRING)
 
-      for(t <- Seq(FLOAT32, FLOAT64))
+      for (t <- Seq(FLOAT32, FLOAT64))
         check(t, ValueType.FLOAT)
 
-      for(t <- Seq(ARRAY16, ARRAY32))
+      for (t <- Seq(ARRAY16, ARRAY32))
         check(t, ValueType.ARRAY)
 
-      for(i <- 0xe0 until 0xff)
+      for (i <- 0xe0 until 0xff)
         check(i.toByte, ValueType.INTEGER)
 
     }
-
-    "lookup table" in {
-
-      val N = 100000
-      val idx = {
-        val b = Array.newBuilder[Byte]
-        for(i <- 0 until N) {
-          val r = Iterator.continually(Random.nextInt(256)).find(_.toByte != Code.NEVER_USED).get
-          b += r.toByte
-        }
-        b.result()
-      }
-
-      time("lookup", repeat=100) {
-        block("switch") {
-          var i = 0
-          while(i < N) {
-            MessageFormat.toMessageFormat(idx(i)).getValueType()
-            i += 1
-          }
-        }
-
-        block("table") {
-          var i = 0
-          while(i < N) {
-            ValueType.valueOf(idx(i))
-            i += 1
-          }
-        }
-
-      }
-
-    }
-
-    "support isTypeOf" in {
-      for(v <- ValueType.values()) {
-        v.isTypeOf(v.getBitMask) shouldBe true
-      }
-    }
-
-
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static MessageFormat valueOf(final byte b) {`
`95`	`95`	`* @return`
`96`	`96`	`*/`
`97`	`97`	`@VisibleForTesting`
`98`		`- public static MessageFormat toMessageFormat(final byte b) {`
	`98`	`+ static MessageFormat toMessageFormat(final byte b) {`
`99`	`99`	`if (Code.isPosFixInt(b)) {`
`100`	`100`	`return POSFIXINT;`
`101`	`101`	`}`