Remove visitor, ExtensionTypeHeader constructor. Fix exception type o…

…f integer overflow
msgpack · xerial · Jun 19, 2015 · Jun 13, 2015 · Jun 13, 2015 · Jun 13, 2015
commit ed45331e90eaf85947b60e19f3abb2c98dbe0cbb
diff --git a/msgpack-core/src/main/java/org/msgpack/core/ExtensionTypeHeader.java b/msgpack-core/src/main/java/org/msgpack/core/ExtensionTypeHeader.java
@@ -10,15 +10,14 @@ public class ExtensionTypeHeader {
     private final int length;
 
     public ExtensionTypeHeader(byte type, int length) {
-        checkArgument(length >= 0, String.format("length must be >= 0: %,d", length));
+        checkArgument(length >= 0, "length must be >= 0");
         this.type = type;
         this.length = length;
     }
 
-    public ExtensionTypeHeader(int type, int length) {
-        checkArgument(Byte.MIN_VALUE <= type &&  type <= Byte.MAX_VALUE, "Extension type must be within -128 to 127");
-        this.type = (byte) type;
-        this.length = length;
+    public static byte checkedCastToByte(int code) {
+        checkArgument(code < Byte.MIN_VALUE && code > Byte.MAX_VALUE, "Extension type code must be within the range of byte");
+        return (byte) code;
     }
 
     public byte getType() {

diff --git a/msgpack-core/src/main/java/org/msgpack/value/IntegerValue.java b/msgpack-core/src/main/java/org/msgpack/value/IntegerValue.java
@@ -16,7 +16,7 @@
 package org.msgpack.value;
 
 import java.math.BigInteger;
-import org.msgpack.core.MessageOverflowException;
+import org.msgpack.core.MessageIntegerOverflowException;
 
 /**
  * The interface {@code IntegerValue} represents MessagePack's Integer type.
@@ -47,31 +47,31 @@ public interface IntegerValue extends NumberValue {
     /**
      * Returns the value as a {@code byte}, otherwise throws an exception.
      *
-     * @throws  MessageOverflowException
+     * @throws  MessageIntegerOverflowException
      *          If the value does not fit in the range of {@code byte} type.
      */
     byte getByte();
 
     /**
      * Returns the value as a {@code short}, otherwise throws an exception.
      *
-     * @throws  MessageOverflowException
+     * @throws  MessageIntegerOverflowException
      *          If the value does not fit in the range of {@code short} type.
      */
     short getShort();
 
     /**
      * Returns the value as an {@code int}, otherwise throws an exception.
      *
-     * @throws  MessageOverflowException
+     * @throws  MessageIntegerOverflowException
      *          If the value does not fit in the range of {@code int} type.
      */
     int getInt();
 
     /**
      * Returns the value as a {@code long}, otherwise throws an exception.
      *
-     * @throws  MessageOverflowException
+     * @throws  MessageIntegerOverflowException
      *          If the value does not fit in the range of {@code long} type.
      */
     long getLong();

diff --git a/msgpack-core/src/main/java/org/msgpack/value/Value.java b/msgpack-core/src/main/java/org/msgpack/value/Value.java
@@ -235,13 +235,6 @@ public interface Value {
      */
     void writeTo(MessagePacker pk) throws IOException;
 
-
-    /**
-     * Accept a visitor to traverse this value
-     * @param visitor
-     */
-    void accept(ValueVisitor visitor);
-
     /**
      * Compares this value to the specified object.
      * <p/>

diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueVisitor.java b/msgpack-core/src/main/java/org/msgpack/value/ValueVisitor.java
diff --git a/msgpack-core/src/main/java/org/msgpack/value/Variable.java b/msgpack-core/src/main/java/org/msgpack/value/Variable.java
@@ -239,11 +239,6 @@ public ImmutableNilValue immutableValue() {
         public void writeTo(MessagePacker pk) throws IOException {
             pk.packNil();
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitNil();
-        }
     }
 
 
@@ -283,11 +278,6 @@ public boolean getBoolean() {
         public void writeTo(MessagePacker pk) throws IOException {
             pk.packBoolean(longValue == 1L);
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitBoolean(this);
-        }
     }
 
 
@@ -501,11 +491,6 @@ public void writeTo(MessagePacker pk) throws IOException {
                 pk.packLong(longValue);
             }
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitInteger(this);
-        }
     }
 
 
@@ -549,10 +534,6 @@ public void writeTo(MessagePacker pk) throws IOException {
             pk.packDouble(doubleValue);
         }
 
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitFloat(this);
-        }
     }
 
 
@@ -639,10 +620,6 @@ public void writeTo(MessagePacker pk) throws IOException {
             pk.writePayload(data);
         }
 
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitBinary(this);
-        }
     }
 
 
@@ -683,11 +660,6 @@ public void writeTo(MessagePacker pk) throws IOException {
             pk.packRawStringHeader(data.length);
             pk.writePayload(data);
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitString(this);
-        }
     }
 
 
@@ -756,11 +728,6 @@ public void writeTo(MessagePacker pk) throws IOException {
                 e.writeTo(pk);
             }
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitArray(this);
-        }
     }
 
     ////
@@ -840,11 +807,6 @@ public void writeTo(MessagePacker pk) throws IOException {
                 pair.getValue().writeTo(pk);
             }
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitMap(this);
-        }
     }
 
 
@@ -888,11 +850,6 @@ public byte[] getData() {
         public void writeTo(MessagePacker pk) throws IOException {
             ((ImmutableExtensionValue) objectValue).writeTo(pk);
         }
-
-        @Override
-        public void accept(ValueVisitor visitor) {
-            visitor.visitExtension(((ImmutableExtensionValue) objectValue));
-        }
     }
 
 
@@ -910,11 +867,6 @@ public void writeTo(MessagePacker pk) throws IOException {
         accessor.writeTo(pk);
     }
 
-    @Override
-    public void accept(ValueVisitor visitor) {
-        accessor.accept(visitor);
-    }
-
     @Override
     public int hashCode() {
         return immutableValue().hashCode();  // TODO optimize

diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableArrayValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableArrayValueImpl.java
@@ -95,11 +95,6 @@ public void writeTo(MessagePacker pk) throws IOException {
         }
     }
 
-    @Override
-    public void accept(ValueVisitor visitor) {
-        visitor.visitArray(this);
-    }
-
     @Override
     public boolean equals(Object o) {
         if(o == this) {

diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBigIntegerValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBigIntegerValueImpl.java
@@ -161,11 +161,6 @@ public void writeTo(MessagePacker pk) throws IOException {
         pk.packBigInteger(value);
     }
 
-    @Override
-    public void accept(ValueVisitor visitor) {
-        visitor.visitInteger(this);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (o == this) {

diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBinaryValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBinaryValueImpl.java
@@ -16,20 +16,19 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
+import org.msgpack.value.ImmutableBinaryValue;
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueType;
-import org.msgpack.value.ImmutableBinaryValue;
-import org.msgpack.value.ValueVisitor;
 
-import java.util.Arrays;
 import java.io.IOException;
+import java.util.Arrays;
 
 
 /**
  * {@code ImmutableBinaryValueImpl} Implements {@code ImmutableBinaryValue} using a {@code byte[]} field.
  * This implementation caches result of {@code stringValue()} and {@code getString()} using a private {@code String} field.
  *
- * @see  org.msgpack.value.StringValue
+ * @see org.msgpack.value.StringValue
  */
 public class ImmutableBinaryValueImpl extends AbstractImmutableRawValue implements ImmutableBinaryValue {
     public ImmutableBinaryValueImpl(byte[] data) {
@@ -57,28 +56,24 @@ public void writeTo(MessagePacker pk) throws IOException {
         pk.writePayload(data);
     }
 
-    @Override
-    public void accept(ValueVisitor visitor) {
-        visitor.visitBinary(this);
-    }
-
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
+        if(this == o) {
             return true;
         }
-        if (!(o instanceof Value)) {
+        if(!(o instanceof Value)) {
             return false;
         }
         Value v = (Value) o;
-        if (!v.isBinaryValue()) {
+        if(!v.isBinaryValue()) {
             return false;
         }
 
-        if (v instanceof ImmutableBinaryValueImpl) {
+        if(v instanceof ImmutableBinaryValueImpl) {
             ImmutableBinaryValueImpl bv = (ImmutableBinaryValueImpl) v;
             return Arrays.equals(data, bv.data);
-        } else {
+        }
+        else {
             return Arrays.equals(data, v.asBinaryValue().getByteArray());
         }
     }

diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBooleanValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBooleanValueImpl.java
@@ -16,17 +16,19 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
-import org.msgpack.value.*;
+import org.msgpack.value.ImmutableBooleanValue;
+import org.msgpack.value.Value;
+import org.msgpack.value.ValueType;
 
 import java.io.IOException;
 
 
 /**
  * {@code ImmutableBooleanValueImpl} Implements {@code ImmutableBooleanValue} using a {@code boolean} field.
- *
+ * <p/>
  * This class is a singleton. {@code ImmutableBooleanValueImpl.trueInstance()} and {@code ImmutableBooleanValueImpl.falseInstance()} are the only instances of this class.
  *
- * @see  org.msgpack.value.BooleanValue
+ * @see org.msgpack.value.BooleanValue
  */
 public class ImmutableBooleanValueImpl extends AbstractImmutableValue implements ImmutableBooleanValue {
     public static ImmutableBooleanValue TRUE = new ImmutableBooleanValueImpl(true);
@@ -58,32 +60,28 @@ public void writeTo(MessagePacker packer) throws IOException {
         packer.packBoolean(value);
     }
 
-    @Override
-    public void accept(ValueVisitor visitor) {
-        visitor.visitBoolean(this);
-    }
-
     @Override
     public boolean equals(Object o) {
-        if (o == this) {
+        if(o == this) {
             return true;
         }
-        if (!(o instanceof Value)) {
+        if(!(o instanceof Value)) {
             return false;
         }
         Value v = (Value) o;
 
-        if (!v.isBooleanValue()) {
+        if(!v.isBooleanValue()) {
             return false;
         }
         return value == v.asBooleanValue().getBoolean();
     }
 
     @Override
     public int hashCode() {
-        if (value) {
+        if(value) {
             return 1231;
-        } else {
+        }
+        else {
             return 1237;
         }
     }