This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new e4dec4d467 Adopt Shorts helpers (h/eq/o) reactor-wide (TODO-241)
e4dec4d467 is described below
commit e4dec4d4676b3748c55862759cd61097da5f4186
Author: James Bognar <[email protected]>
AuthorDate: Tue Jul 14 13:53:52 2026 -0400
Adopt Shorts helpers (h/eq/o) reactor-wide (TODO-241)
Replace verbose JDK forms (Objects.hash, Objects.equals,
Optional.ofNullable)
with the equivalent Shorts shortcuts across 13 files (main + test), 15 call
sites; drop now-dead imports left behind by the substitutions.
SerializerSession.defaultEquals and the Object-typed
AssertionPredicates.eq/ne
overloads are intentionally left un-migrated — their Object-typed args risk
silently swapping identity-based JDK array equality for Shorts.eq's
deep-content array equality. No applicable Optional.empty()->oe() sites
exist
reactor-wide.
Co-authored-by: Cursor <[email protected]>
---
.../java/org/apache/juneau/commons/function/Suppliers.java | 3 ++-
.../main/java/org/apache/juneau/marshall/sse/SseEvent.java | 4 +---
.../apache/juneau/marshall/stream/RecordStream_Test.java | 13 +++++++------
.../apache/juneau/test/assertions/AssertionPredicates.java | 4 ++--
.../java/org/apache/juneau/test/bct/NestedTokenizer.java | 2 +-
.../org/apache/juneau/http/classic/BasicStatusLine.java | 2 +-
.../java/org/apache/juneau/http/classic/part/BasicPart.java | 2 +-
.../java/org/apache/juneau/http/header/HttpHeaderBean.java | 2 +-
.../main/java/org/apache/juneau/http/part/HttpPartBean.java | 3 +--
.../apache/juneau/http/remote/RrpcInterfaceMethodMeta.java | 2 +-
.../org/apache/juneau/http/request/HttpRequestLineBean.java | 4 +---
.../org/apache/juneau/http/response/HttpStatusLineBean.java | 4 +---
.../apache/juneau/rest/server/httppart/RequestHttpPart.java | 2 +-
13 files changed, 21 insertions(+), 26 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Suppliers.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Suppliers.java
index 0b6544f911..99066f6f22 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Suppliers.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Suppliers.java
@@ -17,6 +17,7 @@
package org.apache.juneau.commons.function;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
+import static org.apache.juneau.commons.utils.Shorts.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -41,7 +42,7 @@ public class Suppliers {
return () -> {
var h = cache.get();
if (h == null) {
- h = Optional.ofNullable(supplier.get());
+ h = o(supplier.get());
if (! cache.compareAndSet(null, h)) h =
cache.get();
}
return h.orElse(null);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/sse/SseEvent.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/sse/SseEvent.java
index 694bb33b74..cbf006257e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/sse/SseEvent.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/sse/SseEvent.java
@@ -18,8 +18,6 @@ package org.apache.juneau.marshall.sse;
import static org.apache.juneau.commons.utils.Shorts.*;
-import java.util.*;
-
import org.apache.juneau.commons.bean.*;
/**
@@ -185,7 +183,7 @@ public class SseEvent {
@Override /* Overridden from Object */
public int hashCode() {
- return Objects.hash(event, data, id, retry);
+ return h(event, data, id, retry);
}
@Override /* Overridden from Object */
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/stream/RecordStream_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/stream/RecordStream_Test.java
index 73c90d019f..239ae40b26 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/stream/RecordStream_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/stream/RecordStream_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.marshall.stream;
+import static org.apache.juneau.commons.utils.Shorts.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.*;
@@ -167,8 +168,8 @@ class RecordStream_Test extends TestBase {
public int age;
public Flat() {}
public Flat(String name, int age) { this.name = name; this.age
= age; }
- @Override public boolean equals(Object o) { return o instanceof
Flat f && Objects.equals(name, f.name) && age == f.age; }
- @Override public int hashCode() { return Objects.hash(name,
age); }
+ @Override public boolean equals(Object o) { return o instanceof
Flat f && eq(name, f.name) && age == f.age; }
+ @Override public int hashCode() { return h(name, age); }
}
public static class Nested {
@@ -176,8 +177,8 @@ class RecordStream_Test extends TestBase {
public Flat inner;
public Nested() {}
public Nested(String label, Flat inner) { this.label = label;
this.inner = inner; }
- @Override public boolean equals(Object o) { return o instanceof
Nested n && Objects.equals(label, n.label) && Objects.equals(inner, n.inner); }
- @Override public int hashCode() { return Objects.hash(label,
inner); }
+ @Override public boolean equals(Object o) { return o instanceof
Nested n && eq(label, n.label) && eq(inner, n.inner); }
+ @Override public int hashCode() { return h(label, inner); }
}
public static class WithCollections {
@@ -208,8 +209,8 @@ class RecordStream_Test extends TestBase {
public Node child;
public Node() {}
public Node(String id, Node child) { this.id = id; this.child =
child; }
- @Override public boolean equals(Object o) { return o instanceof
Node n && Objects.equals(id, n.id) && Objects.equals(child, n.child); }
- @Override public int hashCode() { return Objects.hash(id,
child); }
+ @Override public boolean equals(Object o) { return o instanceof
Node n && eq(id, n.id) && eq(child, n.child); }
+ @Override public int hashCode() { return h(id, child); }
}
/** Builds a {@link Node} chain {@code depth} levels deep,
null-terminated. */
diff --git
a/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/assertions/AssertionPredicates.java
b/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/assertions/AssertionPredicates.java
index 4e8c4a8d1f..5c871d3a71 100644
---
a/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/assertions/AssertionPredicates.java
@@ -145,7 +145,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> eq(String value) {
- return test(x -> Objects.equals(s(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
+ return test(x -> Shorts.eq(s(x), value),
MSG_valueDidNotMatchExpected, value, VALUE); // NOAI
}
/**
@@ -232,7 +232,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> ne(String value) {
- return test(x -> ! Objects.equals(s(x), value),
MSG_valueUnexpectedlyMatched, VALUE);
+ return test(x -> neq(s(x), value),
MSG_valueUnexpectedlyMatched, VALUE);
}
/**
diff --git
a/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/bct/NestedTokenizer.java
b/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/bct/NestedTokenizer.java
index a7e5951aa2..0aa971999e 100644
---
a/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/bct/NestedTokenizer.java
+++
b/juneau-core/juneau-test/src/main/java/org/apache/juneau/test/bct/NestedTokenizer.java
@@ -119,7 +119,7 @@ class NestedTokenizer {
@Override
public int hashCode() {
- return Objects.hash(value, nested);
+ return h(value, nested);
}
/**
diff --git
a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/BasicStatusLine.java
b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/BasicStatusLine.java
index a3a3302c7a..26fd18c432 100644
---
a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/BasicStatusLine.java
+++
b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/BasicStatusLine.java
@@ -213,7 +213,7 @@ public class BasicStatusLine implements StatusLine {
@Override
public int hashCode() {
- return Objects.hash(protocolVersion, statusCode, reasonPhrase,
locale);
+ return h(protocolVersion, statusCode, reasonPhrase, locale);
}
/**
diff --git
a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/BasicPart.java
b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/BasicPart.java
index bb304d70b7..f270aa7906 100644
---
a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/BasicPart.java
+++
b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/BasicPart.java
@@ -189,7 +189,7 @@ public class BasicPart implements NameValuePair, Headerable
{
@Override
public int hashCode() {
- return Objects.hash(name, getValue());
+ return h(name, getValue());
}
@Override /* Overridden from Object */
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpHeaderBean.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpHeaderBean.java
index ad78c70ecb..b666c989b2 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpHeaderBean.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpHeaderBean.java
@@ -140,6 +140,6 @@ public class HttpHeaderBean implements HttpHeader {
@Override /* Object */
public int hashCode() {
- return Objects.hash(name.toLowerCase(Locale.ROOT), getValue());
+ return h(name.toLowerCase(Locale.ROOT), getValue());
}
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/HttpPartBean.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/HttpPartBean.java
index 7c2db481c0..d2c7a61e37 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/HttpPartBean.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/HttpPartBean.java
@@ -19,7 +19,6 @@ package org.apache.juneau.http.part;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Shorts.*;
-import java.util.*;
import java.util.function.*;
import org.apache.juneau.http.*;
@@ -130,6 +129,6 @@ public class HttpPartBean implements HttpPart {
@Override /* Object */
public int hashCode() {
- return Objects.hash(name, getValue());
+ return h(name, getValue());
}
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
index f8ea2c026b..714b5c8fe6 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMethodMeta.java
@@ -105,7 +105,7 @@ public final class RrpcInterfaceMethodMeta {
@Override
public int hashCode() {
- return Objects.hash(Arrays.hashCode(interceptors),
timeout, retries, retryNonIdempotent, throwOnError);
+ return h(Arrays.hashCode(interceptors), timeout,
retries, retryNonIdempotent, throwOnError);
}
@Override
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/request/HttpRequestLineBean.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/request/HttpRequestLineBean.java
index 5ae2095a81..e0b5272832 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/request/HttpRequestLineBean.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/request/HttpRequestLineBean.java
@@ -19,8 +19,6 @@ package org.apache.juneau.http.request;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Shorts.*;
-import java.util.*;
-
import org.apache.juneau.http.*;
/**
@@ -125,6 +123,6 @@ public final class HttpRequestLineBean implements
HttpRequestLine {
@Override /* Object */
public int hashCode() {
- return Objects.hash(method, uri, protocolVersion);
+ return h(method, uri, protocolVersion);
}
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpStatusLineBean.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpStatusLineBean.java
index 451cb678cd..02baf6f7b8 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpStatusLineBean.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/HttpStatusLineBean.java
@@ -19,8 +19,6 @@ package org.apache.juneau.http.response;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Shorts.*;
-import java.util.*;
-
import org.apache.juneau.http.*;
/**
@@ -131,6 +129,6 @@ public final class HttpStatusLineBean implements
HttpStatusLine {
@Override /* Object */
public int hashCode() {
- return Objects.hash(protocolVersion, statusCode, reasonPhrase);
+ return h(protocolVersion, statusCode, reasonPhrase);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/httppart/RequestHttpPart.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/httppart/RequestHttpPart.java
index c7b6e8be07..5adb833e82 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/httppart/RequestHttpPart.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/httppart/RequestHttpPart.java
@@ -528,7 +528,7 @@ public class RequestHttpPart {
@Override
public int hashCode() {
- return Objects.hash(getName(), getValue());
+ return h(getName(), getValue());
}
@Override /* Overridden from Object */
