You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gg...@apache.org on 2023/11/29 12:10:17 UTC
(juneau) branch master updated: Use Collection#isEmpty (Java 6 API)
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/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 79e5f2132 Use Collection#isEmpty (Java 6 API)
79e5f2132 is described below
commit 79e5f2132dd2d93f56e845eef6a821be78e3171a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Nov 29 07:10:11 2023 -0500
Use Collection#isEmpty (Java 6 API)
---
.../juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java | 2 +-
.../juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java | 4 ++--
.../src/main/java/org/apache/juneau/collections/Args.java | 4 ++--
.../src/main/java/org/apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestContext.java | 2 +-
.../src/test/java/org/apache/juneau/config/ConfigImportsTest.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index f8b7e4fbd..4bf3804df 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -4182,7 +4182,7 @@ public class BeanContext extends Context {
for (ObjectSwap f : swapArray)
if (f.getNormalClass().isParentOf(c))
l.add(f);
- return l.size() == 0 ? null : l.toArray(new ObjectSwap[l.size()]);
+ return l.isEmpty() ? null : l.toArray(new ObjectSwap[l.size()]);
}
return null;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 3ae8e5cd6..f62bbc306 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -432,7 +432,7 @@ public class BeanMeta<T> {
}
// Make sure at least one property was found.
- if (beanFilter == null && ctx.isBeansRequireSomeProperties() && normalProps.size() == 0)
+ if (beanFilter == null && ctx.isBeansRequireSomeProperties() && normalProps.isEmpty())
return "No properties detected on bean class";
sortProperties = (ctx.isSortProperties() || (beanFilter != null && beanFilter.isSortProperties())) && fixedBeanProps.isEmpty();
@@ -675,7 +675,7 @@ public class BeanMeta<T> {
MethodType methodType = UNKNOWN;
String bpName = bpName(lp, ln);
- if (pt.size() == 0) {
+ if (pt.isEmpty()) {
if ("*".equals(bpName)) {
if (rt.isChildOf(Collection.class)) {
methodType = EXTRAKEYS;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
index d577b3f51..b72ff31a8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
@@ -222,7 +222,7 @@ public final class Args extends JsonMap {
*/
public String getArg(String name) {
JsonList l = (JsonList)get(name);
- if (l == null || l.size() == 0)
+ if (l == null || l.isEmpty())
return null;
if (l.size() == 1)
return l.get(0).toString();
@@ -249,7 +249,7 @@ public final class Args extends JsonMap {
*/
public <T> T getArg(Class<T> c, String name) {
JsonList l = (JsonList)get(name);
- if (l == null || l.size() == 0)
+ if (l == null || l.isEmpty())
return null;
return l.get(0, c);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 83e5563ad..c0af8138c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -877,7 +877,7 @@ public class HtmlSerializerSession extends XmlSerializerSession {
@SuppressWarnings({ "rawtypes", "unchecked" })
private Object[] getTableHeaders(Collection c, HtmlBeanPropertyMeta bpHtml) throws SerializeException {
- if (c.size() == 0)
+ if (c.isEmpty())
return null;
c = sort(c);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
index edfa71ec6..e0e9d0f0c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
@@ -214,7 +214,7 @@ public class HtmlStrippedDocSerializerSession extends HtmlSerializerSession {
protected void doSerialize(SerializerPipe out, Object o) throws IOException, SerializeException {
try (HtmlWriter w = getHtmlWriter(out)) {
if (o == null
- || (o instanceof Collection && ((Collection<?>)o).size() == 0)
+ || (o instanceof Collection && ((Collection<?>)o).isEmpty())
|| (o.getClass().isArray() && Array.getLength(o) == 0))
w.sTag(1, "p").append("No Results").eTag("p").nl(1);
else
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index b41c6782e..950bb8524 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -3668,7 +3668,7 @@ public class RestContext extends Context {
AnnotationList al = mi.getAnnotationList(REST_OP_GROUP);
// Also include methods on @Rest-annotated interfaces.
- if (al.size() == 0) {
+ if (al.isEmpty()) {
Predicate<MethodInfo> isRestAnnotatedInterface = x -> x.getDeclaringClass().isInterface() && x.getDeclaringClass().getAnnotation(Rest.class) != null;
mi.forEachMatching(isRestAnnotatedInterface, x -> al.add(AnnotationInfo.of(x, RestOpAnnotation.DEFAULT)));
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
index f6c95d2b3..4465ae7a6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
@@ -173,7 +173,7 @@ public class ConfigImportsTest {
}
public String getNewValue(String section, String key) {
- if (events.size() == 0)
+ if (events.isEmpty())
return null;
for (ConfigEvent ce : events)
if (eq(section, ce.getSection()) && eq(key, ce.getKey()))