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 5dd3a934b Test modernization, clean up utility classes.
5dd3a934b is described below
commit 5dd3a934bf99c5c6f11504c0cdcf4af0d37621e6
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 16:00:40 2025 -0400
Test modernization, clean up utility classes.
---
.../org/apache/juneau/common/internal/StringUtils.java | 16 ++++++++--------
.../java/org/apache/juneau/common/internal/Utils.java | 12 +-----------
.../org/apache/juneau/config/event/ConfigEvent.java | 3 ++-
.../main/java/org/apache/juneau/AnnotationApplier.java | 6 +++---
.../src/main/java/org/apache/juneau/BeanFilter.java | 2 +-
.../src/main/java/org/apache/juneau/BeanRegistry.java | 3 ++-
.../main/java/org/apache/juneau/MarshalledFilter.java | 4 ++--
.../juneau/annotation/ExternalDocsAnnotation.java | 2 +-
.../org/apache/juneau/annotation/SchemaAnnotation.java | 4 ++--
.../apache/juneau/annotation/SubItemsAnnotation.java | 2 +-
.../java/org/apache/juneau/html/HtmlParserSession.java | 6 +++---
.../org/apache/juneau/html/HtmlSerializerSession.java | 4 ++--
.../juneau/http/annotation/FormDataAnnotation.java | 8 ++++----
.../juneau/http/annotation/HeaderAnnotation.java | 8 ++++----
.../apache/juneau/http/annotation/PathAnnotation.java | 8 ++++----
.../apache/juneau/http/annotation/QueryAnnotation.java | 8 ++++----
.../java/org/apache/juneau/json/JsonClassMeta.java | 5 +++--
.../juneau/jsonschema/JsonSchemaGeneratorSession.java | 2 +-
.../java/org/apache/juneau/objecttools/ObjectRest.java | 5 +++--
.../main/java/org/apache/juneau/svl/vars/ArgsVar.java | 5 +++--
.../java/org/apache/juneau/uon/UonParserSession.java | 2 +-
.../org/apache/juneau/microservice/Microservice.java | 2 +-
.../org/apache/juneau/rest/client/RestResponse.java | 1 -
.../juneau/rest/client/remote/RemoteOperationMeta.java | 5 +++--
.../main/java/org/apache/juneau/http/HttpParts.java | 18 ++++++++++--------
.../org/apache/juneau/http/header/BasicHeader.java | 4 ++--
.../org/apache/juneau/http/resource/BasicResource.java | 7 ++++---
.../java/org/apache/juneau/rest/arg/AttributeArg.java | 7 ++++---
.../org/apache/juneau/rest/arg/HasFormDataArg.java | 4 ++--
.../java/org/apache/juneau/rest/arg/HasQueryArg.java | 4 ++--
.../apache/juneau/rest/httppart/RequestContent.java | 4 +++-
.../org/apache/juneau/rest/servlet/RestServlet.java | 3 ++-
.../rest/swagger/BasicSwaggerProviderSession.java | 18 +++++++++---------
.../java/org/apache/juneau/rest/util/UrlPathMatch.java | 4 +++-
34 files changed, 100 insertions(+), 96 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index 044bc15a6..f6c8b6343 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -48,7 +48,7 @@ public final class StringUtils {
/**
* Predicate check to filter out null and empty strings.
*/
- public static final Predicate<String> NOT_EMPTY = Utils::isNotEmpty3;
+ public static final Predicate<String> NOT_EMPTY = Utils::isNotEmpty;
private static final AsciiSet numberChars =
AsciiSet.of("-xX.+-#pP0123456789abcdefABCDEF");
private static final AsciiSet firstNumberChars
=AsciiSet.of("+-.#0123456789");
@@ -1069,7 +1069,7 @@ public final class StringUtils {
*/
public static String trimStart(String s) {
if (s != null)
- while (Utils.isNotEmpty3(s) &&
isWhitespace(s.charAt(0)))
+ while (Utils.isNotEmpty(s) && isWhitespace(s.charAt(0)))
s = s.substring(1);
return s;
}
@@ -1082,7 +1082,7 @@ public final class StringUtils {
*/
public static String trimEnd(String s) {
if (s != null)
- while (Utils.isNotEmpty3(s) &&
isWhitespace(s.charAt(s.length()-1)))
+ while (Utils.isNotEmpty(s) &&
isWhitespace(s.charAt(s.length()-1)))
s = s.substring(0, s.length()-1);
return s;
}
@@ -1118,7 +1118,7 @@ public final class StringUtils {
return s;
while (endsWith(s, '/'))
s = s.substring(0, s.length()-1);
- while (Utils.isNotEmpty3(s) && s.charAt(0) == '/') // NOSONAR
- NPE not possible here.
+ while (Utils.isNotEmpty(s) && s.charAt(0) == '/') // NOSONAR -
NPE not possible here.
s = s.substring(1);
return s;
}
@@ -1132,9 +1132,9 @@ public final class StringUtils {
public static String trimSlashesAndSpaces(String s) {
if (s == null)
return null;
- while (Utils.isNotEmpty3(s) && (s.charAt(s.length()-1) == '/'
|| isWhitespace(s.charAt(s.length()-1))))
+ while (Utils.isNotEmpty(s) && (s.charAt(s.length()-1) == '/' ||
isWhitespace(s.charAt(s.length()-1))))
s = s.substring(0, s.length()-1);
- while (Utils.isNotEmpty3(s) && (s.charAt(0) == '/' ||
isWhitespace(s.charAt(0))))
+ while (Utils.isNotEmpty(s) && (s.charAt(0) == '/' ||
isWhitespace(s.charAt(0))))
s = s.substring(1);
return s;
}
@@ -1162,7 +1162,7 @@ public final class StringUtils {
public static String trimLeadingSlashes(String s) {
if (s == null)
return null;
- while (Utils.isNotEmpty3(s) && s.charAt(0) == '/')
+ while (Utils.isNotEmpty(s) && s.charAt(0) == '/')
s = s.substring(1);
return s;
}
@@ -1554,7 +1554,7 @@ public final class StringUtils {
*/
public static String firstNonEmpty(String...s) {
for (var ss : s)
- if (Utils.isNotEmpty3(ss))
+ if (Utils.isNotEmpty(ss))
return ss;
return null;
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
index 20541765e..eef03cd08 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
@@ -437,7 +437,7 @@ public class Utils {
if (value instanceof Collection<?> x) return ! x.isEmpty();
if (value instanceof Map<?,?> x) return ! x.isEmpty();
if (value.getClass().isArray()) return Array.getLength(value) >
0;
- return Utils.isNotEmpty3(s(value));
+ return isNotEmpty(s(value));
}
/**
@@ -447,16 +447,6 @@ public class Utils {
return ! isEmpty(o);
}
- /**
- * Returns <jk>true</jk> if specified string is not <jk>null</jk> or
empty.
- *
- * @param s The string to check.
- * @return <jk>true</jk> if specified string is not <jk>null</jk> or
empty.
- */
- public static boolean isNotEmpty3(String s) {
- return isNotEmpty(s);
- }
-
/**
* Returns <jk>true</jk> if the specified number is not <jk>null</jk>
and not <c>-1</c>.
*
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
index c93e293da..d47997ab6 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.config.event;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.config.event.ConfigEventType.*;
import java.util.*;
@@ -227,7 +228,7 @@ public class ConfigEvent {
if (val.indexOf('#') != -1)
val = val.replace("#", "\\#");
out.append(val);
- if (Utils.isNotEmpty3(comment))
+ if (isNotEmpty(comment))
out.append(" # ").append(comment);
out.append(')');
yield out.toString();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 648bf1f25..f01ade09e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -167,7 +167,7 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
* @return The array wrapped in an {@link Optional}.
*/
protected Optional<String[]> strings(String[] in) {
- return Utils.opt(in.length == 0 ? null :
Arrays.stream(in).map(vr::resolve).filter(Utils::isNotEmpty3).toArray(String[]::new));
+ return Utils.opt(in.length == 0 ? null :
Arrays.stream(in).map(vr::resolve).filter(Utils::isNotEmpty).toArray(String[]::new));
}
/**
@@ -177,7 +177,7 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> stream(String[] in) {
- return
Arrays.stream(in).map(vr::resolve).filter(Utils::isNotEmpty3);
+ return
Arrays.stream(in).map(vr::resolve).filter(Utils::isNotEmpty);
}
/**
@@ -187,7 +187,7 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> cdl(String in) {
- return
Arrays.stream(Utils.split3(vr.resolve(in))).filter(Utils::isNotEmpty3);
+ return
Arrays.stream(Utils.split3(vr.resolve(in))).filter(Utils::isNotEmpty);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
index 9f44eb210..ce3670ead 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
@@ -109,7 +109,7 @@ public final class BeanFilter {
if (isNotVoid(x.interceptor()))
interceptor(x.interceptor());
if (isNotVoid(x.implClass()))
implClass(x.implClass());
if (isNotEmptyArray(x.dictionary()))
dictionary(x.dictionary());
- if (Utils.isNotEmpty3(x.example()))
example(x.example());
+ if (isNotEmpty(x.example()))
example(x.example());
});
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index e55f1b867..e36c00e58 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import java.lang.reflect.*;
@@ -90,7 +91,7 @@ public class BeanRegistry {
});
} else {
Value<String> typeName = Value.empty();
- ci.forEachAnnotation(beanContext,
Bean.class, x -> Utils.isNotEmpty3(x.typeName()), x ->
typeName.set(x.typeName()));
+ ci.forEachAnnotation(beanContext,
Bean.class, x -> isNotEmpty(x.typeName()), x -> typeName.set(x.typeName()));
addToMap(
typeName.orElseThrow(() -> new
BeanRuntimeException("Class ''{0}'' was passed to BeanRegistry but it doesn't
have a @Bean(typeName) annotation defined.", className(c))),
beanContext.getClassMeta(c)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
index a039b8e1d..0b71fe6b9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
@@ -12,12 +12,12 @@
//
***************************************************************************************************************************
package org.apache.juneau;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.internal.*;
/**
* Parent class for all non-bean filters.
@@ -83,7 +83,7 @@ public final class MarshalledFilter {
annotations.forEach(x -> {
if (isNotVoid(x.implClass()))
implClass(x.implClass());
- if (Utils.isNotEmpty3(x.example()))
+ if (isNotEmpty(x.example()))
example(x.example());
});
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
index cb7a27aac..bb2cff5c6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
@@ -66,7 +66,7 @@ public class ExternalDocsAnnotation {
public static JsonMap merge(JsonMap m, ExternalDocs a) throws
ParseException {
if (ExternalDocsAnnotation.empty(a))
return m;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
return m
.appendIf(ne, "description", joinnl(a.description()))
.appendIf(ne, "url", a.url())
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
index 025e50eb1..6218ec1f5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
@@ -95,7 +95,7 @@ public class SchemaAnnotation {
JsonMap m = new JsonMap();
if (SchemaAnnotation.empty(a))
return m;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
@@ -138,7 +138,7 @@ public class SchemaAnnotation {
private static JsonMap merge(JsonMap m, Items a) throws ParseException {
if (ItemsAnnotation.empty(a))
return m;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
index 469e77e23..ad8b74052 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
@@ -68,7 +68,7 @@ public class SubItemsAnnotation {
public static JsonMap merge(JsonMap om, SubItems a) throws
ParseException {
if (SubItemsAnnotation.empty(a))
return om;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 2764f595f..99772bed5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -476,8 +476,8 @@ public final class HtmlParserSession extends
XmlParserSession {
String name = getElementText(r);
if (beanType != null && beanType.hasAnnotation(HtmlLink.class))
{
Value<String> uriProperty = Value.empty(), nameProperty
= Value.empty();
- beanType.forEachAnnotation(HtmlLink.class, x ->
Utils.isNotEmpty3(x.uriProperty()), x -> uriProperty.set(x.uriProperty()));
- beanType.forEachAnnotation(HtmlLink.class, x ->
Utils.isNotEmpty3(x.nameProperty()), x -> nameProperty.set(x.nameProperty()));
+ beanType.forEachAnnotation(HtmlLink.class, x ->
isNotEmpty(x.uriProperty()), x -> uriProperty.set(x.uriProperty()));
+ beanType.forEachAnnotation(HtmlLink.class, x ->
isNotEmpty(x.nameProperty()), x -> nameProperty.set(x.nameProperty()));
BeanMap<T> m = newBeanMap(beanType.getInnerClass());
m.put(uriProperty.orElse(""), href);
m.put(nameProperty.orElse(""), name);
@@ -812,7 +812,7 @@ public final class HtmlParserSession extends
XmlParserSession {
et = r.next();
if (et == CHARACTERS) {
String s = r.getText();
- if (Utils.isNotEmpty3(s)) {
+ if (isNotEmpty(s)) {
char c =
r.getText().charAt(0);
if (c == '\u2003')
c = '\t';
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 cbfa247ce..3c6d38ded 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
@@ -515,8 +515,8 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
BeanMap m = toBeanMap(o);
if (aType.hasAnnotation(HtmlLink.class)) {
Value<String> uriProperty =
Value.empty(), nameProperty = Value.empty();
- aType.forEachAnnotation(HtmlLink.class,
x -> Utils.isNotEmpty3(x.uriProperty()), x -> uriProperty.set(x.uriProperty()));
- aType.forEachAnnotation(HtmlLink.class,
x -> Utils.isNotEmpty3(x.nameProperty()), x ->
nameProperty.set(x.nameProperty()));
+ aType.forEachAnnotation(HtmlLink.class,
x -> isNotEmpty(x.uriProperty()), x -> uriProperty.set(x.uriProperty()));
+ aType.forEachAnnotation(HtmlLink.class,
x -> isNotEmpty(x.nameProperty()), x -> nameProperty.set(x.nameProperty()));
Object urlProp =
m.get(uriProperty.orElse(""));
Object nameProp =
m.get(nameProperty.orElse(""));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
index fdf95b88b..b698d25da 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
@@ -12,13 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -88,8 +88,8 @@ public class FormDataAnnotation {
*/
public static Value<String> findName(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(FormData.class, x ->
Utils.isNotEmpty3(x.value()), x -> n.set(x.value()));
- pi.forEachAnnotation(FormData.class, x ->
Utils.isNotEmpty3(x.name()), x -> n.set(x.name()));
+ pi.forEachAnnotation(FormData.class, x ->
isNotEmpty(x.value()), x -> n.set(x.value()));
+ pi.forEachAnnotation(FormData.class, x -> isNotEmpty(x.name()),
x -> n.set(x.name()));
return n;
}
@@ -101,7 +101,7 @@ public class FormDataAnnotation {
*/
public static Value<String> findDef(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(FormData.class, x ->
Utils.isNotEmpty3(x.def()), x -> n.set(x.def()));
+ pi.forEachAnnotation(FormData.class, x -> isNotEmpty(x.def()),
x -> n.set(x.def()));
return n;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
index 4b0fec5b6..7624666a5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
@@ -14,12 +14,12 @@ package org.apache.juneau.http.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -89,8 +89,8 @@ public class HeaderAnnotation {
*/
public static Value<String> findName(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(Header.class, x ->
Utils.isNotEmpty3(x.value()), x -> n.set(x.value()));
- pi.forEachAnnotation(Header.class, x ->
Utils.isNotEmpty3(x.name()), x -> n.set(x.name()));
+ pi.forEachAnnotation(Header.class, x -> isNotEmpty(x.value()),
x -> n.set(x.value()));
+ pi.forEachAnnotation(Header.class, x -> isNotEmpty(x.name()), x
-> n.set(x.name()));
return n;
}
@@ -102,7 +102,7 @@ public class HeaderAnnotation {
*/
public static Value<String> findDef(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(Header.class, x ->
Utils.isNotEmpty3(x.def()), x -> n.set(x.def()));
+ pi.forEachAnnotation(Header.class, x -> isNotEmpty(x.def()), x
-> n.set(x.def()));
return n;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
index ead58dc53..fa9f8367c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
@@ -14,12 +14,12 @@ package org.apache.juneau.http.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -89,8 +89,8 @@ public class PathAnnotation {
*/
public static Value<String> findName(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(Path.class, x ->
Utils.isNotEmpty3(x.value()) , x -> n.set(x.value()));
- pi.forEachAnnotation(Path.class, x ->
Utils.isNotEmpty3(x.name()) , x -> n.set(x.name()));
+ pi.forEachAnnotation(Path.class, x -> isNotEmpty(x.value()) , x
-> n.set(x.value()));
+ pi.forEachAnnotation(Path.class, x -> isNotEmpty(x.name()) , x
-> n.set(x.name()));
return n;
}
@@ -102,7 +102,7 @@ public class PathAnnotation {
*/
public static Value<String> findDef(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(Path.class, x ->
Utils.isNotEmpty3(x.def()), x -> n.set(x.def()));
+ pi.forEachAnnotation(Path.class, x -> isNotEmpty(x.def()), x ->
n.set(x.def()));
return n;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
index ab4246f21..8aaa7f399 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
@@ -14,12 +14,12 @@ package org.apache.juneau.http.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -86,8 +86,8 @@ public class QueryAnnotation {
*/
public static Value<String> findName(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(Query.class, x ->
Utils.isNotEmpty3(x.value()), x -> n.set(x.value()));
- pi.forEachAnnotation(Query.class, x ->
Utils.isNotEmpty3(x.name()), x -> n.set(x.name()));
+ pi.forEachAnnotation(Query.class, x -> isNotEmpty(x.value()), x
-> n.set(x.value()));
+ pi.forEachAnnotation(Query.class, x -> isNotEmpty(x.name()), x
-> n.set(x.name()));
return n;
}
@@ -99,7 +99,7 @@ public class QueryAnnotation {
*/
public static Value<String> findDef(ParamInfo pi) {
Value<String> n = Value.empty();
- pi.forEachAnnotation(Query.class, x ->
Utils.isNotEmpty3(x.def()), x -> n.set(x.def()));
+ pi.forEachAnnotation(Query.class, x -> isNotEmpty(x.def()), x
-> n.set(x.def()));
return n;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
index 5d457d12f..55f8b76e3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
@@ -12,8 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.json;
+import static org.apache.juneau.common.internal.Utils.*;
+
import org.apache.juneau.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.json.annotation.*;
/**
@@ -38,7 +39,7 @@ public class JsonClassMeta extends ExtendedClassMeta {
super(cm);
Value<String> wrapperAttr = Value.empty();
- cm.forEachAnnotation(Json.class, x ->
Utils.isNotEmpty3(x.wrapperAttr()), x -> wrapperAttr.set(x.wrapperAttr()));
+ cm.forEachAnnotation(Json.class, x ->
isNotEmpty(x.wrapperAttr()), x -> wrapperAttr.set(x.wrapperAttr()));
this.wrapperAttr = wrapperAttr.orElse(null);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index a89668913..20d660809 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -312,7 +312,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
out.append(jscm.getSchema());
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
out.appendIfAbsentIf(ne, "type", type);
out.appendIfAbsentIf(ne, "format", format);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
index b732eea44..48682ca7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
@@ -13,13 +13,14 @@
package org.apache.juneau.objecttools;
import static java.net.HttpURLConnection.*;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
@@ -746,7 +747,7 @@ public final class ObjectRest {
url = "";
// Strip off leading slash if present.
- if (Utils.isNotEmpty3(url) && url.charAt(0) == '/')
+ if (isNotEmpty(url) && url.charAt(0) == '/')
url = url.substring(1);
return url;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
index 9d4666947..941ad9329 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
@@ -12,8 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
+import static org.apache.juneau.common.internal.Utils.*;
+
import org.apache.juneau.collections.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.svl.*;
/**
@@ -79,7 +80,7 @@ public class ArgsVar extends DefaultingVar {
this.args = ARGS;
else {
String s = System.getProperty("sun.java.command");
- if (Utils.isNotEmpty3(s)) {
+ if (isNotEmpty(s)) {
int i = s.indexOf(' ');
args = new Args(i == -1 ? "" :
s.substring(i+1));
} else {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index 7dd5005c7..1764be86f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -259,7 +259,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
public <T> T parse(HttpPartType partType, HttpPartSchema schema, String
in, ClassMeta<T> toType) throws ParseException, SchemaValidationException {
if (in == null)
return null;
- if (toType.isString() && Utils.isNotEmpty3(in)) {
+ if (toType.isString() && isNotEmpty(in)) {
// Shortcut - If we're returning a string and the value
doesn't start with "'" or is "null", then
// just return the string since it's a plain value.
// This allows us to bypass the creation of a
UonParserSession object.
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index 313b83c49..7c4d63adc 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -773,7 +773,7 @@ public class Microservice implements ConfigEventListener {
this.logger = Logger.getLogger("");
String logFile = Utils.firstNonNull(logConfig.logFile,
config.get("Logging/logFile").orElse(null));
- if (Utils.isNotEmpty3(logFile)) {
+ if (isNotEmpty(logFile)) {
String logDir =
Utils.firstNonNull(logConfig.logDir, config.get("Logging/logDir").orElse("."));
File logDirFile = resolveFile(logDir);
mkdirs(logDirFile, false);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index 97ff2ff8a..125c3a620 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -28,7 +28,6 @@ import org.apache.http.params.*;
import org.apache.http.util.*;
import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.common.internal.Utils;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
index 47f4c4bdf..9309027e2 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.client.remote;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.remote.RemoteUtils.*;
import java.lang.reflect.*;
@@ -99,7 +100,7 @@ public class RemoteOperationMeta {
path = _path.orElse("").trim();
Value<String> value = Value.empty();
- al.forEach(RemoteOp.class, x ->
Utils.isNotEmpty3(x.inner().value().trim()), x ->
value.set(x.inner().value().trim()));
+ al.forEach(RemoteOp.class, x ->
isNotEmpty(x.inner().value().trim()), x -> value.set(x.inner().value().trim()));
if (value.isPresent()) {
String v = value.get();
@@ -111,7 +112,7 @@ public class RemoteOperationMeta {
path = v.substring(i).trim();
}
} else {
- al.forEach(x -> ! x.isType(RemoteOp.class) &&
Utils.isNotEmpty3(x.getValue(String.class, "value",
NOT_EMPTY).orElse("").trim()),x -> value.set(x.getValue(String.class, "value",
NOT_EMPTY).get().trim()));
+ al.forEach(x -> ! x.isType(RemoteOp.class) &&
isNotEmpty(x.getValue(String.class, "value", NOT_EMPTY).orElse("").trim()),x ->
value.set(x.getValue(String.class, "value", NOT_EMPTY).get().trim()));
if (value.isPresent())
path = value.get();
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
index 8ec4ebaaf..07e1b9bfa 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.net.*;
import java.time.*;
import java.util.*;
@@ -418,29 +420,29 @@ public class HttpParts {
private static final Function<ClassMeta<?>,String> HEADER_NAME_FUNCTION
= x -> {
Value<String> n = Value.empty();
-
x.forEachAnnotation(org.apache.juneau.http.annotation.Header.class, y ->
Utils.isNotEmpty3(y.value()), y -> n.set(y.value()));
-
x.forEachAnnotation(org.apache.juneau.http.annotation.Header.class, y ->
Utils.isNotEmpty3(y.name()), y -> n.set(y.name()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.Header.class, y ->
isNotEmpty(y.value()), y -> n.set(y.value()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.Header.class, y ->
isNotEmpty(y.name()), y -> n.set(y.name()));
return n.orElse(null);
};
private static final Function<ClassMeta<?>,String> QUERY_NAME_FUNCTION
= x -> {
Value<String> n = Value.empty();
-
x.forEachAnnotation(org.apache.juneau.http.annotation.Query.class, y ->
Utils.isNotEmpty3(y.value()), y -> n.set(y.value()));
-
x.forEachAnnotation(org.apache.juneau.http.annotation.Query.class, y ->
Utils.isNotEmpty3(y.name()), y -> n.set(y.name()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.Query.class, y ->
isNotEmpty(y.value()), y -> n.set(y.value()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.Query.class, y ->
isNotEmpty(y.name()), y -> n.set(y.name()));
return n.orElse(null);
};
private static final Function<ClassMeta<?>,String>
FORMDATA_NAME_FUNCTION = x -> {
Value<String> n = Value.empty();
-
x.forEachAnnotation(org.apache.juneau.http.annotation.FormData.class, y ->
Utils.isNotEmpty3(y.value()), y -> n.set(y.value()));
-
x.forEachAnnotation(org.apache.juneau.http.annotation.FormData.class, y ->
Utils.isNotEmpty3(y.name()), y -> n.set(y.name()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.FormData.class, y ->
isNotEmpty(y.value()), y -> n.set(y.value()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.FormData.class, y ->
isNotEmpty(y.name()), y -> n.set(y.name()));
return n.orElse(null);
};
private static final Function<ClassMeta<?>,String> PATH_NAME_FUNCTION =
x -> {
Value<String> n = Value.empty();
-
x.forEachAnnotation(org.apache.juneau.http.annotation.Path.class, y ->
Utils.isNotEmpty3(y.value()), y -> n.set(y.value()));
-
x.forEachAnnotation(org.apache.juneau.http.annotation.Path.class, y ->
Utils.isNotEmpty3(y.name()), y -> n.set(y.name()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.Path.class, y ->
isNotEmpty(y.value()), y -> n.set(y.value()));
+
x.forEachAnnotation(org.apache.juneau.http.annotation.Path.class, y ->
isNotEmpty(y.name()), y -> n.set(y.name()));
return n.orElse(null);
};
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index d075d5e81..490ef7a69 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -108,7 +108,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
public BasicHeader(String name, Object value) {
- assertArg(Utils.isNotEmpty3(name), "Name cannot be empty on
header.");
+ assertArg(Utils.isNotEmpty(name), "Name cannot be empty on
header.");
this.name = name;
this.value = value instanceof Supplier ? null : value;
this.stringValue = Utils.s(value);
@@ -128,7 +128,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
public BasicHeader(String name, Supplier<Object> value) {
- assertArg(Utils.isNotEmpty3(name), "Name cannot be empty on
header.");
+ assertArg(Utils.isNotEmpty(name), "Name cannot be empty on
header.");
this.name = name;
this.value = null;
this.stringValue = null;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/BasicResource.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/BasicResource.java
index d7e728253..e500634dd 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/BasicResource.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/resource/BasicResource.java
@@ -12,13 +12,14 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.resource;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.io.*;
import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
@@ -352,7 +353,7 @@ public class BasicResource implements HttpResource {
if (h != null) {
String n = h.getName();
String v = h.getValue();
- if (Utils.isNotEmpty3(n)) {
+ if (isNotEmpty(n)) {
if (n.equalsIgnoreCase("content-type"))
setContentType(v);
else if
(n.equalsIgnoreCase("content-encoding"))
@@ -378,7 +379,7 @@ public class BasicResource implements HttpResource {
if (h != null) {
String n = h.getName();
String v = h.getValue();
- if (Utils.isNotEmpty3(n)) {
+ if (isNotEmpty(n)) {
if (n.equalsIgnoreCase("content-type"))
setContentType(v);
else if
(n.equalsIgnoreCase("content-encoding"))
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/AttributeArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/AttributeArg.java
index e9e1f4c4d..c538ae912 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/AttributeArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/AttributeArg.java
@@ -12,8 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.arg;
+import static org.apache.juneau.common.internal.Utils.*;
+
import org.apache.juneau.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
@@ -65,8 +66,8 @@ public class AttributeArg implements RestOpArg {
private String getName(ParamInfo paramInfo) {
Value<String> n = Value.empty();
- paramInfo.forEachAnnotation(Attr.class, x ->
Utils.isNotEmpty3(x.name()), x -> n.set(x.name()));
- paramInfo.forEachAnnotation(Attr.class, x ->
Utils.isNotEmpty3(x.value()), x -> n.set(x.value()));
+ paramInfo.forEachAnnotation(Attr.class, x ->
isNotEmpty(x.name()), x -> n.set(x.name()));
+ paramInfo.forEachAnnotation(Attr.class, x ->
isNotEmpty(x.value()), x -> n.set(x.value()));
if (n.isEmpty())
throw new ArgException(paramInfo, "@Attr used without
name or value");
return n.get();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
index c75120fd3..a04491101 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
@@ -13,10 +13,10 @@
package org.apache.juneau.rest.arg;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.lang.reflect.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
@@ -72,7 +72,7 @@ public class HasFormDataArg implements RestOpArg {
}
private static boolean hasName(HasFormData x) {
- return Utils.isNotEmpty3(x.name()) ||
Utils.isNotEmpty3(x.value());
+ return isNotEmpty(x.name()) || isNotEmpty(x.value());
}
private static String getName(HasFormData x) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
index 890e568b6..eac751a43 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
@@ -13,11 +13,11 @@
package org.apache.juneau.rest.arg;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.lang.reflect.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
@@ -73,7 +73,7 @@ public class HasQueryArg implements RestOpArg {
}
private static boolean hasName(HasQuery x) {
- return Utils.isNotEmpty3(x.name()) ||
Utils.isNotEmpty3(x.value());
+ return isNotEmpty(x.name()) || isNotEmpty(x.value());
}
private static String getName(HasQuery x) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index 09f5723af..ae4e687e7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -14,6 +14,8 @@ package org.apache.juneau.rest.httppart;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
@@ -545,7 +547,7 @@ public class RequestContent {
private Encoder getEncoder() throws UnsupportedMediaType {
if (encoder == null) {
String ce =
req.getHeaderParam("content-encoding").orElse(null);
- if (Utils.isNotEmpty3(ce)) {
+ if (isNotEmpty(ce)) {
ce = ce.trim();
encoder = encoders.getEncoder(ce);
if (encoder == null)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
index 33ab8a9d5..bd9877f3d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
@@ -15,6 +15,7 @@ package org.apache.juneau.rest.servlet;
import static java.util.logging.Level.*;
import static jakarta.servlet.http.HttpServletResponse.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import java.io.*;
@@ -116,7 +117,7 @@ public abstract class RestServlet extends HttpServlet {
return context.getFullPath();
ClassInfo ci = ClassInfo.of(getClass());
Value<String> path = Value.empty();
- ci.forEachAnnotation(Rest.class, x ->
Utils.isNotEmpty3(x.path()), x -> path.set(trimSlashes(x.path())));
+ ci.forEachAnnotation(Rest.class, x -> isNotEmpty(x.path()), x
-> path.set(trimSlashes(x.path())));
return path.orElse("");
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index 91153cbb2..0af5568d7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -97,7 +97,7 @@ public class BasicSwaggerProviderSession {
InputStream is = ff.getStream(rci.getSimpleName() + ".json",
locale).orElse(null);
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
@@ -731,7 +731,7 @@ public class BasicSwaggerProviderSession {
private JsonMap toMap(ExternalDocs a, String location,
Object...locationArgs) {
if (ExternalDocsAnnotation.empty(a))
return null;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
JsonMap om = JsonMap.create()
.appendIf(ne, "description",
resolve(joinnl(a.description())))
.appendIf(ne, "url", resolve(a.url()));
@@ -741,7 +741,7 @@ public class BasicSwaggerProviderSession {
private JsonMap toMap(Contact a, String location,
Object...locationArgs) {
if (ContactAnnotation.empty(a))
return null;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
JsonMap om = JsonMap.create()
.appendIf(ne, "name", resolve(a.name()))
.appendIf(ne, "url", resolve(a.url()))
@@ -752,7 +752,7 @@ public class BasicSwaggerProviderSession {
private JsonMap toMap(License a, String location,
Object...locationArgs) {
if (LicenseAnnotation.empty(a))
return null;
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
JsonMap om = JsonMap.create()
.appendIf(ne, "name", resolve(a.name()))
.appendIf(ne, "url", resolve(a.url()));
@@ -761,7 +761,7 @@ public class BasicSwaggerProviderSession {
private JsonMap toMap(Tag a, String location, Object...locationArgs) {
JsonMap om = JsonMap.create();
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
om
.appendIf(ne, "name", resolve(a.name()))
@@ -931,7 +931,7 @@ public class BasicSwaggerProviderSession {
if (SchemaAnnotation.empty(a))
return om;
om = newMap(om);
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
@@ -978,7 +978,7 @@ public class BasicSwaggerProviderSession {
if (ExternalDocsAnnotation.empty(a))
return om;
om = newMap(om);
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
return om
.appendIf(ne, "description", resolve(a.description()))
.appendIf(ne, "url", a.url())
@@ -989,7 +989,7 @@ public class BasicSwaggerProviderSession {
if (ItemsAnnotation.empty(a))
return om;
om = newMap(om);
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
@@ -1020,7 +1020,7 @@ public class BasicSwaggerProviderSession {
if (SubItemsAnnotation.empty(a))
return om;
om = newMap(om);
- Predicate<String> ne = Utils::isNotEmpty3;
+ Predicate<String> ne = Utils::isNotEmpty;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
index 206262bd2..bdb5aa623 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
@@ -13,6 +13,8 @@
package org.apache.juneau.rest.util;
import static org.apache.juneau.collections.JsonMap.*;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.util.*;
import org.apache.juneau.common.internal.*;
@@ -89,7 +91,7 @@ public class UrlPathMatch {
*/
public String getRemainder() {
String suffix = getSuffix();
- if (Utils.isNotEmpty3(suffix) && suffix.charAt(0) == '/')
+ if (isNotEmpty(suffix) && suffix.charAt(0) == '/')
suffix = suffix.substring(1);
return suffix;
}
