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 990085ae9 Test modernization, clean up utility classes.
990085ae9 is described below
commit 990085ae9a7c8560efee21635a68f5b39b2ed72b
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 13:51:44 2025 -0400
Test modernization, clean up utility classes.
---
.../src/main/java/org/apache/juneau/config/Entry.java | 13 +++++++------
.../src/main/java/org/apache/juneau/config/Section.java | 5 +++--
.../main/java/org/apache/juneau/jena/RdfParserSession.java | 3 ++-
.../src/main/java/org/apache/juneau/Version.java | 4 +++-
.../src/main/java/org/apache/juneau/cp/BasicFileFinder.java | 2 +-
.../src/main/java/org/apache/juneau/cp/BeanStore.java | 4 ++--
.../main/java/org/apache/juneau/cp/DefaultClassList.java | 4 +++-
.../java/org/apache/juneau/internal/CollectionUtils.java | 12 ++----------
.../main/java/org/apache/juneau/reflect/AnnotationInfo.java | 2 +-
.../main/java/org/apache/juneau/utils/ReflectionMap.java | 9 +++++----
.../src/main/java/org/apache/juneau/http/HttpParts.java | 2 +-
.../org/apache/juneau/rest/springboot/SpringBeanStore.java | 5 +++--
.../src/main/java/org/apache/juneau/rest/RestResponse.java | 2 +-
.../org/apache/juneau/rest/httppart/RequestHttpPart.java | 3 ++-
.../org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 2 +-
.../src/main/java/org/apache/juneau/rest/util/UrlPath.java | 6 ++++--
16 files changed, 41 insertions(+), 37 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
index 7fbc7ac3a..e8c70cbdd 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
@@ -201,7 +201,7 @@ public class Entry {
@SuppressWarnings("unchecked")
public <T> Optional<T> as(Parser parser, Type type, Type...args) {
if (isNull())
- return empty();
+ return Utils.opte();
try {
var v = toString();
@@ -212,7 +212,8 @@ public class Entry {
if (type == long.class || type == Long.class) return
(Optional<T>)asLong();
if (type == JsonMap.class) return (Optional<T>)asMap();
if (type == JsonList.class) return
(Optional<T>)asList();
- if (isEmpty()) return empty();
+ if (isEmpty())
+ return Utils.opte();
if (isSimpleType(type)) return
optional((T)config.beanSession.convertToType(v, (Class<?>)type));
if (parser instanceof JsonParser) {
@@ -269,7 +270,7 @@ public class Entry {
*/
public Optional<String[]> asStringArray() {
if (! isPresent())
- return empty();
+ return Utils.opte();
var v = toString();
var s1 = firstNonWhitespaceChar(v);
var s2 = lastNonWhitespaceChar(v);
@@ -410,7 +411,7 @@ public class Entry {
*/
public Optional<byte[]> asBytes() {
if (isNull())
- return empty();
+ return Utils.opte();
var s = toString();
if (s.indexOf('\n') != -1)
s = s.replace("\n", "");
@@ -453,7 +454,7 @@ public class Entry {
*/
public Optional<JsonMap> asMap(Parser parser) throws ParseException {
if (isNull())
- return empty();
+ return Utils.opte();
if (parser == null)
parser = config.parser;
var s = toString();
@@ -493,7 +494,7 @@ public class Entry {
*/
public Optional<JsonList> asList(Parser parser) throws ParseException {
if (isNull())
- return empty();
+ return Utils.opte();
if (parser == null)
parser = config.parser;
var s = toString();
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
index 2aa740b57..a2a1795b7 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
@@ -19,6 +19,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.config.internal.*;
import org.apache.juneau.parser.*;
@@ -108,7 +109,7 @@ public class Section {
assertArgNotNull("c", c);
if (! isPresent())
- return empty();
+ return Utils.opte();
var keys = configMap.getKeys(name);
@@ -133,7 +134,7 @@ public class Section {
*/
public Optional<JsonMap> asMap() {
if (! isPresent())
- return empty();
+ return Utils.opte();
var keys = configMap.getKeys(name);
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 58d7aa835..4d660e540 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -27,6 +27,7 @@ import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.util.iterator.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
@@ -257,7 +258,7 @@ public class RdfParserSession extends ReaderParserSession {
}
if (roots.isEmpty())
- return type.isOptional() ? (T)empty() : null;
+ return type.isOptional() ? (T)Utils.opte() : null;
if (roots.size() > 1)
throw new ParseException(this, "Too many root nodes
found in model: {0}", roots.size());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
index 6be9cd3d6..ffaac077f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
@@ -17,6 +17,8 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
+import org.apache.juneau.common.internal.*;
+
/**
* Represents a version string such as <js>"1.2"</js> or <js>"1.2.3"</js>
*
@@ -88,7 +90,7 @@ public class Version implements Comparable<Version> {
*/
public Optional<Integer> getPart(int index) {
if (index < 0 || parts.length <= index)
- return empty();
+ return Utils.opte();
return optional(parts[index]);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index e32946b05..737d93441 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -127,7 +127,7 @@ public class BasicFileFinder implements FileFinder {
name = StringUtils.trimSlashesAndSpaces(name);
if (isInvalidPath(name))
- return CollectionUtils.empty();
+ return Utils.opte();
if (locale != null)
localizedFiles.putIfAbsent(locale, new
ConcurrentHashMap<>());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
index 37a9ffa52..147c4ccdc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
@@ -418,7 +418,7 @@ public class BeanStore {
return optional(e.get());
if (parent.isPresent())
return parent.get().getBean(beanType);
- return empty();
+ return Utils.opte();
}
}
@@ -438,7 +438,7 @@ public class BeanStore {
return optional(e.get());
if (parent.isPresent())
return parent.get().getBean(beanType, name);
- return empty();
+ return Utils.opte();
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
index 54c9886ee..ff7be2684 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
@@ -17,6 +17,8 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
+import org.apache.juneau.common.internal.*;
+
/**
* A list of default implementation classes.
*
@@ -98,7 +100,7 @@ public class DefaultClassList {
for (Class<?> e : entries)
if (e != null && type.isAssignableFrom(e))
return optional((Class<? extends T>)e);
- return empty();
+ return Utils.opte();
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
index efe615d01..bb8e74892 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
@@ -19,6 +19,8 @@ import java.lang.reflect.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.*;
+
/**
* Utility methods for collections.
*
@@ -735,16 +737,6 @@ public final class CollectionUtils {
return Optional.ofNullable(value);
}
- /**
- * Returns an empty {@link Optional}.
- *
- * @param <T> The component type.
- * @return An empty {@link Optional}.
- */
- public static <T> Optional<T> empty() {
- return Optional.empty();
- }
-
/**
* Returns <jk>true</jk> if the specified collection is not
<jk>null</jk> and not empty.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index 42967737d..d6257b4c4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -333,7 +333,7 @@ public final class AnnotationInfo<T extends Annotation> {
e.printStackTrace(); // Shouldn't
happen.
}
}
- return empty();
+ return Utils.opte();
}
Method[] _getMethods() {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
index 956370982..acd9efa19 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
/**
* Allows arbitrary objects to be mapped to classes and methods base on
class/method name keys.
@@ -300,7 +301,7 @@ public class ReflectionMap<V> {
if (e.matches(c))
if (ofType == null ||
ofType.isInstance(e.value))
return optional(e.value);
- return empty();
+ return Utils.opte();
}
/**
@@ -379,7 +380,7 @@ public class ReflectionMap<V> {
if (e.matches(m))
if (ofType == null ||
ofType.isInstance(e.value))
return optional(e.value);
- return empty();
+ return Utils.opte();
}
/**
@@ -451,7 +452,7 @@ public class ReflectionMap<V> {
if (e.matches(f))
if (ofType == null ||
ofType.isInstance(e.value))
return optional(e.value);
- return empty();
+ return Utils.opte();
}
/**
@@ -523,7 +524,7 @@ public class ReflectionMap<V> {
if (e.matches(c))
if (ofType == null ||
ofType.isInstance(e.value))
return optional(e.value);
- return empty();
+ return Utils.opte();
}
/**
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 5b675cdd8..97e95c779 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
@@ -477,7 +477,7 @@ public class HttpParts {
case HEADER: return
type.getProperty("HttpPart.header.name", HEADER_NAME_FUNCTION);
case PATH: return
type.getProperty("HttpPart.path.name", PATH_NAME_FUNCTION);
case QUERY: return
type.getProperty("HttpPart.query.name", QUERY_NAME_FUNCTION);
- default: return empty();
+ default: return Utils.opte();
}
}
diff --git
a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
index 9236e4df8..7bc2f56ca 100644
---
a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/SpringBeanStore.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import java.util.stream.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.springframework.context.*;
@@ -55,7 +56,7 @@ public class SpringBeanStore extends BeanStore {
} catch (Exception e) {
e.printStackTrace();
}
- return empty();
+ return Utils.opte();
}
@Override
@@ -73,7 +74,7 @@ public class SpringBeanStore extends BeanStore {
} catch (Exception e) {
e.printStackTrace();
}
- return empty();
+ return Utils.opte();
}
@SuppressWarnings("unchecked")
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index 09370e304..dc86cf737 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -852,7 +852,7 @@ public final class RestResponse extends
HttpServletResponseWrapper {
if (rbm != null)
contentSchema = optional(rbm.getSchema());
else
- contentSchema = empty();
+ contentSchema = Utils.opte();
}
return contentSchema;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
index daa1462bd..7c138eefd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
@@ -23,6 +23,7 @@ import java.util.regex.*;
import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.http.response.*;
@@ -246,7 +247,7 @@ public class RequestHttpPart {
ConstructorInfo cc =
HttpParts.getConstructor(type).orElse(null);
if (cc != null) {
if (! isPresent())
- return empty();
+ return Utils.opte();
if (cc.hasParamTypes(String.class))
return
optional(cc.invoke(get()));
if (cc.hasParamTypes(String.class,
String.class))
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
index ffdacf56c..e992cf0c3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
@@ -117,7 +117,7 @@ public class BasicStaticFiles implements StaticFiles {
try {
Optional<InputStream> is = getStream(path, locale);
if (! is.isPresent())
- return empty();
+ return Utils.opte();
return optional(
streamResource(is.get())
.setHeaders(contentType(mimeTypes ==
null ? null : mimeTypes.getContentType(getFileName(path))))
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
index 57d0b3473..c647f8cda 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
@@ -18,6 +18,8 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
+import org.apache.juneau.common.internal.*;
+
/**
* Represents a parsed URL path-info string.
*
@@ -73,10 +75,10 @@ public class UrlPath {
*/
public Optional<String> getFileName() {
if (parts.length == 0)
- return empty();
+ return Utils.opte();
String p = parts[parts.length-1];
if (p.indexOf('.') == -1)
- return empty();
+ return Utils.opte();
return optional(p);
}
