toXXX -> castAsXXX

xerial · Jun 23, 2015 · Jun 10, 2015 · Jun 10, 2015 · Jun 10, 2015 · Jun 10, 2015
commit 5c51b39d00ae234aca3eeb9bc348add49efa8969
diff --git a/msgpack-core/src/main/java/org/msgpack/value/NumberValue.java b/msgpack-core/src/main/java/org/msgpack/value/NumberValue.java
@@ -18,45 +18,47 @@
 import java.math.BigInteger;
 
 /**
- * The interface {@code NumberValue} is the interface of {@code IntegerValue} and {@code FloatValue}.
+ * The base interface {@code NumberValue} of {@code IntegerValue} and {@code FloatValue}.
  *
  * @see org.msgpack.value.IntegerValue
  * @see org.msgpack.value.FloatValue
  */
 public interface NumberValue extends Value {
 
     /**
-     * Convert this value into a byte value. If this value is not within the range of Byte value, it will truncate or round the value.
+     * Represent this value as a byte value, which may involve rounding or truncation of the original value.
+     * the value.
      */
-    byte toByte();
+    byte castAsByte();
 
     /**
-     * Convert this value into a short value. If this value is not within the range of Short value, it will truncate or round the value.
+     * Represent this value as a short value, which may involve rounding or truncation of the original value.
      */
-    short toShort();
+    short castAsShort();
 
     /**
-     * Convert this value into an int value. If this value is not within the range of Int value, it will truncate or round the value.
+     * Represent this value as an int value, which may involve rounding or truncation of the original value.
+     * value.
      */
-    int toInt();
+    int castAsInt();
 
     /**
-     * Convert this value into a long value. If this value is not within the range of Long value, it will truncate or round the value.
+     * Represent this value as a long value, which may involve rounding or truncation of the original value.
      */
-    long toLong();
+    long castAsLong();
 
     /**
-     * Convert this value into a BigInteger. If value is Float type, it will round the value
+     * Represent this value as a BigInteger, which may involve rounding or truncation of the original value.
      */
-    BigInteger toBigInteger();
+    BigInteger castAsBigInteger();
 
     /**
-     * Converts this value into a 32-bit float
+     * Represent this value as a 32-bit float value, which may involve rounding or truncation of the original value.
      */
-    float toFloat();
+    float castAsFloat();
 
     /**
-     * Converts this value into a 64-bit double
+     * Represent this value as a 64-bit double value, which may involve rounding or truncation of the original value.
      */
-    double toDouble();
+    double castAsDouble();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/Variable.java b/msgpack-core/src/main/java/org/msgpack/value/Variable.java
@@ -303,39 +303,39 @@ public NumberValue asNumberValue() {
         }
 
         @Override
-        public byte toByte() {
+        public byte castAsByte() {
             if (type == Type.BIG_INTEGER) {
                 return ((BigInteger) objectValue).byteValue();
             }
             return (byte) longValue;
         }
 
         @Override
-        public short toShort() {
+        public short castAsShort() {
             if (type == Type.BIG_INTEGER) {
                 return ((BigInteger) objectValue).shortValue();
             }
             return (short) longValue;
         }
 
         @Override
-        public int toInt() {
+        public int castAsInt() {
             if (type == Type.BIG_INTEGER) {
                 return ((BigInteger) objectValue).intValue();
             }
             return (int) longValue;
         }
 
         @Override
-        public long toLong() {
+        public long castAsLong() {
             if (type == Type.BIG_INTEGER) {
                 return ((BigInteger) objectValue).longValue();
             }
             return (long) longValue;
         }
 
         @Override
-        public BigInteger toBigInteger() {
+        public BigInteger castAsBigInteger() {
             if (type == Type.BIG_INTEGER) {
                 return (BigInteger) objectValue;
             }
@@ -346,7 +346,7 @@ else if (type == Type.DOUBLE) {
         }
 
         @Override
-        public float toFloat() {
+        public float castAsFloat() {
             if (type == Type.BIG_INTEGER) {
                 return ((BigInteger) objectValue).floatValue();
             }
@@ -357,7 +357,7 @@ else if (type == Type.DOUBLE) {
         }
 
         @Override
-        public double toDouble() {
+        public double castAsDouble() {
             if (type == Type.BIG_INTEGER) {
                 return ((BigInteger) objectValue).doubleValue();
             }
@@ -504,14 +504,14 @@ public Variable setFloatValue(double v) {
         this.type = Type.DOUBLE;
         this.accessor = floatAccessor;
         this.doubleValue = v;
-        this.longValue = (long) v;  // AbstractNumberValueAccessor uses toLong
+        this.longValue = (long) v;  // AbstractNumberValueAccessor uses castAsLong
         return this;
     }
 
     public Variable setFloatValue(float v) {
         this.type = Type.DOUBLE;
         this.accessor = floatAccessor;
-        this.longValue = (long) v;  // AbstractNumberValueAccessor uses toLong
+        this.longValue = (long) v;  // AbstractNumberValueAccessor uses castAsLong
         return 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
@@ -65,37 +65,37 @@ public ImmutableIntegerValue asIntegerValue() {
     }
 
     @Override
-    public byte toByte() {
+    public byte castAsByte() {
         return value.byteValue();
     }
 
     @Override
-    public short toShort() {
+    public short castAsShort() {
         return value.shortValue();
     }
 
     @Override
-    public int toInt() {
+    public int castAsInt() {
         return value.intValue();
     }
 
     @Override
-    public long toLong() {
+    public long castAsLong() {
         return value.longValue();
     }
 
     @Override
-    public BigInteger toBigInteger() {
+    public BigInteger castAsBigInteger() {
         return value;
     }
 
     @Override
-    public float toFloat() {
+    public float castAsFloat() {
         return value.floatValue();
     }
 
     @Override
-    public double toDouble() {
+    public double castAsDouble() {
         return value.doubleValue();
     }
 
@@ -175,7 +175,7 @@ public boolean equals(Object o) {
             return false;
         }
         IntegerValue iv = v.asIntegerValue();
-        return value.equals(iv.toBigInteger());
+        return value.equals(iv.castAsBigInteger());
     }
 
     @Override

diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableDoubleValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableDoubleValueImpl.java
@@ -48,37 +48,37 @@ public ImmutableDoubleValueImpl immutableValue() {
     }
 
     @Override
-    public byte toByte() {
+    public byte castAsByte() {
         return (byte) value;
     }
 
     @Override
-    public short toShort() {
+    public short castAsShort() {
         return (short) value;
     }
 
     @Override
-    public int toInt() {
+    public int castAsInt() {
         return (int) value;
     }
 
     @Override
-    public long toLong() {
+    public long castAsLong() {
         return (long) value;
     }
 
     @Override
-    public BigInteger toBigInteger() {
+    public BigInteger castAsBigInteger() {
         return new BigDecimal(value).toBigInteger();
     }
 
     @Override
-    public float toFloat() {
+    public float castAsFloat() {
         return (float) value;
     }
 
     @Override
-    public double toDouble() {
+    public double castAsDouble() {
         return value;
     }
 
@@ -100,7 +100,7 @@ public boolean equals(Object o) {
         if(!v.isFloatValue()) {
             return false;
         }
-        return value == v.asFloatValue().toDouble();
+        return value == v.asFloatValue().castAsDouble();
     }
 
     @Override

diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableLongValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableLongValueImpl.java
@@ -63,37 +63,37 @@ public ImmutableIntegerValue asIntegerValue() {
     }
 
     @Override
-    public byte toByte() {
+    public byte castAsByte() {
         return (byte) value;
     }
 
     @Override
-    public short toShort() {
+    public short castAsShort() {
         return (short) value;
     }
 
     @Override
-    public int toInt() {
+    public int castAsInt() {
         return (int) value;
     }
 
     @Override
-    public long toLong() {
+    public long castAsLong() {
         return value;
     }
 
     @Override
-    public BigInteger toBigInteger() {
+    public BigInteger castAsBigInteger() {
         return BigInteger.valueOf(value);
     }
 
     @Override
-    public float toFloat() {
+    public float castAsFloat() {
         return (float) value;
     }
 
     @Override
-    public double toDouble() {
+    public double castAsDouble() {
         return (double) value;
     }
 
@@ -173,7 +173,7 @@ public boolean equals(Object o) {
         if (!iv.isInLongRange()) {
             return false;
         }
-        return value == iv.toLong();
+        return value == iv.castAsLong();
     }
 
     @Override

diff --git a/msgpack-core/src/test/java/org/msgpack/core/example/MessagePackExample.java b/msgpack-core/src/test/java/org/msgpack/core/example/MessagePackExample.java
@@ -184,22 +184,22 @@ public static void readAndWriteFile() throws IOException {
                 case INTEGER:
                     IntegerValue iv = v.asIntegerValue();
                     if(iv.isInIntRange()) {
-                        int i = iv.toInt();
+                        int i = iv.castAsInt();
                         System.out.println("read int: " + i);
                     }
                     else if (iv.isInLongRange()) {
-                        long l = iv.toLong();
+                        long l = iv.castAsLong();
                         System.out.println("read long: " + l);
                     }
                     else {
-                        BigInteger i = iv.toBigInteger();
+                        BigInteger i = iv.castAsBigInteger();
                         System.out.println("read long: " + i);
                     }
                     break;
                 case FLOAT:
                     FloatValue fv = v.asFloatValue();
-                    float f = fv.toFloat();   // use as float
-                    double d = fv.toDouble(); // use as double
+                    float f = fv.castAsFloat();   // use as float
+                    double d = fv.castAsDouble(); // use as double
                     System.out.println("read float: " + d);
                     break;
                 case STRING: