Remove public scope from interface

msgpack · xerial · Jun 19, 2015 · Jun 13, 2015 · Jun 13, 2015 · Jun 13, 2015
commit 301ae108cbff746f6f63d6bb0303882b261a4c74
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ArrayValue.java b/msgpack-core/src/main/java/org/msgpack/value/ArrayValue.java
@@ -24,13 +24,11 @@
  * MessagePack's Array type can represent sequence of values.
  */
 public interface ArrayValue extends Value, Iterable<Value> {
-    @Override
-    public ImmutableArrayValue toImmutable();
 
     /**
      * Returns number of elements in this array.
      */
-    public int size();
+    int size();
 
     /**
      * Returns the element at the specified position in this array.
@@ -39,21 +37,21 @@ public interface ArrayValue extends Value, Iterable<Value> {
      *         If the index is out of range
      *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
      */
-    public Value get(int index);
+    Value get(int index);
 
     /**
      * Returns the element at the specified position in this array.
      * This method returns an ImmutableNilValue if the index is out of range.
      */
-    public Value getOrNilValue(int index);
+    Value getOrNilValue(int index);
 
     /**
      * Returns an iterator over elements.
      */
-    public Iterator<Value> iterator();
+    Iterator<Value> iterator();
 
     /**
      * Returns the value as {@code List}.
      */
-    public List<Value> list();
+    List<Value> list();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/BinaryValue.java b/msgpack-core/src/main/java/org/msgpack/value/BinaryValue.java
@@ -23,6 +23,4 @@
  * @see  org.msgpack.value.RawValue
  */
 public interface BinaryValue extends RawValue {
-    @Override
-    public ImmutableBinaryValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/BooleanValue.java b/msgpack-core/src/main/java/org/msgpack/value/BooleanValue.java
@@ -21,11 +21,8 @@
  * MessagePack's Boolean type can represent {@code true} or {@code false}.
  */
 public interface BooleanValue extends Value {
-    @Override
-    public ImmutableBooleanValue toImmutable();
-
     /**
      * Returns the value as a {@code boolean}.
      */
-    public boolean getBoolean();
+    boolean getBoolean();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ExtensionValue.java b/msgpack-core/src/main/java/org/msgpack/value/ExtensionValue.java
@@ -24,10 +24,7 @@
  * As the type information, applications can use 0 to 127 as the application-specific types. -1 to -128 is reserved for MessagePack's future extension.
  */
 public interface ExtensionValue extends Value {
-    @Override
-    public ImmutableExtensionValue toImmutable();
+    byte getType();
 
-    public byte getType();
-
-    public byte[] getData();
+    byte[] getData();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/FloatValue.java b/msgpack-core/src/main/java/org/msgpack/value/FloatValue.java
@@ -23,6 +23,4 @@
  * @see  org.msgpack.value.NumberValue
  */
 public interface FloatValue extends NumberValue {
-    @Override
-    public ImmutableFloatValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ImmutableArrayValue.java b/msgpack-core/src/main/java/org/msgpack/value/ImmutableArrayValue.java
@@ -24,11 +24,11 @@ public interface ImmutableArrayValue extends ArrayValue, ImmutableValue {
      * Returns an iterator over elements.
      * Returned Iterator does not support {@code remove()} method since the value is immutable.
      */
-    public Iterator<Value> iterator();
+    Iterator<Value> iterator();
 
     /**
      * Returns the value as {@code List}.
      * Returned List is immutable. It does not support {@code put()}, {@code clear()}, or other methods that modify the value.
      */
-    public List<Value> list();
+    List<Value> list();
 }
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,70 +16,68 @@
 package org.msgpack.value;
 
 import java.math.BigInteger;
+import org.msgpack.core.MessageOverflowException;
 
 /**
  * The interface {@code IntegerValue} represents MessagePack's Integer type.
  *
  * MessagePack's Integer type can represent from -2<sup>63</sup> to 2<sup>64</sup>-1.
  */
 public interface IntegerValue extends NumberValue {
-    @Override
-    public ImmutableIntegerValue toImmutable();
-
     /**
      * Returns true if the value is in the range of [-2<sup>7</sup> to 2<sup>7</sup>-1].
      */
-    public boolean isInByteRange();
+    boolean isInByteRange();
 
     /**
      * Returns true if the value is in the range of [-2<sup>15</sup> to 2<sup>15</sup>-1]
      */
-    public boolean isInShortRange();
+    boolean isInShortRange();
 
     /**
      * Returns true if the value is in the range of [-2<sup>31</sup> to 2<sup>31</sup>-1]
      */
-    public boolean isInIntRange();
+    boolean isInIntRange();
 
     /**
      * Returns true if the value is in the range of [-2<sup>63</sup> to 2<sup>63</sup>-1]
      */
-    public boolean isInLongRange();
+    boolean isInLongRange();
 
     /**
      * Returns the value as a {@code byte}, otherwise throws an exception.
      *
-     * @throws  MessageIntegerOverflowException
+     * @throws  MessageOverflowException
      *          If the value does not fit in the range of {@code byte} type.
      */
-    public byte getByte();
+    byte getByte();
 
     /**
      * Returns the value as a {@code short}, otherwise throws an exception.
      *
-     * @throws  MessageIntegerOverflowException
+     * @throws  MessageOverflowException
      *          If the value does not fit in the range of {@code short} type.
      */
-    public short getShort();
+    short getShort();
 
     /**
      * Returns the value as an {@code int}, otherwise throws an exception.
      *
-     * @throws  MessageIntegerOverflowException
+     * @throws  MessageOverflowException
      *          If the value does not fit in the range of {@code int} type.
      */
-    public int getInt();
+    int getInt();
 
     /**
      * Returns the value as a {@code long}, otherwise throws an exception.
      *
-     * @throws  MessageIntegerOverflowException
+     * @throws  MessageOverflowException
      *          If the value does not fit in the range of {@code long} type.
      */
-    public long getLong();
+    long getLong();
 
     /**
      * Returns the value as a {@code BigInteger}.
      */
-    public BigInteger getBigInteger();
+    BigInteger getBigInteger();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/MapValue.java b/msgpack-core/src/main/java/org/msgpack/value/MapValue.java
@@ -25,24 +25,21 @@
  * MessagePack's Map type can represent sequence of key-value pairs.
  */
 public interface MapValue extends Value {
-    @Override
-    public ImmutableMapValue toImmutable();
-
     /**
      * Returns number of key-value pairs in this array.
      */
-    public int size();
+    int size();
 
-    public Set<Value> keySet();
+    Set<Value> keySet();
 
-    public Set<Map.Entry<Value, Value>> entrySet();
+    Set<Map.Entry<Value, Value>> entrySet();
 
-    public Collection<Value> values();
+    Collection<Value> values();
 
     /**
      * Returns the value as {@code Map}.
      */
-    public Map<Value, Value> map();
+    Map<Value, Value> map();
 
     /**
      * Returns the key-value pairs as an array of {@code Value}.
@@ -51,5 +48,5 @@ public interface MapValue extends Value {
      *
      * For example, if this value represents <code>{"k1": "v1", "k2": "v2"}</code>, this method returns ["k1", "v1", "k2", "v2"].
      */
-    public Value[] getKeyValueArray();
+    Value[] getKeyValueArray();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/NilValue.java b/msgpack-core/src/main/java/org/msgpack/value/NilValue.java
@@ -19,6 +19,4 @@
  * The interface {@code NilValue} represents MessagePack's Nil type.
  */
 public interface NilValue extends Value {
-    @Override
-    public ImmutableNilValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/RawValue.java b/msgpack-core/src/main/java/org/msgpack/value/RawValue.java
@@ -16,6 +16,7 @@
 package org.msgpack.value;
 
 import java.nio.ByteBuffer;
+import org.msgpack.core.MessageStringCodingException;
 
 /**
  * The interface {@code RawValue} represents MessagePack's Raw type, which means Binary or String type.
@@ -26,23 +27,20 @@
  * @see  org.msgpack.value.BinaryValue
  */
 public interface RawValue extends Value {
-    @Override
-    public ImmutableRawValue toImmutable();
-
     /**
      * Returns the value as {@code byte[]}.
      *
      * This method copies the byte array.
      */
-    public byte[] getByteArray();
+    byte[] getByteArray();
 
     /**
      * Returns the value as {@code ByteBuffer}.
      *
      * Returned ByteBuffer is read-only. See {@code#asReadOnlyBuffer()}.
      * This method doesn't copy the byte array as much as possible.
      */
-    public ByteBuffer getByteBuffer();
+    ByteBuffer getByteBuffer();
 
     /**
      * Returns the value as {@code String}.
@@ -52,12 +50,12 @@ public interface RawValue extends Value {
      * @throws  MessageStringCodingException
      *          If this value includes invalid UTF-8 byte sequence.
      */
-    public String getString();
+    String getString();
 
     /**
      * Returns the value as {@code String}.
      *
      * This method replaces an invalid UTF-8 byte sequence with <code>U+FFFD replacement character</code>.
      */
-    public String stringValue();
+    String stringValue();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/StringValue.java b/msgpack-core/src/main/java/org/msgpack/value/StringValue.java
@@ -25,6 +25,4 @@
  * @see  org.msgpack.value.RawValue
  */
 public interface StringValue extends RawValue {
-    @Override
-    public ImmutableStringValue toImmutable();
 }