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 a511a163b Normalize parameter names
a511a163b is described below
commit a511a163b579fdaafa81fb6ca908034d32291871
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun May 4 14:06:03 2025 -0400
Normalize parameter names
---
src/main/java/org/apache/commons/lang3/Streams.java | 6 +++---
src/test/java/org/apache/commons/lang3/FunctionsTest.java | 6 +++---
src/test/java/org/apache/commons/lang3/StreamsTest.java | 10 +++++-----
.../apache/commons/lang3/builder/DefaultToStringStyleTest.java | 4 ++--
.../commons/lang3/builder/MultiLineToStringStyleTest.java | 4 ++--
.../commons/lang3/builder/NoFieldNamesToStringStyleTest.java | 4 ++--
.../commons/lang3/builder/RecursiveToStringStyleTest.java | 6 +++---
.../commons/lang3/builder/ShortPrefixToStringStyleTest.java | 4 ++--
.../commons/lang3/builder/StandardToStringStyleTest.java | 4 ++--
.../apache/commons/lang3/function/FailableFunctionsTest.java | 6 +++---
.../java/org/apache/commons/lang3/function/ObjectsTest.java | 8 ++++----
src/test/java/org/apache/commons/lang3/stream/StreamsTest.java | 10 +++++-----
12 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/Streams.java
b/src/main/java/org/apache/commons/lang3/Streams.java
index fdb1798cc..3c3fedc17 100644
--- a/src/main/java/org/apache/commons/lang3/Streams.java
+++ b/src/main/java/org/apache/commons/lang3/Streams.java
@@ -540,13 +540,13 @@ public static <O> FailableStream<O> stream(final
Stream<O> stream) {
* Returns a {@link Collector} that accumulates the input elements into a
* new array.
*
- * @param pElementType Type of an element in the array.
+ * @param elementType Type of an element in the array.
* @param <O> the type of the input elements
* @return a {@link Collector} which collects all the input elements into
an
* array, in encounter order
*/
- public static <O> Collector<O, ?, O[]> toArray(final Class<O>
pElementType) {
- return new ArrayCollector<>(pElementType);
+ public static <O> Collector<O, ?, O[]> toArray(final Class<O> elementType)
{
+ return new ArrayCollector<>(elementType);
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/FunctionsTest.java
b/src/test/java/org/apache/commons/lang3/FunctionsTest.java
index e6a81fcd8..532e27308 100644
--- a/src/test/java/org/apache/commons/lang3/FunctionsTest.java
+++ b/src/test/java/org/apache/commons/lang3/FunctionsTest.java
@@ -68,9 +68,9 @@ public void reset() {
closed = false;
}
- public void run(final Throwable pTh) throws Throwable {
- if (pTh != null) {
- throw pTh;
+ public void run(final Throwable throwable) throws Throwable {
+ if (throwable != null) {
+ throw throwable;
}
}
}
diff --git a/src/test/java/org/apache/commons/lang3/StreamsTest.java
b/src/test/java/org/apache/commons/lang3/StreamsTest.java
index f12163cb6..632f0603c 100644
--- a/src/test/java/org/apache/commons/lang3/StreamsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StreamsTest.java
@@ -45,19 +45,19 @@
@Deprecated
public class StreamsTest extends AbstractLangTest {
- protected <T extends Throwable> FailableConsumer<String, T>
asIntConsumer(final T pThrowable) {
+ protected <T extends Throwable> FailableConsumer<String, T>
asIntConsumer(final T throwable) {
return s -> {
final int i = Integer.parseInt(s);
if (i == 4) {
- throw pThrowable;
+ throw throwable;
}
};
}
- protected <T extends Throwable> FailablePredicate<Integer, T>
asIntPredicate(final T pThrowable) {
+ protected <T extends Throwable> FailablePredicate<Integer, T>
asIntPredicate(final T phrowable) {
return i -> {
- if (i.intValue() == 5 && pThrowable != null) {
- throw pThrowable;
+ if (i.intValue() == 5 && phrowable != null) {
+ throw phrowable;
}
return i % 2 == 0;
};
diff --git
a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
b/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
index 4de5c3a57..5e70daa2b 100644
---
a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
+++
b/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
@@ -147,8 +147,8 @@ public void testPerson() {
p.name = "John Doe";
p.age = 33;
p.smoker = false;
- final String pBaseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
- assertEquals(pBaseStr + "[name=John Doe,age=33,smoker=false]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
+ final String baseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
+ assertEquals(baseStr + "[name=John Doe,age=33,smoker=false]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
}
}
diff --git
a/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
b/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
index 87416ea42..46c812635 100644
---
a/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
+++
b/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
@@ -147,8 +147,8 @@ public void testPerson() {
p.name = "Jane Doe";
p.age = 25;
p.smoker = true;
- final String pBaseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
- assertEquals(pBaseStr + "[" + System.lineSeparator() + " name=Jane
Doe" + System.lineSeparator() + " age=25" + System.lineSeparator() + "
smoker=true" + System.lineSeparator() + "]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
+ final String baseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
+ assertEquals(baseStr + "[" + System.lineSeparator() + " name=Jane
Doe" + System.lineSeparator() + " age=25" + System.lineSeparator() + "
smoker=true" + System.lineSeparator() + "]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
}
}
diff --git
a/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
b/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
index 787e6c138..9f480d0c1 100644
---
a/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
+++
b/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
@@ -147,8 +147,8 @@ public void testPerson() {
p.name = "Ron Paul";
p.age = 72;
p.smoker = false;
- final String pBaseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
- assertEquals(pBaseStr + "[Ron Paul,72,false]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
+ final String baseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
+ assertEquals(baseStr + "[Ron Paul,72,false]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
}
}
diff --git
a/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
b/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
index 319e5f0bb..78834493c 100644
---
a/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
+++
b/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
@@ -154,9 +154,9 @@ public void testPerson() {
p.smoker = false;
p.job = new Job();
p.job.title = "Manager";
- final String pBaseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
- final String pJobStr = p.job.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p.job));
- assertEquals(pBaseStr + "[age=33,job=" + pJobStr +
"[title=Manager],name=John Doe,smoker=false]",
+ final String baseStr = p.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p));
+ final String jobStr = p.job.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(p.job));
+ assertEquals(baseStr + "[age=33,job=" + jobStr +
"[title=Manager],name=John Doe,smoker=false]",
new ReflectionToStringBuilder(p, new
RecursiveToStringStyle()).toString());
}
diff --git
a/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
b/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
index b8e3b1703..f74092933 100644
---
a/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
+++
b/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
@@ -147,8 +147,8 @@ public void testPerson() {
p.name = "John Q. Public";
p.age = 45;
p.smoker = true;
- final String pBaseStr = "ToStringStyleTest.Person";
- assertEquals(pBaseStr + "[name=John Q. Public,age=45,smoker=true]",
new ToStringBuilder(p).append("name", p.name).append("age",
p.age).append("smoker", p.smoker).toString());
+ final String baseStr = "ToStringStyleTest.Person";
+ assertEquals(baseStr + "[name=John Q. Public,age=45,smoker=true]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
}
}
diff --git
a/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
b/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
index e4ba31202..5e04bdbbb 100644
---
a/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
+++
b/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
@@ -224,7 +224,7 @@ public void testPerson() {
p.name = "Suzy Queue";
p.age = 19;
p.smoker = false;
- final String pBaseStr = "ToStringStyleTest.Person";
- assertEquals(pBaseStr + "[name=Suzy Queue,age=19,smoker=false]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
+ final String baseStr = "ToStringStyleTest.Person";
+ assertEquals(baseStr + "[name=Suzy Queue,age=19,smoker=false]", new
ToStringBuilder(p).append("name", p.name).append("age", p.age).append("smoker",
p.smoker).toString());
}
}
diff --git
a/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java
b/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java
index e38178145..e9bfd9896 100644
--- a/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java
+++ b/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java
@@ -62,9 +62,9 @@ public void reset() {
closed = false;
}
- public void run(final Throwable pTh) throws Throwable {
- if (pTh != null) {
- throw pTh;
+ public void run(final Throwable throwable) throws Throwable {
+ if (throwable != null) {
+ throw throwable;
}
}
}
diff --git a/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
b/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
index 19e623431..af9667566 100644
--- a/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
+++ b/src/test/java/org/apache/commons/lang3/function/ObjectsTest.java
@@ -34,8 +34,8 @@ public static class TestableFailableSupplier<O, E extends
Exception> implements
private final FailableSupplier<O, E> supplier;
private boolean invoked;
- TestableFailableSupplier(final FailableSupplier<O, E> pSupplier) {
- this.supplier = pSupplier;
+ TestableFailableSupplier(final FailableSupplier<O, E> supplier) {
+ this.supplier = supplier;
}
@Override
@@ -53,8 +53,8 @@ public static class TestableSupplier<O> implements
Supplier<O> {
private final Supplier<O> supplier;
private boolean invoked;
- TestableSupplier(final Supplier<O> pSupplier) {
- this.supplier = pSupplier;
+ TestableSupplier(final Supplier<O> supplier) {
+ this.supplier = supplier;
}
@Override
diff --git a/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
b/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
index 5ee16b32b..d06822451 100644
--- a/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
+++ b/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
@@ -47,19 +47,19 @@
*/
public class StreamsTest extends AbstractLangTest {
- protected <T extends Throwable> FailableConsumer<String, T>
asIntConsumer(final T pThrowable) {
+ protected <T extends Throwable> FailableConsumer<String, T>
asIntConsumer(final T throwable) {
return s -> {
final int i = Integer.parseInt(s);
if (i == 4) {
- throw pThrowable;
+ throw throwable;
}
};
}
- protected <T extends Throwable> FailablePredicate<Integer, T>
asIntPredicate(final T pThrowable) {
+ protected <T extends Throwable> FailablePredicate<Integer, T>
asIntPredicate(final T throwable) {
return i -> {
- if (i.intValue() == 5 && pThrowable != null) {
- throw pThrowable;
+ if (i.intValue() == 5 && throwable != null) {
+ throw throwable;
}
return i % 2 == 0;
};
