This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 1436c5941 Remove unused test class
1436c5941 is described below
commit 1436c59419fb80257e064d554e678d88698532ae
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Jan 21 10:43:11 2026 +0000
Remove unused test class
Remove test dependency on com.google.code.findbugs:jsr305:3.0.2
---
pom.xml | 6 -
.../org/apache/commons/lang3/function/Objects.java | 164 ---------------------
.../apache/commons/lang3/function/ObjectsTest.java | 141 ------------------
3 files changed, 311 deletions(-)
diff --git a/pom.xml b/pom.xml
index 220887658..528192c15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,12 +96,6 @@
<version>${commons.jmh.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<distributionManagement>
<site>
diff --git a/src/test/java/org/apache/commons/lang3/function/Objects.java
b/src/test/java/org/apache/commons/lang3/function/Objects.java
deleted file mode 100644
index fcc53c90f..000000000
--- a/src/test/java/org/apache/commons/lang3/function/Objects.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.lang3.function;
-
-import java.util.function.Supplier;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.ObjectUtils;
-
-/**
- * This class provides some replacements for the corresponding methods in
- * {@link java.util.Objects}. The replacements have the advantage, that they
are properly
- * annotated with {@link Nullable}, and/or {@link Nonnull}, so they let the
- * compiler know what their respective results are.
- *
- * The various {@code requireNonNull} methods are particularly handy, when
- * dealing with external code, that a) doesn't support the {@link Nonnull}
- * annotation, or if you know for other reasons, that an object is non-null.
- * Take for example, a {@link java.util.Map map}, that you have filled with
- * non-null values. So, in your opinion, the following should be perfectly
- * valid code:
- * <pre>
- * final Map<String,Object> map = getMapOfNonNullValues();
- * final @Nonnull Object o = map.get("SomeKey");
- * </pre>
- * However, if your Java compiler *does* null analysis, it will reject this
- * example as invalid, because {@link java.util.Map#get(Object)} might return
- * a null value. As a workaround, you can use this:
- * <pre>
- * import static org.apache.commons.lang3.function.Objects.requireNonNull;
- *
- * final Map<String,Object> map = getMapOfNonNullValues();
- * final @Nonnull Object o = requireNonNull(map.get("SomeKey"));
- * </pre>
- *
- * This class is somewhat redundant with regards to {@link ObjectUtils}.
- * For example, {@link #requireNonNull(Object, Object)} is almost equivalent
- * with {@link ObjectUtils#getIfNull(Object, Object)}. However, it isn't
- * quite the same, because the latter can, in fact, return null. The former
- * can't, and the Java compiler confirms this.(An alternative to redundancy
- * would have been to change the {@code ObjectUtils} class. However, that
- * would mean loosing upwards compatibility, and we don't do that.)
- *
- * @since 3.12.0
- */
-public class Objects {
-
- /**
- * Checks, whether the given object is non-null. If so, returns the
non-null
- * object as a result value. Otherwise, a NullPointerException is thrown.
- * @param <T> The type of parameter {@code value}, also the result type.
- * @param value The value, which is being checked.
- * @return The given input value, if it was found to be non-null.
- * @throws NullPointerException The input value was null.
- * @see java.util.Objects#requireNonNull(Object)
- */
- public static <T> @Nonnull T requireNonNull(@Nullable final T value)
throws NullPointerException {
- return requireNonNull(value, "The value must not be null.");
- }
-
- /**
- * Checks, whether the given object is non-null. If so, returns the
non-null
- * object as a result value. Otherwise, invokes the given {@link Supplier},
- * and returns the suppliers result value.
- * @param <T> The type of parameter {@code value}, also the result type of
- * the default value supplier, and of the method itself.
- * @param <E> The type of exception, that the {@code default value
supplier},
- * may throw.
- * @param value The value, which is being checked.
- * @param defaultValueSupplier The supplier, which returns the default
value. This default
- * value <em>must</em> be non-null. The supplier will only be invoked, if
- * necessary. (If the {@code value} parameter is null, that is.)
- * @return The given input value, if it was found to be non-null.
Otherwise,
- * the value, that has been returned by the default value supplier.
- * @see #requireNonNull(Object)
- * @see #requireNonNull(Object, String)
- * @see #requireNonNull(Object, Supplier)
- * @throws NullPointerException The default value supplier is null, or the
default
- * value supplier has returned null.
- */
- public static <T, E extends Throwable> @Nonnull T requireNonNull(@Nullable
final T value, @Nonnull final FailableSupplier<T, E> defaultValueSupplier)
throws NullPointerException {
- if (value == null) {
- final FailableSupplier<T, ?> supplier =
requireNonNull(defaultValueSupplier, "The supplier must not be null");
- final T defaultValue;
- try {
- defaultValue = supplier.get();
- } catch (final Throwable t) {
- throw Failable.rethrow(t);
- }
- return requireNonNull(defaultValue, "The supplier must not return
null.");
- }
- return value;
- }
-
- /**
- * Checks, whether the given object is non-null. If so, returns the
non-null
- * object as a result value. Otherwise, a NullPointerException is thrown.
- * @param <T> The type of parameter {@code value}, also the result type.
- * @param value The value, which is being checked.
- * @param msg A string, which is being used as the exceptions message, if
the
- * check fails.
- * @return The given input value, if it was found to be non-null.
- * @throws NullPointerException The input value was null.
- * @see java.util.Objects#requireNonNull(Object, String)
- * @see #requireNonNull(Object, Supplier)
- */
- public static <T> @Nonnull T requireNonNull(@Nullable final T value,
@Nonnull final String msg) throws NullPointerException {
- if (value == null) {
- throw new NullPointerException(msg);
- }
- return value;
- }
-
- /**
- * Checks, whether the given object is non-null. If so, returns the
non-null
- * object as a result value. Otherwise, a NullPointerException is thrown.
- * @param <T> The type of parameter {@code value}, also the result type.
- * @param value The value, which is being checked.
- * @param msgSupplier A supplier, which creates the exception message, if
the check fails.
- * This supplier will only be invoked, if necessary.
- * @return The given input value, if it was found to be non-null.
- * @throws NullPointerException The input value was null.
- * @see java.util.Objects#requireNonNull(Object, String)
- * @see #requireNonNull(Object, String)
- */
- public static <T> @Nonnull T requireNonNull(@Nullable final T value,
@Nonnull final Supplier<String> msgSupplier) throws NullPointerException {
- if (value == null) {
- throw new NullPointerException(msgSupplier.get());
- }
- return value;
- }
-
- /**
- * Checks, whether the given object is non-null. If so, returns the
non-null
- * object as a result value. Otherwise, a NullPointerException is thrown.
- * @param <T> The type of parameter {@code value}, also the result type.
- * @param value The value, which is being checked.
- * @param defaultValue The default value, which is being returned, if the
- * check fails, and the {@code value} is null.
- * @throws NullPointerException The input value, and the default value are
null.
- * @return The given input value, if it was found to be non-null.
- * @see java.util.Objects#requireNonNull(Object)
- */
- public static <T> @Nonnull T requireNonNull(@Nullable final T value,
@Nonnull final T defaultValue) throws NullPointerException {
- return value == null ? requireNonNull(defaultValue) : value;
- }
-}
diff --git a/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
b/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
deleted file mode 100644
index 52db6d3e2..000000000
--- a/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.lang3.function;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.util.function.Supplier;
-
-import org.apache.commons.lang3.AbstractLangTest;
-import org.junit.jupiter.api.Test;
-
-class ObjectsTest extends AbstractLangTest {
-
- public static class TestableFailableSupplier<O, E extends Exception>
implements FailableSupplier<O, E> {
- private final FailableSupplier<O, E> supplier;
- private boolean invoked;
-
- TestableFailableSupplier(final FailableSupplier<O, E> supplier) {
- this.supplier = supplier;
- }
-
- @Override
- public O get() throws E {
- invoked = true;
- return supplier.get();
- }
-
- public boolean isInvoked() {
- return invoked;
- }
- }
-
- public static class TestableSupplier<O> implements Supplier<O> {
- private final Supplier<O> supplier;
- private boolean invoked;
-
- TestableSupplier(final Supplier<O> supplier) {
- this.supplier = supplier;
- }
-
- @Override
- public O get() {
- invoked = true;
- return supplier.get();
- }
-
- public boolean isInvoked() {
- return invoked;
- }
- }
-
- @Test
- void testRequireNonNullObject() {
- assertSame("foo", Objects.requireNonNull("foo"));
- try {
- Objects.requireNonNull(null);
- fail("Expected Exception");
- } catch (final NullPointerException e) {
- assertEquals("The value must not be null.", e.getMessage());
- }
- }
-
- @Test
- void testRequireNonNullObjectFailableSupplierString() {
- final TestableFailableSupplier<String, ?> supplier = new
TestableFailableSupplier<>(FailableSupplier.nul());
- assertSame("foo", Objects.requireNonNull("foo", supplier));
- assertFalse(supplier.isInvoked());
- try {
- Objects.requireNonNull(null, supplier);
- fail("Expected Exception");
- } catch (final NullPointerException e) {
- assertEquals("The supplier must not return null.", e.getMessage());
- assertTrue(supplier.isInvoked());
- }
- final TestableFailableSupplier<String, ?> supplier2 = new
TestableFailableSupplier<>(FailableSupplier.nul());
- try {
- Objects.requireNonNull(null, supplier2);
- fail("Expected Exception");
- } catch (final NullPointerException e) {
- assertEquals("The supplier must not return null.", e.getMessage());
- assertTrue(supplier2.isInvoked());
- }
- final TestableFailableSupplier<String, ?> supplier3 = new
TestableFailableSupplier<>(() -> "bar");
- assertSame("bar", Objects.requireNonNull(null, supplier3));
- final RuntimeException rte = new RuntimeException();
- final TestableFailableSupplier<String, ?> supplier4 = new
TestableFailableSupplier<>(() -> {
- throw rte;
- });
- try {
- Objects.requireNonNull(null, supplier4);
- fail("Expected Exception");
- } catch (final RuntimeException e) {
- assertSame(rte, e);
- assertTrue(supplier4.isInvoked());
- }
- }
-
- @Test
- void testRequireNonNullObjectString() {
- assertSame("foo", Objects.requireNonNull("foo", "bar"));
- try {
- Objects.requireNonNull(null, "bar");
- fail("Expected Exception");
- } catch (final NullPointerException e) {
- assertEquals("bar", e.getMessage());
- }
- }
-
- @Test
- void testRequireNonNullObjectSupplierString() {
- final TestableSupplier<String> supplier = new TestableSupplier<>(() ->
"bar");
- assertSame("foo", Objects.requireNonNull("foo", supplier));
- assertFalse(supplier.isInvoked());
- try {
- Objects.requireNonNull(null, supplier);
- fail("Expected Exception");
- } catch (final NullPointerException e) {
- assertEquals("bar", e.getMessage());
- assertTrue(supplier.isInvoked());
- }
- }
-}
