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

cardil · cardil · commit 67c1ca637b6d · 2018-12-03T22:28:48.000+01:00
diff --git a/src/main/java/pl/wavesoftware/eid/exceptions/EidIllegalArgumentException.java b/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;
-    }
-
 }
diff --git a/src/main/java/pl/wavesoftware/eid/exceptions/EidIllegalStateException.java b/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;
-    }
-
 }
diff --git a/src/main/java/pl/wavesoftware/eid/exceptions/EidIndexOutOfBoundsException.java b/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;
-    }
-
 }
diff --git a/src/main/java/pl/wavesoftware/eid/exceptions/EidNullPointerException.java b/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;
-    }
-
 }
diff --git a/src/main/java/pl/wavesoftware/eid/exceptions/EidRuntimeException.java b/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();
diff --git a/src/main/java/pl/wavesoftware/eid/impl/BindingImpl.java b/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);
     }
 }
diff --git a/src/main/java/pl/wavesoftware/eid/impl/EidTextRepresentation.java b/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()
diff --git a/src/main/java/pl/wavesoftware/eid/impl/SerializableLazy.java b/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);
     }
 
diff --git a/src/main/java/pl/wavesoftware/eid/impl/TextMessage.java b/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
         ));
     }
diff --git a/src/main/java/pl/wavesoftware/eid/utils/EidPreconditions.java b/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) {
diff --git a/src/test/java/pl/wavesoftware/eid/exceptions/EidIndexOutOfBoundsExceptionTest.java b/src/test/java/pl/wavesoftware/eid/exceptions/EidIndexOutOfBoundsExceptionTest.java
@@ -27,7 +27,6 @@
 import pl.wavesoftware.eid.configuration.Configurator;
 import pl.wavesoftware.eid.configuration.UniqueIdGenerator;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
 
@@ -66,21 +65,6 @@ public void after() {
         Eid.getBinding().getConfigurationSystem().configure(original);
     }
 
-    @Test
-    public void testGetStandardJdkClass() {
-        // given
-        @SuppressWarnings("ThrowableInstanceNeverThrown")
-        EidIndexOutOfBoundsException ex = new EidIndexOutOfBoundsException(
-            new Eid("20151119:103152")
-        );
-
-        // when
-        Class<? extends RuntimeException> cls = ex.getJavaClass();
-
-        // then
-        assertThat(cls).isEqualTo(IndexOutOfBoundsException.class);
-    }
-
     @Test
     public void testEidIndexOutOfBoundsException_String_String_Throwable() {
         // given
diff --git a/src/test/java/pl/wavesoftware/eid/exceptions/EidNullPointerExceptionTest.java b/src/test/java/pl/wavesoftware/eid/exceptions/EidNullPointerExceptionTest.java
@@ -22,12 +22,11 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import pl.wavesoftware.eid.configuration.Configurator;
 import pl.wavesoftware.eid.Eid;
 import pl.wavesoftware.eid.configuration.ConfigurationBuilder;
+import pl.wavesoftware.eid.configuration.Configurator;
 import pl.wavesoftware.eid.configuration.UniqueIdGenerator;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
 
@@ -66,19 +65,6 @@ public void after() {
         Eid.getBinding().getConfigurationSystem().configure(original);
     }
 
-    @Test
-    public void testGetStandardJdkClass() {
-        // given
-        @SuppressWarnings("ThrowableInstanceNeverThrown")
-        EidNullPointerException ex = new EidNullPointerException(new Eid("20151119:102323"));
-
-        // when
-        Class<? extends RuntimeException> cls = ex.getJavaClass();
-
-        // then
-        assertThat(cls).isEqualTo(NullPointerException.class);
-    }
-
     @Test
     public void testEidNullPointerException_String_String_Throwable() {
         // given
diff --git a/src/test/java/pl/wavesoftware/eid/exceptions/ExceptionsTest.java b/src/test/java/pl/wavesoftware/eid/exceptions/ExceptionsTest.java
@@ -148,22 +148,6 @@ public ExceptionsTest(String classSimpleName, String argsClasses, Class<? extend
         this.arguments = arguments;
     }
 
-    @Test
-    public void testGetStandardJdkClass() {
-        // given
-        EidRuntimeException exception = construct();
-
-        // when
-        Eid eid = exception.getEid();
-        Class<? extends RuntimeException> jdkCls = exception.getJavaClass();
-
-        // then
-        assertThat(exception).isNotNull();
-        assertThat(eid).isNotNull();
-        assertThat(jdkCls).isNotNull();
-        assertThat(jdkCls).isEqualTo(jdkClass);
-    }
-
     @Test
     public void testMessage() {
         // given
diff --git a/src/test/java/pl/wavesoftware/eid/impl/BindingImplTest.java b/src/test/java/pl/wavesoftware/eid/impl/BindingImplTest.java
diff --git a/src/test/java/pl/wavesoftware/eid/impl/LazyProvider.java b/src/test/java/pl/wavesoftware/eid/impl/LazyProvider.java
diff --git a/src/test/java/pl/wavesoftware/eid/utils/EidPreconditionsTest.java b/src/test/java/pl/wavesoftware/eid/utils/EidPreconditionsTest.java

Original file line number	Diff line number	Diff line change
`@@ -205,12 +205,4 @@ public EidIllegalArgumentException(Eid id, @Nullable Throwable cause) {`
`205`	`205`	`super(id, cause);`
`206`	`206`	`}`
`207`	`207`
`208`		`- /**`
`209`		`- * @return {@link IllegalArgumentException} class`
`210`		`- */`
`211`		`- @Override`
`212`		`- public Class<? extends RuntimeException> getJavaClass() {`
`213`		`- return IllegalArgumentException.class;`
`214`		`- }`
`215`		`-`
`216`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,12 +219,4 @@ public EidIllegalStateException(Eid id, @Nullable Throwable cause) {`
`219`	`219`	`super(id, cause);`
`220`	`220`	`}`
`221`	`221`
`222`		`- /**`
`223`		`- * @return {@link IllegalStateException} class`
`224`		`- */`
`225`		`- @Override`
`226`		`- public Class<? extends RuntimeException> getJavaClass() {`
`227`		`- return IllegalStateException.class;`
`228`		`- }`
`229`		`-`
`230`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,13 +222,4 @@ public EidIndexOutOfBoundsException(`
`222`	`222`	`super(id, cause);`
`223`	`223`	`}`
`224`	`224`
`225`		`-`
`226`		`- /**`
`227`		`- * @return {@link IndexOutOfBoundsException} class`
`228`		`- */`
`229`		`- @Override`
`230`		`- public Class<? extends RuntimeException> getJavaClass() {`
`231`		`- return IndexOutOfBoundsException.class;`
`232`		`- }`
`233`		`-`
`234`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@ public EidMessage createEidMessage(`
`54`	`54`
`55`	`55`	`@Override`
`56`	`56`	`public <T extends Serializable> SerializableSupplier<T> lazy(Supplier<T> supplier) {`
`57`		`- return SerializableLazy.of(supplier);`
	`57`	`+ return SerializableLazy.serializableOf(supplier);`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private SerializableLazy(Supplier<T> supplier) {`
`35`	`35`	`super(supplier);`
`36`	`36`	`}`
`37`	`37`
`38`		`- static <R extends Serializable> SerializableLazy<R> of(Supplier<R> supplier) {`
	`38`	`+ static <R extends Serializable> SerializableLazy<R> serializableOf(Supplier<R> supplier) {`
`39`	`39`	`return new SerializableLazy<R>(supplier);`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class TextMessage implements Serializable {`
`34`	`34`	`CharSequence messageFormat,`
`35`	`35`	`Object[] arguments`
`36`	`36`	`) {`
`37`		`- message = SerializableLazy.of(new MessageSupplier(`
	`37`	`+ message = SerializableLazy.serializableOf(new MessageSupplier(`
`38`	`38`	`configuration, messageFormat, arguments`
`39`	`39`	`));`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ public static int checkElementIndex(`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`private static boolean isIndexAndSizeIllegal(int index, int size) {`
`544`		`- return index < 0 \|\| index > size;`
	`544`	`+ return index < 0 \|\| index >= size;`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`private static boolean isSizeIllegal(int size) {`