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 53a5c67208 SonarQube bug fixes
53a5c67208 is described below
commit 53a5c67208e5adc45ad8db3d8374e4d5083ac9c0
Author: James Bognar <[email protected]>
AuthorDate: Fri Feb 6 08:49:33 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/commons/collections/Cache.java | 2 +-
.../juneau/commons/io/CharSequenceReader.java | 9 ++--
.../apache/juneau/commons/lang/StringFormat.java | 14 +++---
.../juneau/commons/logging/LogRecordCapture.java | 6 +--
.../juneau/commons/logging/LogRecordListener.java | 4 +-
.../org/apache/juneau/commons/logging/Logger.java | 6 +--
.../main/java/org/apache/juneau/BeanContext.java | 22 ++++----
.../src/main/java/org/apache/juneau/BeanMeta.java | 58 +++++++++++-----------
.../main/java/org/apache/juneau/MediaRange.java | 2 +-
.../main/java/org/apache/juneau/StringRange.java | 2 +-
.../httppart/bean/RequestBeanPropertyMeta.java | 6 +--
.../main/java/org/apache/juneau/parser/Parser.java | 12 ++---
.../org/apache/juneau/parser/ParserReader.java | 8 +--
.../org/apache/juneau/parser/ParserSession.java | 6 ++-
.../java/org/apache/juneau/xml/XmlClassMeta.java | 20 ++++----
.../rest/client/remote/RemoteOperationMeta.java | 14 +++---
.../java/org/apache/juneau/rest/RestContext.java | 8 +--
.../java/org/apache/juneau/rest/RestOpContext.java | 32 ++++++------
.../java/org/apache/juneau/rest/RestRequest.java | 6 +--
.../rest/swagger/BasicSwaggerProviderSession.java | 50 +++++++++----------
20 files changed, 143 insertions(+), 144 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
index b761c590a9..2f87edfa04 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
@@ -488,7 +488,7 @@ public class Cache<K,V> {
protected Cache(Builder<K,V> builder) {
this.maxSize = builder.maxSize;
this.disableCaching = builder.cacheMode == NONE;
- this.supplier = builder.supplier != null ? builder.supplier :
(K) -> null;
+ this.supplier = builder.supplier != null ? builder.supplier :
(key) -> null;
this.isThreadLocal = builder.threadLocal;
if (isThreadLocal) {
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/CharSequenceReader.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/CharSequenceReader.java
index cddaafeea9..218b5662e0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/CharSequenceReader.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/CharSequenceReader.java
@@ -92,8 +92,7 @@ public class CharSequenceReader extends BufferedReader {
private final CharSequence cs;
private String s;
- private StringBuffer sb;
- private StringBuilder sb2;
+ private StringBuilder sb;
private int length;
private int next;
@@ -128,9 +127,9 @@ public class CharSequenceReader extends BufferedReader {
if (cs instanceof String s2)
s = s2;
else if (cs instanceof StringBuffer sb3)
- sb = sb3;
+ sb = new StringBuilder(sb3);
else if (cs instanceof StringBuilder sb4)
- sb2 = sb4;
+ sb = sb4;
this.length = cs.length();
}
@@ -161,8 +160,6 @@ public class CharSequenceReader extends BufferedReader {
s.getChars(next, next + n, cbuf, off);
else if (nn(sb))
sb.getChars(next, next + n, cbuf, off);
- else if (nn(sb2))
- sb2.getChars(next, next + n, cbuf, off);
else {
for (var i = 0; i < n; i++)
cbuf[off + i] = cs.charAt(next + i);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
index 171a03c0d3..fdf4b89765 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
@@ -198,13 +198,13 @@ public final class StringFormat {
private final String content; // The format string to pass to
String.format (null for simple formats)
private final int index; // 0-based index
- StringFormatToken(String content, int index) {
- // content is everything after '%' (e.g., "s", "1$s",
"d", ".2f", "1$.2f")
- var $ = content.indexOf('$');
- if ($ >= 0) {
- index = parseIndexSF(content.substring(0, $)) -
1;
- content = content.substring($ + 1);
- }
+ StringFormatToken(String content, int index) {
+ // content is everything after '%' (e.g., "s", "1$s", "d",
".2f", "1$.2f")
+ var dollarIndex = content.indexOf('$');
+ if (dollarIndex >= 0) {
+ index = parseIndexSF(content.substring(0, dollarIndex))
- 1;
+ content = content.substring(dollarIndex + 1);
+ }
this.format = content.length() == 1 ?
content.charAt(content.length() - 1) : 'z';
this.index = index;
this.content = "%" + content;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordCapture.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordCapture.java
index d04408a525..3a66a35d35 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordCapture.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordCapture.java
@@ -74,11 +74,11 @@ public class LogRecordCapture implements LogRecordListener,
Closeable {
/**
* Called when a log record is logged.
*
- * @param record The log record that was logged.
+ * @param rec The log record that was logged.
*/
@Override
- public void onLogRecord(LogRecord record) {
- records.add(record);
+ public void onLogRecord(LogRecord rec) {
+ records.add(rec);
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordListener.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordListener.java
index d42d9d757b..d70ea1e133 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordListener.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecordListener.java
@@ -33,7 +33,7 @@ public interface LogRecordListener {
/**
* Called when a log record is logged.
*
- * @param record The log record that was logged.
+ * @param rec The log record that was logged.
*/
- void onLogRecord(LogRecord record);
+ void onLogRecord(LogRecord rec);
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
index 92637249ae..8dbb12ee1b 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
@@ -185,13 +185,13 @@ public class Logger extends java.util.logging.Logger {
return;
// Create LogRecord with lazy formatting support
- var record = new LogRecord(getName(), level, msg, args, thrown);
+ var rec = new LogRecord(getName(), level, msg, args, thrown);
// Notify all listeners
- listeners.forEach(x -> x.onLogRecord(record));
+ listeners.forEach(x -> x.onLogRecord(rec));
// Delegate to underlying logger (LogRecord extends
java.util.logging.LogRecord)
- delegate.log(record);
+ delegate.log(rec);
}
// Convenience methods with formatted strings
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index abce2cac51..b647839ae1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -3705,28 +3705,28 @@ public class BeanContext extends Context {
var builderNotBeanClasses = new
ArrayList<>(builder.notBeanClasses);
notBeanClasses = builderNotBeanClasses.isEmpty() ?
DEFAULT_NOTBEAN_CLASSES : Stream.concat(builderNotBeanClasses.stream(),
DEFAULT_NOTBEAN_CLASSES.stream()).distinct().toList();
- List<String> notBeanPackages_ = notBeanPackages.isEmpty() ?
DEFAULT_NOTBEAN_PACKAGES : Stream.concat(notBeanPackages.stream(),
DEFAULT_NOTBEAN_PACKAGES.stream()).toList();
- LinkedHashSet<String> notBeanPackageNames_ =
notBeanPackages_.stream().filter(x -> !
x.endsWith(".*")).collect(Collectors.toCollection(LinkedHashSet::new));
- notBeanPackageNames = u(notBeanPackageNames_);
- notBeanPackagePrefixes = notBeanPackages_.stream().filter(x ->
x.endsWith(".*")).map(x -> x.substring(0, x.length() - 2)).toList();
+ List<String> notBeanPackagesList = notBeanPackages.isEmpty() ?
DEFAULT_NOTBEAN_PACKAGES : Stream.concat(notBeanPackages.stream(),
DEFAULT_NOTBEAN_PACKAGES.stream()).toList();
+ LinkedHashSet<String> notBeanPackageNamesTemp =
notBeanPackagesList.stream().filter(x -> !
x.endsWith(".*")).collect(Collectors.toCollection(LinkedHashSet::new));
+ notBeanPackageNames = u(notBeanPackageNamesTemp);
+ notBeanPackagePrefixes = notBeanPackagesList.stream().filter(x ->
x.endsWith(".*")).map(x -> x.substring(0, x.length() - 2)).toList();
propertyNamerBean =
safe(()->propertyNamer.getDeclaredConstructor().newInstance());
- var objectSwaps_ = new LinkedList<ObjectSwap<?,?>>();
- swaps.forEach(x -> {
- if (x instanceof ObjectSwap<?,?> os) {
- objectSwaps_.add(os);
+ var objectSwapsList = new LinkedList<ObjectSwap<?,?>>();
+ swaps.forEach(x -> {
+ if (x instanceof ObjectSwap<?,?> os) {
+ objectSwapsList.add(os);
} else {
var ci = info((Class<?>)x);
if (ci.isAssignableTo(ObjectSwap.class))
-
objectSwaps_.add(BeanCreator.of(ObjectSwap.class).type(ci).run());
+
objectSwapsList.add(BeanCreator.of(ObjectSwap.class).type(ci).run());
else if (ci.isAssignableTo(Surrogate.class))
-
objectSwaps_.addAll(SurrogateSwap.findObjectSwaps(ci.inner(), this));
+
objectSwapsList.addAll(SurrogateSwap.findObjectSwaps(ci.inner(), this));
else
throw rex("Invalid class {0} specified
in BeanContext.swaps property. Must be a subclass of ObjectSwap or
Surrogate.", cn(ci.inner()));
}
});
- objectSwaps = u(objectSwaps_);
+ objectSwaps = u(objectSwapsList);
cmCache = Cache.<Class,ClassMeta>create().supplier(type -> new
ClassMeta<>(type, this)).build();
cmString = cmCache.get(String.class);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 2d4a4b79d1..dcffd541aa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -405,13 +405,13 @@ public class BeanMeta<T> {
var ap = beanContext.getAnnotationProvider();
var c = cm.inner();
var ci = cm;
- String _notABeanReason = null;
- var _properties = Value.<Map<String,BeanPropertyMeta>>empty();
- var _hiddenProperties =
CollectionUtils.<String,BeanPropertyMeta>map();
- var _getterProps = CollectionUtils.<Method,String>map(); //
Convert to MethodInfo keys
- var _setterProps = CollectionUtils.<Method,String>map();
- var _dynaProperty = Value.<BeanPropertyMeta>empty();
- var _sortProperties = false;
+ String notABeanReasonTemp = null;
+ var propertiesValue =
Value.<Map<String,BeanPropertyMeta>>empty();
+ var hiddenPropertiesMap =
CollectionUtils.<String,BeanPropertyMeta>map();
+ var getterPropsMap = CollectionUtils.<Method,String>map(); //
Convert to MethodInfo keys
+ var setterPropsMap = CollectionUtils.<Method,String>map();
+ var dynaPropertyValue = Value.<BeanPropertyMeta>empty();
+ var sortPropertiesTemp = false;
var ba = ap.find(Bean.class, cm);
var propertyNamer = opt(bf).map(x ->
x.getPropertyNamer()).orElse(beanContext.getPropertyNamer());
@@ -419,7 +419,7 @@ public class BeanMeta<T> {
// Check if constructor is required but not found
if (! beanConstructor.constructor().isPresent() && bf == null
&& beanContext.isBeansRequireDefaultConstructor())
- _notABeanReason = "Class does not have the required
no-arg constructor";
+ notABeanReasonTemp = "Class does not have the required
no-arg constructor";
var bfo = opt(bf);
var fixedBeanProps = bfo.map(x ->
x.getProperties()).orElse(sete());
@@ -502,7 +502,7 @@ public class BeanMeta<T> {
var writeOnlyProps = bfo.map(x ->
x.getWriteOnlyProperties()).orElse(sete());
for (var i = normalProps.values().iterator();
i.hasNext();) {
var p = i.next();
- validateAndRegisterProperty(p, c, typeVarImpls,
readOnlyProps, writeOnlyProps, i, _getterProps, _setterProps);
+ validateAndRegisterProperty(p, c, typeVarImpls,
readOnlyProps, writeOnlyProps, i, getterPropsMap, setterPropsMap);
}
// Check for missing properties.
@@ -518,17 +518,17 @@ public class BeanMeta<T> {
// Make sure at least one property was found.
if (bf == null &&
beanContext.isBeansRequireSomeProperties() && normalProps.isEmpty())
- _notABeanReason = "No properties detected on
bean class";
+ notABeanReasonTemp = "No properties detected on
bean class";
- _sortProperties = beanContext.isSortProperties() ||
bfo.map(x -> x.isSortProperties()).orElse(false) && fixedBeanProps.isEmpty();
+ sortPropertiesTemp = beanContext.isSortProperties() ||
bfo.map(x -> x.isSortProperties()).orElse(false) && fixedBeanProps.isEmpty();
- _properties.set(_sortProperties ? sortedMap() : map());
+ propertiesValue.set(sortPropertiesTemp ? sortedMap() :
map());
normalProps.forEach((k, v) -> {
var pMeta = v.build();
if (pMeta.isDyna())
- _dynaProperty.set(pMeta);
- _properties.get().put(k, pMeta);
+ dynaPropertyValue.set(pMeta);
+ propertiesValue.get().put(k, pMeta);
});
// If a beanFilter is defined, look for inclusion and
exclusion lists.
@@ -537,45 +537,45 @@ public class BeanMeta<T> {
// Eliminated excluded properties if
BeanFilter.excludeKeys is specified.
var bfbpi = bf.getProperties();
var bfbpx = bf.getExcludeProperties();
- var p = _properties.get();
+ var p = propertiesValue.get();
if (! bfbpi.isEmpty()) {
// Only include specified properties if
BeanFilter.includeKeys is specified.
// Note that the order must match
includeKeys.
Map<String,BeanPropertyMeta> p2 =
map(); // NOAI
bfbpi.stream().filter(p::containsKey).forEach(x -> p2.put(x, p.remove(x)));
- _hiddenProperties.putAll(p);
- _properties.set(p2);
+ hiddenPropertiesMap.putAll(p);
+ propertiesValue.set(p2);
}
- bfbpx.forEach(x -> _hiddenProperties.put(x,
_properties.get().remove(x)));
+ bfbpx.forEach(x -> hiddenPropertiesMap.put(x,
propertiesValue.get().remove(x)));
}
if (nn(pNames)) {
- var p = _properties.get();
+ var p = propertiesValue.get();
Map<String,BeanPropertyMeta> p2 = map();
for (var k : pNames) {
if (p.containsKey(k))
p2.put(k, p.get(k));
else
- _hiddenProperties.put(k,
p.get(k));
+ hiddenPropertiesMap.put(k,
p.get(k));
}
- _properties.set(p2);
+ propertiesValue.set(p2);
}
} catch (BeanRuntimeException e) {
throw e;
} catch (Exception e) {
- _notABeanReason = "Exception: " + getStackTrace(e);
+ notABeanReasonTemp = "Exception: " + getStackTrace(e);
}
- notABeanReason = _notABeanReason;
- properties = u(_properties.get());
- hiddenProperties = u(_hiddenProperties);
- getterProps = u(_getterProps);
- setterProps = u(_setterProps);
- dynaProperty = _dynaProperty.get();
- sortProperties = _sortProperties;
+ notABeanReason = notABeanReasonTemp;
+ properties = u(propertiesValue.get());
+ hiddenProperties = u(hiddenPropertiesMap);
+ getterProps = u(getterPropsMap);
+ setterProps = u(setterPropsMap);
+ dynaProperty = dynaPropertyValue.get();
+ sortProperties = sortPropertiesTemp;
typeProperty = BeanPropertyMeta.builder(this,
typePropertyName).canRead().canWrite().rawMetaType(beanContext.string()).beanRegistry(beanRegistry.get()).build();
dictionaryName = mem(this::findDictionaryName);
beanProxyInvocationHandler =
mem(()->beanContext.isUseInterfaceProxies() && c.isInterface() ? new
BeanProxyInvocationHandler<>(this) : null);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
index cc092d76ca..38c0988607 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
@@ -65,7 +65,7 @@ public class MediaRange extends MediaType {
this.qValue = qValue2;
this.extensions = extensions2.toArray(new
NameValuePair[extensions2.size()]);
- var sb = new StringBuffer().append(super.toString());
+ var sb = new StringBuilder().append(super.toString());
// '1' is equivalent to specifying no qValue. If there's no
extensions, then we won't include a qValue.
if (qValue2.floatValue() == 1.0) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
index e029866b52..acbee76ae2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
@@ -81,7 +81,7 @@ public class StringRange {
this.extensions = extensions2.toArray(new
NameValuePair[extensions2.size()]);
this.name = e.getName();
- var sb = new StringBuffer();
+ var sb = new StringBuilder();
sb.append(name);
// '1' is equivalent to specifying no qValue. If there's no
extensions, then we won't include a qValue.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
index e5a5514e0f..58c854fc95 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
@@ -100,11 +100,11 @@ public class RequestBeanPropertyMeta {
/**
* Returns the parser to use for parsing the bean property value.
*
- * @param _default The default parsing to use if not defined on the
annotation.
+ * @param defaultParser The default parsing to use if not defined on
the annotation.
* @return The parsing to use for serializing the bean property value.
*/
- public HttpPartParserSession getParser(HttpPartParserSession _default) {
- return parser == null ? _default : parser.getPartSession();
+ public HttpPartParserSession getParser(HttpPartParserSession
defaultParser) {
+ return parser == null ? defaultParser : parser.getPartSession();
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index fad0502fed..061b16cac4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -1023,12 +1023,12 @@ public class Parser extends BeanContextable {
trimStrings = builder.trimStrings;
unbuffered = builder.unbuffered;
- String[] _consumes = splita(nn(consumes) ? consumes : "");
- List<MediaType> _consumesList = new ArrayList<>();
- for (var consume : _consumes) {
- _consumesList.add(MediaType.of(consume));
- }
- this.consumesArray = u(_consumesList);
+ String[] consumesArray = splita(nn(consumes) ? consumes : "");
+ List<MediaType> consumesList = new ArrayList<>();
+ for (var consume : consumesArray) {
+ consumesList.add(MediaType.of(consume));
+ }
+ this.consumesArray = u(consumesList);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
index 0b89c0838d..57424f8fb6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -74,11 +74,11 @@ public class ParserReader extends Reader implements
Positionable {
this.r = new CharSequenceReader(in);
this.buff = new char[in.length() < 1024 ? in.length() :
1024];
} else {
- Reader _r = pipe.getReader();
- if (_r instanceof ParserReader _r2)
- this.r = _r2.r;
+ Reader reader = pipe.getReader();
+ if (reader instanceof ParserReader reader2)
+ this.r = reader2.r;
else
- this.r = _r;
+ this.r = reader;
this.buff = new char[1024];
}
pipe.setPositionable(this);
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 e492e3aada..5714303e88 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
@@ -25,6 +25,8 @@ import java.io.*;
import java.lang.reflect.*;
import java.nio.charset.*;
import java.util.*;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.function.*;
import org.apache.juneau.*;
@@ -255,7 +257,7 @@ public class ParserSession extends BeanSession {
private final Object outer;
private final Parser ctx;
private final ParserListener listener;
- private final Stack<StringBuilder> sbStack;
+ private final Deque<StringBuilder> sbStack;
private BeanPropertyMeta currentProperty;
private ClassMeta<?> currentClass;
private Position mark = new Position(-1);
@@ -273,7 +275,7 @@ public class ParserSession extends BeanSession {
outer = builder.outer;
schema = builder.schema;
listener =
BeanCreator.of(ParserListener.class).type(ctx.getListener()).orElse(null);
- sbStack = new Stack<>();
+ sbStack = new ArrayDeque<>();
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index 5422aa1cce..2de7c03a3c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -54,16 +54,16 @@ public class XmlClassMeta extends ExtendedClassMeta {
}
this.namespace = XmlUtils.findNamespace(xmls, schemas);
- String _childName = null;
- var _format = XmlFormat.DEFAULT;
- for (var a : xmls) {
- if (a.format() != XmlFormat.DEFAULT)
- _format = a.format();
- if (! a.childName().isEmpty())
- _childName = a.childName();
- }
- this.format = _format;
- this.childName = _childName;
+ String childNameTemp = null;
+ var formatValue = XmlFormat.DEFAULT;
+ for (var a : xmls) {
+ if (a.format() != XmlFormat.DEFAULT)
+ formatValue = a.format();
+ if (! a.childName().isEmpty())
+ childNameTemp = a.childName();
+ }
+ this.format = formatValue;
+ this.childName = childNameTemp;
}
/**
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 1a5cc6aaa6..b159274374 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
@@ -76,13 +76,13 @@ public class RemoteOperationMeta {
if (al.isEmpty())
al =
rstream(AP.find(mi.getReturnType().unwrap(Value.class,
Optional.class))).filter(REMOTE_OP_GROUP).toList();
- var _httpMethod = Value.<String>empty();
- var _path = Value.<String>empty();
- al.stream().map(x ->
x.getNameSimple().substring(6).toUpperCase()).filter(x -> !
x.equals("OP")).forEach(_httpMethod::set);
- al.forEach(ai -> ai.getValue(String.class,
"method").filter(NOT_EMPTY).ifPresent(x ->
_httpMethod.set(x.trim().toUpperCase())));
- al.forEach(ai -> ai.getValue(String.class,
"path").filter(NOT_EMPTY).ifPresent(x -> _path.set(x.trim())));
- httpMethod = _httpMethod.orElse("").trim();
- path = _path.orElse("").trim();
+ var httpMethodValue = Value.<String>empty();
+ var pathValue = Value.<String>empty();
+ al.stream().map(x ->
x.getNameSimple().substring(6).toUpperCase()).filter(x -> !
x.equals("OP")).forEach(httpMethodValue::set);
+ al.forEach(ai -> ai.getValue(String.class,
"method").filter(NOT_EMPTY).ifPresent(x ->
httpMethodValue.set(x.trim().toUpperCase())));
+ al.forEach(ai -> ai.getValue(String.class,
"path").filter(NOT_EMPTY).ifPresent(x -> pathValue.set(x.trim())));
+ httpMethod = httpMethodValue.orElse("").trim();
+ path = pathValue.orElse("").trim();
Value<String> value = Value.empty();
al.stream().filter(x -> x.isType(RemoteOp.class) &&
ne(((RemoteOp)x.inner()).value().trim())).forEach(x ->
value.set(((RemoteOp)x.inner()).value().trim()));
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 9dd01a19a3..0e51e321cd 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
@@ -5053,7 +5053,7 @@ public class RestContext extends Context {
REGISTRY.put(builder.resourceClass, this);
- BasicHttpException _initException = null;
+ BasicHttpException initExceptionTemp = null;
try {
this.builder = builder;
@@ -5149,13 +5149,13 @@ public class RestContext extends Context {
// @formatter:on
} catch (BasicHttpException e) {
- _initException = e;
+ initExceptionTemp = e;
throw e;
} catch (Exception e) {
- _initException = new InternalServerError(e);
+ initExceptionTemp = new InternalServerError(e);
throw e;
} finally {
- initException = _initException;
+ initException = initExceptionTemp;
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 25ea50e1c9..1a08262908 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -2130,8 +2130,8 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
return new Builder(method, context);
}
- private static HttpPartSerializer createPartSerializer(Class<? extends
HttpPartSerializer> c, HttpPartSerializer _default) {
- return
BeanCreator.of(HttpPartSerializer.class).type(c).orElse(_default);
+ private static HttpPartSerializer createPartSerializer(Class<? extends
HttpPartSerializer> c, HttpPartSerializer defaultSerializer) {
+ return
BeanCreator.of(HttpPartSerializer.class).type(c).orElse(defaultSerializer);
}
protected final boolean dotAll;
@@ -2224,20 +2224,20 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
defaultRequestQueryData =
builder.defaultRequestQueryData();
defaultResponseHeaders =
builder.defaultResponseHeaders();
- int _hierarchyDepth = 0;
- var sc = method.getDeclaringClass().getSuperclass();
- while (nn(sc)) {
- _hierarchyDepth++;
- sc = sc.getSuperclass();
- }
- hierarchyDepth = _hierarchyDepth;
-
- var _httpMethod = builder.httpMethod;
- if (_httpMethod == null)
- _httpMethod =
HttpUtils.detectHttpMethod(method, true, "GET");
- if ("METHOD".equals(_httpMethod))
- _httpMethod = "*";
- httpMethod = _httpMethod.toUpperCase(Locale.ENGLISH);
+ int hierarchyDepthTemp = 0;
+ var sc = method.getDeclaringClass().getSuperclass();
+ while (nn(sc)) {
+ hierarchyDepthTemp++;
+ sc = sc.getSuperclass();
+ }
+ hierarchyDepth = hierarchyDepthTemp;
+
+ var httpMethodValue = builder.httpMethod;
+ if (httpMethodValue == null)
+ httpMethodValue = HttpUtils.detectHttpMethod(method,
true, "GET");
+ if ("METHOD".equals(httpMethodValue))
+ httpMethodValue = "*";
+ httpMethod = httpMethodValue.toUpperCase(Locale.ENGLISH);
defaultCharset = nn(builder.defaultCharset) ?
builder.defaultCharset : context.defaultCharset;
dotAll = builder.dotAll;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 0f19de62d8..8dfc7b031c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -926,11 +926,11 @@ public class RestRequest extends
HttpServletRequestWrapper {
*/
public Optional<Operation> getOperationSwagger() {
- var swagger = getSwagger();
- if (! swagger.isPresent())
+ var swagger2 = getSwagger();
+ if (! swagger2.isPresent())
return opte();
- return
opt(swagger.get().getOperation(opContext.getPathPattern(),
getMethod().toLowerCase()));
+ return
opt(swagger2.get().getOperation(opContext.getPathPattern(),
getMethod().toLowerCase()));
}
/**
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 a62d5b1b70..b5a46262fe 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
@@ -351,10 +351,10 @@ public class BasicSwaggerProviderSession {
// Get the operation from the existing swagger so far.
var op = getOperation(omSwagger, sm.getPathPattern(),
sm.getHttpMethod().toLowerCase());
- // Add @RestOp(swagger)
- var _ms = Value.<OpSwagger>empty();
- al.forEach(ai -> ai.getValue(OpSwagger.class,
"swagger").filter(OpSwaggerAnnotation::notEmpty).ifPresent(_ms::set));
- var ms = _ms.orElseGet(() ->
OpSwaggerAnnotation.create().build());
+ // Add @RestOp(swagger)
+ var msValue = Value.<OpSwagger>empty();
+ al.forEach(ai -> ai.getValue(OpSwagger.class,
"swagger").filter(OpSwaggerAnnotation::notEmpty).ifPresent(msValue::set));
+ var ms = msValue.orElseGet(() ->
OpSwaggerAnnotation.create().build());
op.append(parseMap(ms.value(), "@OpSwagger(value) on
class {0} method {1}", c, m));
op.appendIf(ne, SWAGGER_operationId,
@@ -365,27 +365,27 @@ public class BasicSwaggerProviderSession {
)
);
- var _summary = Value.<String>empty();
- al.forEach(ai -> ai.getValue(String.class,
SWAGGER_summary).filter(NOT_EMPTY).ifPresent(_summary::set));
- op.appendIf(ne, SWAGGER_summary,
- firstNonEmpty(
- resolve(ms.summary()),
- resolve(mb.findFirstString(mn +
".summary")),
- op.getString(SWAGGER_summary),
- resolve(_summary.orElse(null))
- )
- );
-
- var _description = Value.<String[]>empty();
- al.forEach(ai -> ai.getValue(String[].class,
SWAGGER_description).filter(x -> x.length > 0).ifPresent(_description::set));
- op.appendIf(ne, SWAGGER_description,
- firstNonEmpty(
- resolve(ms.description()),
- resolve(mb.findFirstString(mn +
".description")),
- op.getString(SWAGGER_description),
- resolve(_description.orElse(new
String[0]))
- )
- );
+ var summaryValue = Value.<String>empty();
+ al.forEach(ai -> ai.getValue(String.class,
SWAGGER_summary).filter(NOT_EMPTY).ifPresent(summaryValue::set));
+ op.appendIf(ne, SWAGGER_summary,
+ firstNonEmpty(
+ resolve(ms.summary()),
+ resolve(mb.findFirstString(mn + ".summary")),
+ op.getString(SWAGGER_summary),
+ resolve(summaryValue.orElse(null))
+ )
+ );
+
+ var descriptionValue = Value.<String[]>empty();
+ al.forEach(ai -> ai.getValue(String[].class,
SWAGGER_description).filter(x -> x.length >
0).ifPresent(descriptionValue::set));
+ op.appendIf(ne, SWAGGER_description,
+ firstNonEmpty(
+ resolve(ms.description()),
+ resolve(mb.findFirstString(mn +
".description")),
+ op.getString(SWAGGER_description),
+ resolve(descriptionValue.orElse(new String[0]))
+ )
+ );
op.appendIf(ne, SWAGGER_deprecated,
firstNonEmpty(
resolve(ms.deprecated()),
