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 fd1dd80422 org.apache.juneau.common.reflect API improvements
fd1dd80422 is described below
commit fd1dd8042208d6fd26fc5452bb8be02f8a9dcdeb
Author: James Bognar <[email protected]>
AuthorDate: Sun Nov 23 12:35:01 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../apache/juneau/bean/html5/HtmlElementMixed.java | 4 +--
.../org/apache/juneau/common/utils/DateUtils.java | 1 +
.../org/apache/juneau/common/utils/FileUtils.java | 2 +-
.../apache/juneau/common/utils/StringUtils.java | 4 +--
.../java/org/apache/juneau/common/utils/Utils.java | 12 +-------
.../src/main/java/org/apache/juneau/ClassMeta.java | 2 +-
.../juneau/InvalidDataConversionException.java | 4 +--
.../org/apache/juneau/collections/JsonList.java | 4 +--
.../main/java/org/apache/juneau/cp/BeanStore.java | 10 +++---
.../org/apache/juneau/csv/CsvParserSession.java | 2 +-
.../apache/juneau/csv/CsvSerializerSession.java | 20 ++++++------
.../org/apache/juneau/encoders/EncoderSet.java | 4 +--
.../juneau/html/HtmlDocSerializerSession.java | 4 +--
.../html/HtmlStrippedDocSerializerSession.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 6 ++--
.../apache/juneau/json/JsonSerializerSession.java | 6 ++--
.../apache/juneau/objecttools/ObjectPaginator.java | 14 ++++-----
.../apache/juneau/objecttools/ObjectSorter.java | 16 +++++-----
.../org/apache/juneau/parser/ParserSession.java | 32 +++++++++----------
.../org/apache/juneau/uon/UonParserSession.java | 10 +++---
.../urlencoding/UrlEncodingParserSession.java | 4 +--
.../apache/juneau/xml/XmlDocSerializerSession.java | 2 +-
.../microservice/resources/LogsResource.java | 18 +++++------
.../jetty/BasicJettyServerFactory.java | 4 +--
.../microservice/jetty/JettyMicroservice.java | 2 +-
.../jetty/resources/DebugResource.java | 4 +--
.../org/apache/juneau/http/entity/FileEntity.java | 4 +--
.../apache/juneau/rest/mock/MockRestClient.java | 6 ++--
.../java/org/apache/juneau/rest/RestContext.java | 20 ++++++------
.../juneau/rest/processor/HttpEntityProcessor.java | 8 ++---
.../rest/processor/HttpResourceProcessor.java | 8 ++---
.../rest/processor/HttpResponseProcessor.java | 10 +++---
.../rest/processor/InputStreamProcessor.java | 6 ++--
.../org/apache/juneau/rest/util/RestUtils.java | 36 +++++++++++-----------
.../apache/juneau/rest/widget/MenuItemWidget.java | 2 +-
.../apache/juneau/uon/CommonParser_UonTest.java | 4 +--
.../urlencoding/CommonParser_UrlEncodingTest.java | 2 +-
.../org/apache/juneau/utils/ParserReaderTest.java | 2 +-
38 files changed, 146 insertions(+), 155 deletions(-)
diff --git
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
index 24726632d2..91c482959a 100644
---
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
+++
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
@@ -72,8 +72,8 @@ public class HtmlElementMixed extends HtmlElement {
public HtmlElement child(Object value) {
if (this.children == null)
this.children = new LinkedList<>();
- if (value instanceof Collection)
- this.children.addAll((Collection<?>)value);
+ if (value instanceof Collection<?> value2)
+ this.children.addAll(value2);
else
this.children.add(value);
return this;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
index 4025c6a252..e71191276b 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
@@ -18,6 +18,7 @@ package org.apache.juneau.common.utils;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.StateEnum.*;
+import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
index 2bea45ffb2..935247640d 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
@@ -91,7 +91,7 @@ public class FileUtils {
*/
public static File createTempFile(String name, String contents) throws
IOException {
var f = createTempFile(name);
- try (Reader r = new StringReader(contents); Writer w = new
FileWriter(f)) {
+ try (var r = new StringReader(contents); Writer w = new
FileWriter(f)) {
pipe(r, w);
w.flush();
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
index d3cbb9e940..7204248625 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
@@ -3861,7 +3861,7 @@ public class StringUtils {
* @return The multiplier value (1 if no valid suffix found).
*/
private static int multiplier(String s) {
- var c = isEmpty(s) ? null : s.charAt(s.length() - 1); //
NOSONAR - NPE not possible.
+ var c = isEmpty(s) ? 'z' : s.charAt(s.length() - 1);
if (c == 'G')
return 1024 * 1024 * 1024;
if (c == 'M')
@@ -3884,7 +3884,7 @@ public class StringUtils {
* @return The multiplier value (1 if no valid suffix found).
*/
private static long multiplier2(String s) {
- var c = isEmpty(s) ? null : s.charAt(s.length() - 1); //
NOSONAR - NPE not possible.
+ var c = isEmpty(s) ? 'z' : s.charAt(s.length() - 1);
if (c == 'P')
return 1024 * 1024 * 1024 * 1024 * 1024l;
if (c == 'T')
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
index 0700adaab9..dd6da5907a 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
@@ -533,16 +533,6 @@ public class Utils {
return str == null || str.isEmpty();
}
- /**
- * Returns <jk>true</jk> if specified string is <jk>null</jk> or empty
or consists of only blanks.
- *
- * @param s The string to check.
- * @return <jk>true</jk> if specified string is <jk>null</jk> or empty
or consists of only blanks.
- */
- public static boolean isBlank(CharSequence s) {
- return StringUtils.isBlank(s);
- }
-
/**
* Returns <jk>true</jk> if the specified object is not <jk>null</jk>
and not empty.
*
@@ -1170,7 +1160,7 @@ public class Utils {
var cache = new AtomicReference<Optional<T>>();
return () -> {
- Optional<T> h = cache.get();
+ var h = cache.get();
if (h == null) {
h = opt(supplier.get());
if (! cache.compareAndSet(null, h)) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 7ed5663ecb..44b4156d94 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -2014,6 +2014,6 @@ public class ClassMeta<T> implements Type {
* Causes thread to wait until constructor has exited.
*/
void waitForInit() {
- try (SimpleLock x = lock.read()) {}
+ try (var x = lock.read()) {}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
index d2dd162dee..ba4e26d388 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
@@ -49,8 +49,8 @@ public class InvalidDataConversionException extends
BasicRuntimeException {
}
private static String value(Object o) {
- if (o instanceof Class)
- return "'" + name(o) + "'";
+ if (o instanceof Class o2)
+ return "'" + name(o2) + "'";
return Json5Serializer.DEFAULT == null ? "'" + o.toString() +
"'" : Json5Serializer.DEFAULT.toString(o);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index debefcb961..e7928827c0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -987,8 +987,8 @@ public class JsonList extends LinkedList<Object> {
* @return An unmodifiable copy of this list if it's modifiable, or
this list if it is already unmodifiable.
*/
public JsonList unmodifiable() {
- if (this instanceof UnmodifiableJsonList)
- return this;
+ if (this instanceof UnmodifiableJsonList this2)
+ return this2;
return new UnmodifiableJsonList(this);
}
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 aa6420365c..3e680b4d13 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
@@ -362,7 +362,7 @@ public class BeanStore {
public <T> BeanStore addSupplier(Class<T> beanType, Supplier<T> bean,
String name) {
assertCanWrite();
var e = createEntry(beanType, bean, name);
- try (SimpleLock x = lock.write()) {
+ try (var x = lock.write()) {
entries.addFirst(e);
if (isEmpty(name))
unnamedEntries.put(beanType, e);
@@ -380,7 +380,7 @@ public class BeanStore {
*/
public BeanStore clear() {
assertCanWrite();
- try (SimpleLock x = lock.write()) {
+ try (var x = lock.write()) {
unnamedEntries.clear();
entries.clear();
}
@@ -465,7 +465,7 @@ public class BeanStore {
*/
@SuppressWarnings("unchecked")
public <T> Optional<T> getBean(Class<T> beanType) {
- try (SimpleLock x = lock.read()) {
+ try (var x = lock.read()) {
var e = (BeanStoreEntry<T>)unnamedEntries.get(beanType);
if (nn(e))
return opt(e.get());
@@ -485,7 +485,7 @@ public class BeanStore {
*/
@SuppressWarnings("unchecked")
public <T> Optional<T> getBean(Class<T> beanType, String name) {
- try (SimpleLock x = lock.read()) {
+ try (var x = lock.read()) {
var e = (BeanStoreEntry<T>)entries.stream().filter(x2
-> x2.matches(beanType, name)).findFirst().orElse(null);
if (nn(e))
return opt(e.get());
@@ -608,7 +608,7 @@ public class BeanStore {
*/
public BeanStore removeBean(Class<?> beanType, String name) {
assertCanWrite();
- try (SimpleLock x = lock.write()) {
+ try (var x = lock.write()) {
if (name == null)
unnamedEntries.remove(beanType);
entries.removeIf(y -> y.matches(beanType, name));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
index 93bcb4461b..8b8ae28048 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
@@ -188,7 +188,7 @@ public class CsvParserSession extends ReaderParserSession {
@Override /* Overridden from ParserSession */
protected <T> T doParse(ParserPipe pipe, ClassMeta<T> type) throws
IOException, ParseException {
- try (ParserReader r = pipe.getParserReader()) {
+ try (var r = pipe.getParserReader()) {
if (r == null)
return null;
return parseAnything(type, r, getOuter(), null);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index 6e5b6213df..62ef50ce17 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -232,8 +232,8 @@ public class CsvSerializerSession extends
WriterSerializerSession {
@Override /* Overridden from SerializerSession */
protected void doSerialize(SerializerPipe pipe, Object o) throws
IOException, SerializeException {
- try (CsvWriter w = getCsvWriter(pipe)) {
- ClassMeta<?> cm = getClassMetaForObject(o);
+ try (var w = getCsvWriter(pipe)) {
+ var cm = getClassMetaForObject(o);
var l = (Collection<?>)null;
if (cm.isArray()) {
l = l((Object[])o);
@@ -245,9 +245,9 @@ public class CsvSerializerSession extends
WriterSerializerSession {
// TODO - Doesn't support DynaBeans.
if (isNotEmpty(l)) {
- ClassMeta<?> entryType =
getClassMetaForObject(l.iterator().next());
+ var entryType =
getClassMetaForObject(l.iterator().next());
if (entryType.isBean()) {
- BeanMeta<?> bm =
entryType.getBeanMeta();
+ var bm = entryType.getBeanMeta();
var addComma = Flag.create();
bm.forEachProperty(BeanPropertyMeta::canRead, x -> {
addComma.ifSet(() ->
w.w(',')).set();
@@ -260,7 +260,7 @@ public class CsvSerializerSession extends
WriterSerializerSession {
bm.forEachProperty(BeanPropertyMeta::canRead, y -> {
addComma2.ifSet(() ->
w.w(',')).set();
// Bean property values
are already swapped by BeanPropertyMeta.get() via toSerializedForm()
- Object value =
y.get(bean, y.getName());
+ var value = y.get(bean,
y.getName());
w.writeEntry(value);
});
w.w('\n');
@@ -278,7 +278,7 @@ public class CsvSerializerSession extends
WriterSerializerSession {
var map = (Map)x;
map.values().forEach(y -> {
addComma2.ifSet(() ->
w.w(',')).set();
- Object value =
applySwap(y, getClassMetaForObject(y));
+ var value =
applySwap(y, getClassMetaForObject(y));
w.writeEntry(value);
});
w.w('\n');
@@ -287,7 +287,7 @@ public class CsvSerializerSession extends
WriterSerializerSession {
w.writeEntry("value");
w.append('\n');
l.stream().forEach(x -> {
- Object value = applySwap(x,
getClassMetaForObject(x));
+ var value = applySwap(x,
getClassMetaForObject(x));
w.writeEntry(value);
w.w('\n');
});
@@ -297,9 +297,9 @@ public class CsvSerializerSession extends
WriterSerializerSession {
}
CsvWriter getCsvWriter(SerializerPipe out) {
- Object output = out.getRawOutput();
- if (output instanceof CsvWriter)
- return (CsvWriter)output;
+ var output = out.getRawOutput();
+ if (output instanceof CsvWriter output2)
+ return output2;
var w = new CsvWriter(out.getWriter(), isUseWhitespace(),
getMaxIndent(), getQuoteChar(), isTrimStrings(), getUriResolver());
out.setWriter(w);
return w;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index 06118d0d50..871ed55c96 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -280,8 +280,8 @@ public class EncoderSet {
}
private static Encoder instantiate(BeanStore bs, Object o) {
- if (o instanceof Encoder)
- return (Encoder)o;
+ if (o instanceof Encoder o2)
+ return o2;
try {
return
bs.createBean(Encoder.class).type((Class<?>)o).run();
} catch (ExecutableException e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index cd7a867018..6fecf8abe9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -227,7 +227,7 @@ public class HtmlDocSerializerSession extends
HtmlStrippedDocSerializerSession {
* @throws Exception Error occurred during serialization.
*/
public void parentSerialize(Object out, Object o) throws Exception {
- try (SerializerPipe pipe = createPipe(out)) {
+ try (var pipe = createPipe(out)) {
super.doSerialize(pipe, o);
}
}
@@ -240,7 +240,7 @@ public class HtmlDocSerializerSession extends
HtmlStrippedDocSerializerSession {
@Override /* Overridden from Serializer */
protected void doSerialize(SerializerPipe out, Object o) throws
IOException, SerializeException {
- try (HtmlWriter w = getHtmlWriter(out)) {
+ try (var w = getHtmlWriter(out)) {
try {
getTemplate().writeTo(this, w, o);
} catch (Exception e) {
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 7f38f3a902..7fb4bb646f 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
@@ -200,7 +200,7 @@ public class HtmlStrippedDocSerializerSession extends
HtmlSerializerSession {
@Override /* Overridden from SerializerSession */
protected void doSerialize(SerializerPipe out, Object o) throws
IOException, SerializeException {
- try (HtmlWriter w = getHtmlWriter(out)) {
+ try (var w = getHtmlWriter(out)) {
if (o == null || (o instanceof Collection o2 &&
o2.isEmpty()) || (isArray(o) && Array.getLength(o) == 0))
w.sTag(1, "p").append("No
Results").eTag("p").nl(1);
else
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index ddea4ecbc2..1163f4a097 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -871,7 +871,7 @@ public class JsonParserSession extends ReaderParserSession {
@Override /* Overridden from ParserSession */
protected <T> T doParse(ParserPipe pipe, ClassMeta<T> type) throws
IOException, ParseException, ExecutableException {
- try (ParserReader r = pipe.getParserReader()) {
+ try (var r = pipe.getParserReader()) {
if (r == null)
return null;
T o = parseAnything(type, r, getOuter(), null);
@@ -882,7 +882,7 @@ public class JsonParserSession extends ReaderParserSession {
@Override /* Overridden from ReaderParserSession */
protected <E> Collection<E> doParseIntoCollection(ParserPipe pipe,
Collection<E> c, Type elementType) throws IOException, ParseException,
ExecutableException {
- try (ParserReader r = pipe.getParserReader()) {
+ try (var r = pipe.getParserReader()) {
c = parseIntoCollection2(r, c,
getClassMeta(elementType), null);
validateEnd(r);
return c;
@@ -891,7 +891,7 @@ public class JsonParserSession extends ReaderParserSession {
@Override /* Overridden from ReaderParserSession */
protected <K,V> Map<K,V> doParseIntoMap(ParserPipe pipe, Map<K,V> m,
Type keyType, Type valueType) throws IOException, ParseException,
ExecutableException {
- try (ParserReader r = pipe.getParserReader()) {
+ try (var r = pipe.getParserReader()) {
m = parseIntoMap2(r, m,
(ClassMeta<K>)getClassMeta(keyType), (ClassMeta<V>)getClassMeta(valueType),
null);
validateEnd(r);
return m;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index d5b1a4e45c..d58bbd5085 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -299,9 +299,9 @@ public class JsonSerializerSession extends
WriterSerializerSession {
* @throws IOException Thrown by underlying stream.
*/
protected final JsonWriter getJsonWriter(SerializerPipe out) throws
IOException {
- Object output = out.getRawOutput();
- if (output instanceof JsonWriter)
- return (JsonWriter)output;
+ var output = out.getRawOutput();
+ if (output instanceof JsonWriter output2)
+ return output2;
var w = new JsonWriter(out.getWriter(), isUseWhitespace(),
getMaxIndent(), isEscapeSolidus(), getQuoteChar(), isSimpleAttrs(),
isTrimStrings(), getUriResolver());
out.setWriter(w);
return w;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
index 2dd0feaf74..c76575d180 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
@@ -67,7 +67,7 @@ public class ObjectPaginator implements ObjectTool<PageArgs> {
if (input == null)
return null;
- ClassMeta type = session.getClassMetaForObject(input);
+ var type = session.getClassMetaForObject(input);
if (! type.isCollectionOrArray())
return input;
@@ -99,8 +99,8 @@ public class ObjectPaginator implements ObjectTool<PageArgs> {
return copyOfRange((short[])input, pos, end);
}
- List l = type.isList() ? (List)input : new
ArrayList((Collection)input);
- int end = (limit + pos >= l.size()) ? l.size() : limit + pos;
+ var l = type.isList() ? (List)input : new
ArrayList((Collection)input);
+ var end = (limit + pos >= l.size()) ? l.size() : limit + pos;
pos = Math.min(pos, l.size());
return l.subList(pos, end);
}
@@ -116,10 +116,10 @@ public class ObjectPaginator implements
ObjectTool<PageArgs> {
*/
@SuppressWarnings("unchecked")
public <R> List<R> run(Object input, int pos, int limit) {
- BeanSession bs = BeanContext.DEFAULT_SESSION;
- Object r = run(BeanContext.DEFAULT_SESSION, input,
PageArgs.create(pos, limit));
- if (r instanceof List)
- return (List<R>)r;
+ var bs = BeanContext.DEFAULT_SESSION;
+ var r = run(BeanContext.DEFAULT_SESSION, input,
PageArgs.create(pos, limit));
+ if (r instanceof List r2)
+ return r2;
return bs.convertToType(r, List.class);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
index dc556623da..a016ece5ff 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
@@ -113,12 +113,12 @@ public class ObjectSorter implements ObjectTool<SortArgs>
{
// If sort or view isn't empty, then we need to make sure that
all entries in the
// list are maps.
- Map<String,Boolean> sort = args.getSort();
+ var sort = args.getSort();
if (sort.isEmpty())
return input;
- ClassMeta type = session.getClassMetaForObject(input);
+ var type = session.getClassMetaForObject(input);
if (! type.isCollectionOrArray())
return input;
@@ -138,17 +138,17 @@ public class ObjectSorter implements ObjectTool<SortArgs>
{
}
// We reverse the list and sort last to first.
- List<String> columns = toList(sort.keySet());
+ var columns = toList(sort.keySet());
Collections.reverse(columns);
- List<SortEntry> l3 = l;
+ var l3 = l;
columns.forEach(c -> {
final boolean isDesc = sort.get(c);
l3.forEach(se -> se.setSort(c, isDesc));
Collections.sort(l3);
});
- List<Object> l2 = listOfSize(l.size());
+ var l2 = listOfSize(l.size());
l.forEach(x -> l2.add(x.o));
return l2;
@@ -163,9 +163,9 @@ public class ObjectSorter implements ObjectTool<SortArgs> {
* @return A list of maps/beans matching the
*/
public <R> List<R> run(Object input, String sortArgs) {
- Object r = run(BeanContext.DEFAULT_SESSION, input,
SortArgs.create(sortArgs));
- if (r instanceof List)
- return (List<R>)r;
+ var r = run(BeanContext.DEFAULT_SESSION, input,
SortArgs.create(sortArgs));
+ if (r instanceof List r2)
+ return r2;
if (r instanceof Collection r2)
return toList(r2);
if (isArray(r))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 501b165c14..351bc8ab95 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -381,7 +381,7 @@ public class ParserSession extends BeanSession {
* @throws IOException Thrown by the underlying stream.
*/
public final <T> T parse(Object input, Class<T> type) throws
ParseException, IOException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return parseInner(pipe, getClassMeta(type));
}
}
@@ -403,7 +403,7 @@ public class ParserSession extends BeanSession {
* @throws IOException Thrown by the underlying stream.
*/
public final <T> T parse(Object input, ClassMeta<T> type) throws
ParseException, IOException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return parseInner(pipe, type);
}
}
@@ -484,7 +484,7 @@ public class ParserSession extends BeanSession {
*/
@SuppressWarnings("unchecked")
public final <T> T parse(Object input, Type type, Type...args) throws
ParseException, IOException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return (T)parseInner(pipe, getClassMeta(type, args));
}
}
@@ -524,7 +524,7 @@ public class ParserSession extends BeanSession {
* @throws ParseException Malformed input encountered.
*/
public final <T> T parse(String input, Class<T> type) throws
ParseException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return parseInner(pipe, getClassMeta(type));
} catch (IOException e) {
throw new ParseException(e); // Shouldn't happen.
@@ -546,7 +546,7 @@ public class ParserSession extends BeanSession {
* @throws ParseException Malformed input encountered.
*/
public final <T> T parse(String input, ClassMeta<T> type) throws
ParseException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return parseInner(pipe, type);
} catch (IOException e) {
throw new ParseException(e); // Shouldn't happen.
@@ -591,7 +591,7 @@ public class ParserSession extends BeanSession {
*/
@SuppressWarnings("unchecked")
public final <T> T parse(String input, Type type, Type...args) throws
ParseException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return (T)parseInner(pipe, getClassMeta(type, args));
} catch (IOException e) {
throw new ParseException(e); // Shouldn't happen.
@@ -619,7 +619,7 @@ public class ParserSession extends BeanSession {
* @throws ParseException Malformed input encountered.
*/
public final Object[] parseArgs(Object input, Type[] argTypes) throws
ParseException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return doParse(pipe, getArgsClassMeta(argTypes));
} catch (ParseException e) {
throw e;
@@ -654,7 +654,7 @@ public class ParserSession extends BeanSession {
* @throws UnsupportedOperationException If not implemented.
*/
public final <E> Collection<E> parseIntoCollection(Object input,
Collection<E> c, Type elementType) throws ParseException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return doParseIntoCollection(pipe, c, elementType);
} catch (ParseException e) {
throw e;
@@ -694,7 +694,7 @@ public class ParserSession extends BeanSession {
* @throws UnsupportedOperationException If not implemented.
*/
public final <K,V> Map<K,V> parseIntoMap(Object input, Map<K,V> m, Type
keyType, Type valueType) throws ParseException {
- try (ParserPipe pipe = createPipe(input)) {
+ try (var pipe = createPipe(input)) {
return doParseIntoMap(pipe, m, keyType, valueType);
} catch (ParseException e) {
throw e;
@@ -746,9 +746,9 @@ public class ParserSession extends BeanSession {
*/
protected final Object cast(JsonMap m, BeanPropertyMeta pMeta,
ClassMeta<?> eType) {
- String btpn = getBeanTypePropertyName(eType);
+ var btpn = getBeanTypePropertyName(eType);
- Object o = m.get(btpn);
+ var o = m.get(btpn);
if (o == null)
return m;
var typeName = o.toString();
@@ -756,7 +756,7 @@ public class ParserSession extends BeanSession {
var cm = getClassMeta(typeName, pMeta, eType);
if (nn(cm)) {
- BeanMap<?> bm =
m.getBeanSession().newBeanMap(cm.getInnerClass());
+ var bm =
m.getBeanSession().newBeanMap(cm.getInnerClass());
// Iterate through all the entries in the map and set
the individual field values.
m.forEach((k, v) -> {
@@ -786,7 +786,7 @@ public class ParserSession extends BeanSession {
* @throws ParseException Malformed input encountered.
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
- @SuppressWarnings({ "unchecked", "rawtypes", "cast" })
+ @SuppressWarnings("unchecked")
protected final <T> T convertAttrToType(Object outer, String s,
ClassMeta<T> type) throws ParseException {
if (s == null)
return null;
@@ -796,7 +796,7 @@ public class ParserSession extends BeanSession {
var swap = type.getSwap(this);
var sType = swap == null ? type : swap.getSwapClassMeta(this);
- Object o = s;
+ var o = (Object)s;
if (sType.isChar())
o = parseCharacter(s);
else if (sType.isNumber())
@@ -1128,8 +1128,8 @@ public class ParserSession extends BeanSession {
*/
@SuppressWarnings("unchecked")
protected final <K> K trim(K o) {
- if (isTrimStrings() && o instanceof String)
- return (K)o.toString().trim();
+ if (isTrimStrings() && o instanceof String o2)
+ return (K)o2.trim();
return o;
}
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 02559ca3b1..7f418ec484 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
@@ -272,8 +272,8 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
if (x == 'n' && "null".equals(in))
return null;
}
- try (ParserPipe pipe = createPipe(in)) {
- try (UonReader r = getUonReader(pipe, false)) {
+ try (var pipe = createPipe(in)) {
+ try (var r = getUonReader(pipe, false)) {
return parseAnything(toType, r, null, true,
null);
}
} catch (ParseException e) {
@@ -801,7 +801,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
@Override /* Overridden from ParserSession */
protected <T> T doParse(ParserPipe pipe, ClassMeta<T> type) throws
IOException, ParseException, ExecutableException {
- try (UonReader r = getUonReader(pipe, decoding)) {
+ try (var r = getUonReader(pipe, decoding)) {
T o = parseAnything(type, r, getOuter(), true, null);
validateEnd(r);
return o;
@@ -810,7 +810,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
@Override /* Overridden from ReaderParserSession */
protected <E> Collection<E> doParseIntoCollection(ParserPipe pipe,
Collection<E> c, Type elementType) throws Exception {
- try (UonReader r = getUonReader(pipe, decoding)) {
+ try (var r = getUonReader(pipe, decoding)) {
c = parseIntoCollection(r, c,
(ClassMeta<E>)getClassMeta(elementType), false, null);
validateEnd(r);
return c;
@@ -819,7 +819,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
@Override /* Overridden from ReaderParserSession */
protected <K,V> Map<K,V> doParseIntoMap(ParserPipe pipe, Map<K,V> m,
Type keyType, Type valueType) throws Exception {
- try (UonReader r = getUonReader(pipe, decoding)) {
+ try (var r = getUonReader(pipe, decoding)) {
m = parseIntoMap(r, m,
(ClassMeta<K>)getClassMeta(keyType), (ClassMeta<V>)getClassMeta(valueType),
null);
validateEnd(r);
return m;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index d7a59476c8..0b74dcccdd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -509,14 +509,14 @@ public class UrlEncodingParserSession extends
UonParserSession {
@Override /* Overridden from ParserSession */
protected <T> T doParse(ParserPipe pipe, ClassMeta<T> type) throws
IOException, ParseException, ExecutableException {
- try (UonReader r = getUonReader(pipe, true)) {
+ try (var r = getUonReader(pipe, true)) {
return parseAnything(type, r, getOuter());
}
}
@Override /* Overridden from ReaderParserSession */
protected <K,V> Map<K,V> doParseIntoMap(ParserPipe pipe, Map<K,V> m,
Type keyType, Type valueType) throws Exception {
- try (UonReader r = getUonReader(pipe, true)) {
+ try (var r = getUonReader(pipe, true)) {
if (r.peekSkipWs() == '?')
r.read(); // NOSONAR - skip leading '?'.
m = parseIntoMap2(r, m, getClassMeta(Map.class,
keyType, valueType), null);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
index add8730ff8..0c08c2a6e0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
@@ -197,7 +197,7 @@ public class XmlDocSerializerSession extends
XmlSerializerSession {
@Override /* Overridden from SerializerSession */
protected void doSerialize(SerializerPipe out, Object o) throws
java.io.IOException, SerializeException {
- try (XmlWriter w = getXmlWriter(out)) {
+ try (var w = getXmlWriter(out)) {
w.append("<?xml").attr("version",
"1.0").attr("encoding", "UTF-8").appendln("?>");
w.flush();
super.doSerialize(out, o);
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 5753931745..e707f7c62e 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -118,7 +118,7 @@ public class LogsResource extends BasicRestServlet {
public Set<FileResource> getFiles() {
if (f.isFile() || ! includeChildren)
return null;
- Set<FileResource> s = new TreeSet<>(FILE_COMPARATOR);
+ var s = new TreeSet<>(FILE_COMPARATOR);
for (var fc : f.listFiles(FILE_FILTER))
s.add(new FileResource(fc, (nn(path) ? (path +
'/') : "") + urlEncode(fc.getName()), allowDeletes, false));
return s;
@@ -189,7 +189,7 @@ public class LogsResource extends BasicRestServlet {
)
public FileResource getFile(RestRequest req, @Path("/*") String path)
throws NotFound, Exception {
- File dir = getFile(path);
+ var dir = getFile(path);
req.setAttribute("fullPath", dir.getAbsolutePath());
return new FileResource(dir, path, allowDeletes, true);
@@ -224,18 +224,18 @@ public class LogsResource extends BasicRestServlet {
@Query(name="severity",schema=@Schema( d="Severity
filter.\nOnly show log entries with the specified severity.")) String[] severity
) throws NotFound, MethodNotAllowed, IOException {
- File f = getFile(path);
+ var f = getFile(path);
var startDate = parseIsoDate(start);
var endDate = parseIsoDate(end);
if (! highlight) {
- Object o = getReader(f, startDate, endDate, thread,
loggers, severity);
+ var o = getReader(f, startDate, endDate, thread,
loggers, severity);
res.setContentType("text/plain");
if (o instanceof Reader)
res.setContent(o);
else {
- try (LogParser p = (LogParser)o; Writer w =
res.getNegotiatedWriter()) {
+ try (var p = (LogParser)o; Writer w =
res.getNegotiatedWriter()) {
p.writeTo(w);
}
}
@@ -243,9 +243,9 @@ public class LogsResource extends BasicRestServlet {
}
res.setContentType("text/html");
- try (PrintWriter w = res.getNegotiatedWriter()) {
+ try (var w = res.getNegotiatedWriter()) {
w.println("<html><body
style='font-family:monospace;font-size:8pt;white-space:pre;'>");
- try (LogParser lp = getLogParser(f, startDate, endDate,
thread, loggers, severity)) {
+ try (var lp = getLogParser(f, startDate, endDate,
thread, loggers, severity)) {
if (! lp.hasNext())
w.append("<span
style='color:gray'>[EMPTY]</span>");
else
@@ -293,7 +293,7 @@ public class LogsResource extends BasicRestServlet {
@Query(name="severity", schema=@Schema(d="Severity
filter.\nOnly show log entries with the specified severity.")) String[] severity
) throws NotFound, IOException {
- File f = getFile(path);
+ var f = getFile(path);
req.setAttribute("fullPath", f.getAbsolutePath());
var startDate = parseIsoDate(start);
@@ -306,7 +306,7 @@ public class LogsResource extends BasicRestServlet {
if (! allowDeletes)
throw new MethodNotAllowed("DELETE not enabled");
if (f.isDirectory()) {
- File[] files = f.listFiles();
+ var files = f.listFiles();
if (nn(files)) {
for (var fc : files)
deleteFile(fc);
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
index be911fb6b0..1044ff68a4 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
@@ -39,8 +39,8 @@ public class BasicJettyServerFactory implements
JettyServerFactory {
public Server create(String jettyXml) throws Exception {
Objects.requireNonNull(jettyXml,
"jetty.xml file location was not specified in the
configuration file (Jetty/config) or manifest file (Jetty-Config) or found on
the file system or classpath.");
- File f = createTempFile("jetty.xml");
- try (Reader r = new StringReader(jettyXml); Writer w = new
FileWriter(f)) {
+ var f = createTempFile("jetty.xml");
+ try (var r = new StringReader(jettyXml); Writer w = new
FileWriter(f)) {
pipe(r, w);
w.flush();
}
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index bbe3524db9..684c7d3dbb 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -439,7 +439,7 @@ public class JettyMicroservice extends Microservice {
// If port is 0, try a random port between ports[0] and
32767.
if (port == 0)
port = new Random().nextInt(32767 - ports[0] +
1) + ports[0];
- try (ServerSocket ss = new ServerSocket(port)) {
+ try (var ss = new ServerSocket(port)) {
return port;
} catch (@SuppressWarnings("unused") IOException e) {}
}
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
index c07e639df8..5747e5a6d6 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
@@ -65,8 +65,8 @@ public class DebugResource extends BasicRestServlet {
*/
@RestPost(path = "/jetty/dump", description = "Generates and saves the
jetty thread dump file to jetty-thread-dump.log.")
public Ok createJettyDump(RestRequest req, RestResponse res) throws
Exception {
- String dump =
JettyMicroservice.getInstance().getServer().dump();
- try (FileWriter fw = new
FileWriter(req.getConfig().get("Logging/logDir").orElse("") +
"/jetty-thread-dump.log")) {
+ var dump = JettyMicroservice.getInstance().getServer().dump();
+ try (var fw = new
FileWriter(req.getConfig().get("Logging/logDir").orElse("") +
"/jetty-thread-dump.log")) {
fw.write(dump);
}
return Ok.OK;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
index 828760370d..5b8cea6fc2 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
@@ -184,14 +184,14 @@ public class FileEntity extends BasicHttpEntity {
if (isCached()) {
out.write(asBytes());
} else {
- try (InputStream is = getContent()) {
+ try (var is = getContent()) {
pipe(is, out, getMaxLength());
}
}
}
private File content() {
- File f = contentOrElse((File)null);
+ var f = contentOrElse((File)null);
Objects.requireNonNull(f, "File");
if (! f.exists())
throw new IllegalStateException("File " +
f.getAbsolutePath() + " does not exist.");
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index dda8fd60c6..91324732bd 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -2113,9 +2113,9 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
@Override /* Overridden from HttpClientConnection */
public void sendRequestEntity(HttpEntityEnclosingRequest request)
throws HttpException, IOException {
byte[] body = {};
- HttpEntity entity = request.getEntity();
+ var entity = request.getEntity();
if (nn(entity)) {
- long length = entity.getContentLength();
+ var length = entity.getContentLength();
if (length < 0)
length = 1024;
var baos = new
ByteArrayOutputStream((int)Math.min(length, 1024));
@@ -2129,7 +2129,7 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
@Override /* Overridden from HttpClientConnection */
public void sendRequestHeader(HttpRequest request) throws
HttpException, IOException {
try {
- RequestLine rl = request.getRequestLine();
+ var rl = request.getRequestLine();
var path = rl.getUri();
var target = findTarget(request);
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 fc950b3ec9..d24bbed9a6 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
@@ -4471,7 +4471,7 @@ public class RestContext extends Context {
if (o instanceof RestChild o2) {
path = o2.path;
- Object o3 = o2.resource;
+ var o3 = o2.resource;
so = () -> o3;
}
@@ -4498,7 +4498,7 @@ public class RestContext extends Context {
var cc = cb.init(so).build();
- MethodInfo mi =
ClassInfo.of(so.get()).getMethod(x -> x.hasName("setContext") &&
x.hasParameterTypes(RestContext.class)).orElse(null);
+ var mi = ClassInfo.of(so.get()).getMethod(x ->
x.hasName("setContext") && x.hasParameterTypes(RestContext.class)).orElse(null);
if (nn(mi))
mi.accessible().invoke(so.get(), cc);
@@ -4577,7 +4577,7 @@ public class RestContext extends Context {
ClassInfo.ofProxy(resource.get()).getAllMethodsTopDown().stream()
.filter(y -> y.hasAnnotation(RestInit.class) &&
y.hasParameter(RestOpContext.Builder.class))
.forEach(y -> {
- String sig = y.getSignature();
+ var sig = y.getSignature();
if (! initMap.containsKey(sig))
initMap.put(sig,
y.accessible());
});
@@ -5139,10 +5139,10 @@ public class RestContext extends Context {
// the remainder after the new servletPath.
// Only do this for the top-level resource because the
logic for child resources are processed next.
if (pathMatcher.hasVars() && parentContext == null) {
- String sp = sb.req().getServletPath();
- String pi = sb.getPathInfoUndecoded();
+ var sp = sb.req().getServletPath();
+ var pi = sb.getPathInfoUndecoded();
var upi2 = UrlPath.of(pi == null ? sp : sp +
pi);
- UrlPathMatch uppm = pathMatcher.match(upi2);
+ var uppm = pathMatcher.match(upi2);
if (nn(uppm) && ! uppm.hasEmptyVars()) {
sb.pathVars(uppm.getVars());
sb.req(new
OverrideableHttpServletRequest(sb.req()).pathInfo(StringUtils.nullIfEmpty(urlDecode(uppm.getSuffix()))).servletPath(uppm.getPrefix()));
@@ -5156,11 +5156,11 @@ public class RestContext extends Context {
// If this resource has child resources, try to
recursively call them.
var childMatch = restChildren.findMatch(sb);
if (childMatch.isPresent()) {
- UrlPathMatch uppm =
childMatch.get().getPathMatch();
+ var uppm = childMatch.get().getPathMatch();
var rc = childMatch.get().getChildContext();
if (! uppm.hasEmptyVars()) {
sb.pathVars(uppm.getVars());
- HttpServletRequest childRequest = new
OverrideableHttpServletRequest(sb.req()).pathInfo(StringUtils.nullIfEmpty(urlDecode(uppm.getSuffix())))
+ var childRequest = new
OverrideableHttpServletRequest(sb.req()).pathInfo(StringUtils.nullIfEmpty(urlDecode(uppm.getSuffix())))
.servletPath(sb.req().getServletPath() + uppm.getPrefix());
rc.execute(rc.getResource(),
childRequest, sb.res());
} else {
@@ -6008,7 +6008,7 @@ public class RestContext extends Context {
}
try (PrintWriter w2 = w) {
- String httpMessage =
RestUtils.getHttpResponseText(statusCode);
+ var httpMessage =
RestUtils.getHttpResponseText(statusCode);
if (nn(httpMessage))
w2.append("HTTP
").append(String.valueOf(statusCode)).append(":
").append(httpMessage).append("\n\n");
if (isRenderResponseStackTraces())
@@ -6147,7 +6147,7 @@ public class RestContext extends Context {
} catch (IllegalAccessException |
IllegalArgumentException e) {
throw new InternalServerError(e, "Error
occurred invoking start-call method ''{0}''.", x.getFullName());
} catch (InvocationTargetException e) {
- Throwable t = e.getTargetException();
+ var t = e.getTargetException();
if (t instanceof BasicHttpException t2)
throw t2;
throw new InternalServerError(t);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpEntityProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpEntityProcessor.java
index 475bd0e754..4f00023a6c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpEntityProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpEntityProcessor.java
@@ -35,19 +35,19 @@ public class HttpEntityProcessor implements
ResponseProcessor {
@Override /* Overridden from ResponseProcessor */
public int process(RestOpSession opSession) throws IOException {
- RestResponse res = opSession.getResponse();
- HttpEntity e = res.getContent(HttpEntity.class);
+ var res = opSession.getResponse();
+ var e = res.getContent(HttpEntity.class);
if (e == null)
return NEXT;
res.setHeader(e.getContentType());
res.setHeader(e.getContentEncoding());
- long contentLength = e.getContentLength();
+ var contentLength = e.getContentLength();
if (contentLength >= 0)
res.setHeader(contentLength(contentLength));
- try (OutputStream os = res.getNegotiatedOutputStream()) {
+ try (var os = res.getNegotiatedOutputStream()) {
e.writeTo(os);
os.flush();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
index e33ad900c2..3cb322427a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
@@ -35,21 +35,21 @@ public class HttpResourceProcessor implements
ResponseProcessor {
@Override /* Overridden from ResponseProcessor */
public int process(RestOpSession opSession) throws IOException {
- RestResponse res = opSession.getResponse();
- HttpResource r = res.getContent(HttpResource.class);
+ var res = opSession.getResponse();
+ var r = res.getContent(HttpResource.class);
if (r == null)
return NEXT;
res.setHeader(r.getContentType());
res.setHeader(r.getContentEncoding());
- long contentLength = r.getContentLength();
+ var contentLength = r.getContentLength();
if (contentLength >= 0)
res.setHeader(contentLength(contentLength));
r.getHeaders().forEach(x -> res.addHeader(x));
- try (OutputStream os = res.getNegotiatedOutputStream()) {
+ try (var os = res.getNegotiatedOutputStream()) {
r.writeTo(os);
os.flush();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResponseProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResponseProcessor.java
index ffd39dc040..9efa5c7450 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResponseProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResponseProcessor.java
@@ -35,25 +35,25 @@ public class HttpResponseProcessor implements
ResponseProcessor {
@Override /* Overridden from ResponseProcessor */
public int process(RestOpSession opSession) throws IOException {
- RestResponse res = opSession.getResponse();
- HttpResponse r = res.getContent(HttpResponse.class);
+ var res = opSession.getResponse();
+ var r = res.getContent(HttpResponse.class);
if (r == null)
return NEXT;
opSession.status(r.getStatusLine());
- HttpEntity e = r.getEntity();
+ var e = r.getEntity();
res.setHeader(e.getContentType());
res.setHeader(e.getContentEncoding());
- long contentLength = e.getContentLength();
+ var contentLength = e.getContentLength();
if (contentLength >= 0)
res.setHeader(contentLength(contentLength));
r.headerIterator().forEachRemaining(x ->
res.addHeader((Header)x)); // No iterator involved.
- try (OutputStream os = res.getNegotiatedOutputStream()) {
+ try (var os = res.getNegotiatedOutputStream()) {
e.writeTo(os);
os.flush();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
index b69c673016..052da793ba 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
@@ -37,13 +37,13 @@ public class InputStreamProcessor implements
ResponseProcessor {
@Override /* Overridden from ResponseProcessor */
public int process(RestOpSession opSession) throws IOException {
- RestResponse res = opSession.getResponse();
- InputStream is = res.getContent(InputStream.class);
+ var res = opSession.getResponse();
+ var is = res.getContent(InputStream.class);
if (is == null)
return NEXT;
- try (InputStream is2 = is; OutputStream os =
res.getNegotiatedOutputStream()) {
+ try (var is2 = is; var os = res.getNegotiatedOutputStream()) {
pipe(is2, os);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index 98bff8934f..da59fc5c15 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -267,24 +267,24 @@ public class RestUtils {
if (qs == null || ((qs instanceof CharSequence) &&
isEmpty(s(qs))))
return m;
- try (ParserPipe p = new ParserPipe(qs)) {
-
- // S1: Looking for attrName start.
- // S2: Found attrName start, looking for = or &
or end.
- // S3: Found =, looking for valStart or &.
- // S4: Found valStart, looking for & or end.
-
- try (UonReader r = new UonReader(p, true)) {
- int c = r.peekSkipWs();
- if (c == '?')
- r.read();
-
- var state = S1;
- var currAttr = (String)null;
- while (c != -1) {
- c = r.read();
- if (state == S1) {
- if (c != -1) {
+ try (ParserPipe p = new ParserPipe(qs)) {
+
+ // S1: Looking for attrName start.
+ // S2: Found attrName start, looking for = or & or end.
+ // S3: Found =, looking for valStart or &.
+ // S4: Found valStart, looking for & or end.
+
+ try (var r = new UonReader(p, true)) {
+ int c = r.peekSkipWs();
+ if (c == '?')
+ r.read();
+
+ var state = S1;
+ var currAttr = (String)null;
+ while (c != -1) {
+ c = r.read();
+ if (state == S1) {
+ if (c != -1) {
r.unread();
r.mark();
state = S2;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
index 40764d4dae..ae75d2a81d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
@@ -155,7 +155,7 @@ public abstract class MenuItemWidget extends Widget {
// @formatter:on
var o = getContent(req, res);
if (o instanceof Reader o2) {
- try (Reader r = o2; Writer w = new
StringBuilderWriter(sb)) {
+ try (var r = o2; Writer w = new
StringBuilderWriter(sb)) {
pipe(r, w);
} catch (IOException e) {
throw toRex(e);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
index 6bfd220fba..83d6ff9020 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
@@ -30,8 +30,8 @@ import org.junit.jupiter.api.*;
@SuppressWarnings({"rawtypes","serial"})
class CommonParser_UonTest extends TestBase {
- ReaderParser p = UonParser.create().beanDictionary(A1.class).build();
- ReaderParser pe = UonParser.DEFAULT_DECODING;
+ UonParser p = UonParser.create().beanDictionary(A1.class).build();
+ UonParser pe = UonParser.DEFAULT_DECODING;
//====================================================================================================
// testFromSerializer
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
index c5cc9fb265..65075ef3c5 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.*;
@SuppressWarnings({"rawtypes","serial"})
class CommonParser_UrlEncodingTest extends TestBase {
- ReaderParser p =
UrlEncodingParser.create().beanDictionary(A1.class).build();
+ UrlEncodingParser p =
UrlEncodingParser.create().beanDictionary(A1.class).build();
//====================================================================================================
// testFromSerializer
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
index 34a47580be..61f5630315 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ParserReaderTest.java
@@ -28,7 +28,7 @@ class ParserReaderTest extends TestBase {
// test
//====================================================================================================
@Test void a01_test() throws Exception {
- try (ParserReader r = new ParserReader(new
ParserPipe("abc123"))) {
+ try (var r = new ParserReader(new ParserPipe("abc123"))) {
assertEquals('a', r.read());
r.unread();
assertEquals('a', r.read());
