Bugfix #15: proper checking for index and size for arrays

Author: cardil

src/main/java/pl/wavesoftware/eid/exceptions/EidIllegalArgumentException.java

@@ -205,12 +205,4 @@ public EidIllegalArgumentException(Eid id, @Nullable Throwable cause) {
         super(id, cause);
     }
 
-    /**
-     * @return {@link IllegalArgumentException} class
-     */
-    @Override
-    public Class<? extends RuntimeException> getJavaClass() {
-        return IllegalArgumentException.class;
-    }
-
 }

src/main/java/pl/wavesoftware/eid/exceptions/EidIllegalStateException.java

@@ -219,12 +219,4 @@ public EidIllegalStateException(Eid id, @Nullable Throwable cause) {
         super(id, cause);
     }
 
-    /**
-     * @return {@link IllegalStateException} class
-     */
-    @Override
-    public Class<? extends RuntimeException> getJavaClass() {
-        return IllegalStateException.class;
-    }
-
 }

src/main/java/pl/wavesoftware/eid/exceptions/EidIndexOutOfBoundsException.java

@@ -222,13 +222,4 @@ public EidIndexOutOfBoundsException(
         super(id, cause);
     }
 
-
-    /**
-     * @return {@link IndexOutOfBoundsException} class
-     */
-    @Override
-    public Class<? extends RuntimeException> getJavaClass() {
-        return IndexOutOfBoundsException.class;
-    }
-
 }

src/main/java/pl/wavesoftware/eid/exceptions/EidNullPointerException.java

@@ -94,11 +94,7 @@ public EidNullPointerException(EidMessage message) {
      *                {@link #getCause()} method).  (A <tt>null</tt> value is
      *                permitted, and indicates that the cause is nonexistent or
      */
-    public EidNullPointerException(
-        CharSequence eid,
-        String message,
-        @Nullable Throwable cause
-    ) {
+    public EidNullPointerException(CharSequence eid, String message, @Nullable Throwable cause) {
         super(eid, message, cause);
     }
 
@@ -117,10 +113,7 @@ public EidNullPointerException(
      *                {@link #getCause()} method).  (A <tt>null</tt> value is
      *                permitted, and indicates that the cause is nonexistent or
      */
-    public EidNullPointerException(
-        EidMessage message,
-        @Nullable Throwable cause
-    ) {
+    public EidNullPointerException(EidMessage message, @Nullable Throwable cause) {
         super(message, cause);
     }
 
@@ -140,10 +133,7 @@ public EidNullPointerException(
      *              {@link #getCause()} method).  (A <tt>null</tt> value is
      *              permitted, and indicates that the cause is nonexistent or
      */
-    public EidNullPointerException(
-        CharSequence eid,
-        @Nullable Throwable cause
-    ) {
+    public EidNullPointerException(CharSequence eid, @Nullable Throwable cause) {
         super(eid, cause);
     }
 
@@ -191,11 +181,7 @@ public EidNullPointerException(Eid id, String message) {
      *                {@link #getCause()} method).  (A <tt>null</tt> value is
      *                permitted, and indicates that the cause is nonexistent or
      */
-    public EidNullPointerException(
-        Eid id,
-        String message,
-        @Nullable Throwable cause
-    ) {
+    public EidNullPointerException(Eid id, String message, @Nullable Throwable cause) {
         super(id, message, cause);
     }
 
@@ -215,19 +201,8 @@ public EidNullPointerException(
      *              {@link #getCause()} method).  (A <tt>null</tt> value is
      *              permitted, and indicates that the cause is nonexistent or
      */
-    public EidNullPointerException(
-        Eid id,
-        @Nullable Throwable cause
-    ) {
+    public EidNullPointerException(Eid id, @Nullable Throwable cause) {
         super(id, cause);
     }
 
-    /**
-     * @return {@link NullPointerException} class
-     */
-    @Override
-    public Class<? extends RuntimeException> getJavaClass() {
-        return NullPointerException.class;
-    }
-
 }

src/main/java/pl/wavesoftware/eid/exceptions/EidRuntimeException.java

@@ -75,10 +75,7 @@ public EidRuntimeException(CharSequence eid) {
      * @param message the detail message. The detail message is saved for
      *                later retrieval by the {@link #getMessage()} method.
      */
-    public EidRuntimeException(
-        CharSequence eid,
-        String message
-    ) {
+    public EidRuntimeException(CharSequence eid, String message) {
         this(new Eid(eid), message);
     }
 
@@ -91,9 +88,7 @@ public EidRuntimeException(
      * @param message the Eid message. The detail message is saved for
      *                later retrieval by the {@link #getMessage()} method.
      */
-    public EidRuntimeException(
-        EidMessage message
-    ) {
+    public EidRuntimeException(EidMessage message) {
         super(message.toString());
         this.eid = message.getEid();
     }
@@ -115,11 +110,7 @@ public EidRuntimeException(
      *                permitted, and indicates that the cause is nonexistent or
      *                unknown.)
      */
-    public EidRuntimeException(
-        CharSequence eid,
-        String message,
-        @Nullable Throwable cause
-    ) {
+    public EidRuntimeException(CharSequence eid, String message, @Nullable Throwable cause) {
         this(new Eid(eid), message, cause);
     }
 
@@ -139,10 +130,7 @@ public EidRuntimeException(
      *                permitted, and indicates that the cause is nonexistent or
      *                unknown.)
      */
-    public EidRuntimeException(
-        EidMessage message,
-        @Nullable Throwable cause
-    ) {
+    public EidRuntimeException(EidMessage message, @Nullable Throwable cause) {
         this(message.getEid(), message.toString(), cause);
     }
 
@@ -163,10 +151,7 @@ public EidRuntimeException(
      *              permitted, and indicates that the cause is nonexistent or
      *              unknown.)
      */
-    public EidRuntimeException(
-        CharSequence eid,
-        @Nullable Throwable cause
-    ) {
+    public EidRuntimeException(CharSequence eid, @Nullable Throwable cause) {
         this(new Eid(eid), cause);
     }
 
@@ -195,10 +180,7 @@ public EidRuntimeException(Eid id) {
      * @param message the detail message. The detail message is saved for
      *                later retrieval by the {@link #getMessage()} method.
      */
-    public EidRuntimeException(
-        Eid id,
-        String message
-    ) {
+    public EidRuntimeException(Eid id, String message) {
         super(id.message(message).toString());
         this.eid = id;
     }
@@ -220,11 +202,7 @@ public EidRuntimeException(
      *                permitted, and indicates that the cause is nonexistent or
      *                unknown.)
      */
-    public EidRuntimeException(
-        Eid id,
-        String message,
-        @Nullable Throwable cause
-    ) {
+    public EidRuntimeException(Eid id, String message, @Nullable Throwable cause) {
         super(id.message(message).toString(), cause);
         this.eid = id;
     }
@@ -246,10 +224,7 @@ public EidRuntimeException(
      *              permitted, and indicates that the cause is nonexistent or
      *              unknown.)
      */
-    public EidRuntimeException(
-        Eid id,
-        @Nullable Throwable cause
-    ) {
+    public EidRuntimeException(Eid id, @Nullable Throwable cause) {
         super(messageOf(id, cause), cause);
         eid = id;
     }
@@ -259,17 +234,6 @@ public Eid getEid() {
         return eid;
     }
 
-    /**
-     * Returns a standard JDK class that this ones is base on. It doesn't mean
-     * this class do extends that class, but it might.
-     *
-     * @return a standard JDK class of exception, in this case
-     * {@link RuntimeException} class.
-     */
-    public Class<? extends RuntimeException> getJavaClass() {
-        return RuntimeException.class;
-    }
-
     private static String messageOf(Eid eid, @Nullable Throwable cause) {
         if (cause != null) {
             return eid.message(messageOf(cause)).toString();

src/main/java/pl/wavesoftware/eid/impl/BindingImpl.java

@@ -54,6 +54,6 @@ public EidMessage createEidMessage(
 
     @Override
     public <T extends Serializable> SerializableSupplier<T> lazy(Supplier<T> supplier) {
-        return SerializableLazy.of(supplier);
+        return SerializableLazy.serializableOf(supplier);
     }
 }

src/main/java/pl/wavesoftware/eid/impl/EidTextRepresentation.java

@@ -40,7 +40,7 @@ final class EidTextRepresentation implements EidContainer, Serializable {
     ) {
         this.eid = eid;
         this.textMessage = textMessage;
-        this.actual = SerializableLazy.of(new Supplier<String>() {
+        this.actual = SerializableLazy.serializableOf(new Supplier<String>() {
             @Override
             public String get() {
                 return configuration.getFormatter()

src/main/java/pl/wavesoftware/eid/impl/SerializableLazy.java

@@ -35,7 +35,7 @@ private SerializableLazy(Supplier<T> supplier) {
         super(supplier);
     }
 
-    static <R extends Serializable> SerializableLazy<R> of(Supplier<R> supplier) {
+    static <R extends Serializable> SerializableLazy<R> serializableOf(Supplier<R> supplier) {
         return new SerializableLazy<R>(supplier);
     }
 

src/main/java/pl/wavesoftware/eid/impl/TextMessage.java

@@ -34,7 +34,7 @@ final class TextMessage implements Serializable {
         CharSequence messageFormat,
         Object[] arguments
     ) {
-        message = SerializableLazy.of(new MessageSupplier(
+        message = SerializableLazy.serializableOf(new MessageSupplier(
             configuration, messageFormat, arguments
         ));
     }

src/main/java/pl/wavesoftware/eid/utils/EidPreconditions.java

@@ -541,7 +541,7 @@ public static int checkElementIndex(
     }
 
     private static boolean isIndexAndSizeIllegal(int index, int size) {
-        return index < 0 || index > size;
+        return index < 0 || index >= size;
     }
 
     private static boolean isSizeIllegal(int size) {