gh-194: Fix imports and change usages of requireNonNullOrElseGet to r…

…equireNonNullElse.
gchq · Feb 7, 2022 · 38b3957 · 38b3957
1 parent 5463b94
commit 38b3957
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 28 deletions.
diff --git a/core/src/main/java/uk/gov/gchq/koryphe/impl/function/If.java b/core/src/main/java/uk/gov/gchq/koryphe/impl/function/If.java
@@ -27,10 +27,10 @@
 import uk.gov.gchq.koryphe.tuple.predicate.IntegerTupleAdaptedPredicate;
 import uk.gov.gchq.koryphe.tuple.predicate.TupleAdaptedPredicate;
 
-import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import static java.util.Objects.requireNonNullElse;
 import static uk.gov.gchq.koryphe.util.Util.arr;
 
 /**
@@ -82,7 +82,7 @@ public class If<I, O> extends KorypheFunction<I, O> {
      */
     @Override
     public O apply(final I input) {
-        if (Objects.requireNonNullElseGet(condition, () -> null != predicate && predicate.test(input))) {
+        if (requireNonNullElse(condition, null != predicate && predicate.test(input))) {
             if (null != then) {
                 return then.apply(input);
             }

diff --git a/core/src/main/java/uk/gov/gchq/koryphe/impl/function/StringAppend.java b/core/src/main/java/uk/gov/gchq/koryphe/impl/function/StringAppend.java
@@ -24,7 +24,7 @@
 import uk.gov.gchq.koryphe.Summary;
 import uk.gov.gchq.koryphe.function.KorypheFunction;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNullElse;
 
 /**
  * A {@code StringAppend} is a {@link java.util.function.Function} which takes a input {@link String} and returns the
@@ -61,7 +61,7 @@ public String getSuffix() {
     }
 
     public void setSuffix(final String suffix) {
-        this.suffix = Objects.requireNonNullElse(suffix, StringUtils.EMPTY);
+        this.suffix = requireNonNullElse(suffix, StringUtils.EMPTY);
     }
 
     @Override

diff --git a/core/src/main/java/uk/gov/gchq/koryphe/impl/function/StringPrepend.java b/core/src/main/java/uk/gov/gchq/koryphe/impl/function/StringPrepend.java
@@ -24,7 +24,7 @@
 import uk.gov.gchq.koryphe.Summary;
 import uk.gov.gchq.koryphe.function.KorypheFunction;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNullElse;
 
 /**
  * A {@code StringPrepend} is a {@link java.util.function.Function} which takes a input {@link String} and returns the
@@ -59,7 +59,7 @@ public String getPrefix() {
     }
 
     public void setPrefix(final String prefix) {
-        this.prefix = Objects.requireNonNullElse(prefix, StringUtils.EMPTY);
+        this.prefix = requireNonNullElse(prefix, StringUtils.EMPTY);
     }
 
     @Override

diff --git a/core/src/main/java/uk/gov/gchq/koryphe/impl/predicate/If.java b/core/src/main/java/uk/gov/gchq/koryphe/impl/predicate/If.java
@@ -27,9 +27,10 @@
 import uk.gov.gchq.koryphe.tuple.predicate.IntegerTupleAdaptedPredicate;
 import uk.gov.gchq.koryphe.tuple.predicate.TupleAdaptedPredicate;
 
-import java.util.Objects;
 import java.util.function.Predicate;
 
+import static java.util.Objects.requireNonNullElse;
+
 /**
  * An {@code If} is a {@link Predicate} that conditionally applies one of two predicates to a provided input.
  * <p> Note that the <code>If</code> has both a number of constructors as well as a <code>Builder</code>.
@@ -137,7 +138,7 @@ public If(final Predicate<? super I> predicate, final Predicate<? super I> then,
      */
     @Override
     public boolean test(final I input) {
-        if (Objects.requireNonNullElseGet(condition, () -> null != predicate && predicate.test(input))) {
+        if (requireNonNullElse(condition, null != predicate && predicate.test(input))) {
             return null != then && then.test(input);
         }
 

diff --git a/core/src/main/java/uk/gov/gchq/koryphe/tuple/TupleInputAdapter.java b/core/src/main/java/uk/gov/gchq/koryphe/tuple/TupleInputAdapter.java
@@ -25,7 +25,8 @@
 import uk.gov.gchq.koryphe.function.KorypheFunction;
 
 import java.util.Arrays;
-import java.util.Objects;
+
+import static java.util.Objects.requireNonNullElse;
 
 /**
  * @param <R>  The type of reference used by tuples.
@@ -81,7 +82,7 @@ public R[] getSelection() {
      */
     @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Cloning the array would be expensive - we will have to reply on users not modifying the array")
     public void setSelection(final R[] selection) {
-        this.selection = Objects.requireNonNullElseGet(selection, () -> (R[]) new Object[0]);
+        this.selection = requireNonNullElse(selection, (R[]) new Object[0]);
     }
 
     @Override

diff --git a/core/src/main/java/uk/gov/gchq/koryphe/tuple/TupleOutputAdapter.java b/core/src/main/java/uk/gov/gchq/koryphe/tuple/TupleOutputAdapter.java
@@ -25,9 +25,10 @@
 import uk.gov.gchq.koryphe.Summary;
 
 import java.util.Arrays;
-import java.util.Objects;
 import java.util.function.BiFunction;
 
+import static java.util.Objects.requireNonNullElse;
+
 /**
  * @param <R>  The type of reference used by tuples.
  * @param <FO> The adapted output type.
@@ -81,7 +82,7 @@ public Tuple<R> apply(final Tuple<R> state, final FO output) {
      */
     @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Cloning the array would be expensive - we will have to reply on users not modifying the array")
     public void setProjection(final R[] projection) {
-        this.projection = Objects.requireNonNullElseGet(projection, () -> (R[]) new Object[0]);
+        this.projection = requireNonNullElse(projection, (R[]) new Object[0]);
     }
 
     /**

diff --git a/core/src/main/java/uk/gov/gchq/koryphe/util/IterableUtil.java b/core/src/main/java/uk/gov/gchq/koryphe/util/IterableUtil.java
@@ -24,10 +24,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import static java.util.Objects.requireNonNullElse;
+
 /**
  * An {@code IterableUtil} is a utility class providing capabilities for:
  * <ul>
@@ -348,7 +349,7 @@ private LimitedIterable(final Iterable<T> iterable, final int start, final Integ
                 throw new IllegalArgumentException("The start pointer must be less than the end pointer.");
             }
 
-            this.iterable = Objects.requireNonNullElse(iterable, Collections.emptyList());
+            this.iterable = requireNonNullElse(iterable, Collections.emptyList());
 
             this.start = start;
             this.end = end;
@@ -390,7 +391,7 @@ private LimitedIterator(final Iterator<T> iterator, final int start, final Integ
                 throw new IllegalArgumentException("start should be less than end");
             }
 
-            this.iterator = Objects.requireNonNullElse(iterator, Collections.emptyIterator());
+            this.iterator = requireNonNullElse(iterator, Collections.emptyIterator());
             this.end = end;
             this.truncate = truncate;
 

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/function/FunctionTest.java b/core/src/test/java/uk/gov/gchq/koryphe/function/FunctionTest.java
@@ -20,10 +20,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 
-import uk.gov.gchq.koryphe.util.EqualityTest;
 import uk.gov.gchq.koryphe.Since;
 import uk.gov.gchq.koryphe.Summary;
 import uk.gov.gchq.koryphe.signature.Signature;
+import uk.gov.gchq.koryphe.util.EqualityTest;
 import uk.gov.gchq.koryphe.util.SummaryUtil;
 import uk.gov.gchq.koryphe.util.VersionUtil;
 

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/CastTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/CastTest.java
@@ -37,7 +37,7 @@ public void shouldCast() {
         final Cast function = new Cast(Integer.class);
 
         // When
-        Object output = function.apply(Long.valueOf(5L));
+        Object output = function.apply(5L);
 
         // Then
         assertEquals(Integer.class, output.getClass());

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/StringPrependTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/StringPrependTest.java
@@ -22,7 +22,6 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.function.Function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToBytesTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToBytesTest.java
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
-import java.util.function.Function;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToDateStringTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToDateStringTest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+
 import uk.gov.gchq.koryphe.function.FunctionTest;
 import uk.gov.gchq.koryphe.util.JsonSerialiser;
 
@@ -13,7 +14,8 @@
 import java.util.TimeZone;
 import java.util.function.Function;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 class ToDateStringTest extends FunctionTest<ToDateString> {
 

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToDoubleTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToDoubleTest.java
@@ -17,6 +17,7 @@
 package uk.gov.gchq.koryphe.impl.function;
 
 import org.junit.jupiter.api.Test;
+
 import uk.gov.gchq.koryphe.function.FunctionTest;
 import uk.gov.gchq.koryphe.util.JsonSerialiser;
 
@@ -36,9 +37,7 @@ public void shouldThrowException() {
         final ToDouble function = new ToDouble();
 
         // When
-        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
-            function.apply(true);
-        });
+        Exception exception = assertThrows(IllegalArgumentException.class, () -> function.apply(true));
 
         String expectedMessage = "Could not convert value to Double: ";
         String actualMessage = exception.getMessage();

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToIntegerTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToIntegerTest.java
@@ -34,7 +34,7 @@ public void shouldConvertToInteger() {
         final ToInteger function = new ToInteger();
 
         // When
-        Object output = function.apply(Long.valueOf(5L));
+        Object output = function.apply(5L);
 
         // Then
         assertEquals(5, output);

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToStringTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/function/ToStringTest.java
@@ -15,7 +15,6 @@
  */
 package uk.gov.gchq.koryphe.impl.function;
 
-import org.apache.commons.io.Charsets;
 import org.junit.jupiter.api.Test;
 
 import uk.gov.gchq.koryphe.function.FunctionTest;

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/predicate/IsATest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/predicate/IsATest.java
@@ -23,7 +23,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.function.Predicate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/predicate/StringContainsTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/predicate/StringContainsTest.java
@@ -22,7 +22,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.function.Predicate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/signature/SignatureTest.java b/core/src/test/java/uk/gov/gchq/koryphe/signature/SignatureTest.java
@@ -356,7 +356,7 @@ public void shouldCheckApplyBiFunctionTypes() {
     @Test
     public void shouldCheckApplyBiFunctionTypesForInlineBiFunction() {
         // Given
-        final BiFunction<Long, Double, String> inlineBiFunction = new BiFunction<Long, Double, String>() {
+        final BiFunction<Long, Double, String> inlineBiFunction = new BiFunction<>() {
             @Override
             public String apply(final Long l, final Double d) {
                 return Long.toString(l).concat(Double.toString(d));