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 eb172a51c0 SonarQube bug fixes
eb172a51c0 is described below
commit eb172a51c01512e4b6ebd2ba4b45f6915d6c93da
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 16:02:00 2026 -0500
SonarQube bug fixes
---
.../org/apache/juneau/commons/collections/SimpleMap.java | 8 ++++----
.../src/main/java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../src/main/java/org/apache/juneau/cp/Messages.java | 12 ++++++------
.../java/org/apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/json/JsonSerializer.java | 6 +++---
.../java/org/apache/juneau/jsonschema/SchemaUtils.java | 2 +-
.../java/org/apache/juneau/msgpack/MsgPackInputStream.java | 4 ++--
.../src/main/java/org/apache/juneau/uon/UonSerializer.java | 14 +++++++-------
.../src/main/java/org/apache/juneau/uon/UonWriter.java | 8 ++++----
.../src/main/java/org/apache/juneau/xml/XmlSerializer.java | 8 ++++----
.../src/main/java/org/apache/juneau/xml/XmlUtils.java | 2 +-
.../juneau/microservice/jetty/JettyMicroservice.java | 14 +++++++-------
.../org/apache/juneau/http/header/BasicDateHeader.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestResponse.java | 2 +-
.../org/apache/juneau/rest/beans/ResourceDescription.java | 2 +-
.../org/apache/juneau/rest/rrpc/RrpcRestOpSession.java | 6 +++---
16 files changed, 47 insertions(+), 47 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
index 2f634b2f3e..38fa7b027b 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
@@ -143,7 +143,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
public K getKey() { return keys[index]; }
@Override /* Map.Entry */
- public V getValue() { return values[index]; }
+ public V getValue() { return values2[index]; }
@Override /* Map.Entry */
public V setValue(V val) {
@@ -172,7 +172,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
final K[] keys;
/** The array of values. Values are immutable after construction. */
- final V[] values;
+ final V[] values2;
/** Pre-constructed entries array for {@link #entrySet()}. */
final SimpleUnmodifiableMapEntry[] entries;
@@ -220,7 +220,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
}
this.keys = keys;
- this.values = values;
+ this.values2 = values;
entries =
(SimpleUnmodifiableMapEntry[])Array.newInstance(SimpleUnmodifiableMapEntry.class,
keys.length);
for (var i = 0; i < keys.length; i++) {
entries[i] = new SimpleUnmodifiableMapEntry(i);
@@ -279,7 +279,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
public V get(Object key) {
for (var i = 0; i < keys.length; i++)
if (Utils.eq(keys[i], key))
- return values[i];
+ return values2[i];
return null;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index a65b4d3001..fb076608eb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -605,7 +605,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (m.bean == null) {
if (! m.propertyCache.containsKey(name))
m.propertyCache.put(name, new
JsonMap(m.getBeanSession()));
-
((JsonMap)m.propertyCache.get(name)).append(key.toString(), value);
+ ((JsonMap)m.propertyCache.get(name)).append(key, value);
return;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index 971b478716..c171afc178 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -331,7 +331,7 @@ public class Messages extends ResourceBundle {
private ResourceBundle rb;
private Class<?> c;
- private Messages parent;
+ private Messages parent2;
private Locale locale;
// Cache of message bundles per locale.
@@ -355,7 +355,7 @@ public class Messages extends ResourceBundle {
Messages(Class<?> forClass, ResourceBundle rb, Locale locale, Messages
parent) {
this.c = forClass;
this.rb = rb;
- this.parent = parent;
+ this.parent2 = parent;
if (nn(parent))
setParent(parent);
this.locale = locale == null ? Locale.getDefault() : locale;
@@ -372,8 +372,8 @@ public class Messages extends ResourceBundle {
}
});
}
- if (nn(parent)) {
- parent.keySet().forEach(x -> {
+ if (nn(parent2)) {
+ parent2.keySet().forEach(x -> {
keyMap.put(x, x);
if (x.startsWith(cn)) {
var shortKey = x.substring(cn.length());
@@ -418,7 +418,7 @@ public class Messages extends ResourceBundle {
return this;
var mb = localizedMessages.get(locale);
if (mb == null) {
- var parent = this.parent == null ? null :
this.parent.forLocale(locale);
+ var parent = this.parent2 == null ? null :
this.parent2.forLocale(locale);
var rb = this.rb == null ? null :
findBundle(this.rb.getBaseBundleName(), locale, c.getClassLoader());
mb = new Messages(c, rb, locale, parent);
localizedMessages.put(locale, mb);
@@ -490,6 +490,6 @@ public class Messages extends ResourceBundle {
if (rbKeys.contains(k))
return rb.getObject(k);
} catch (@SuppressWarnings("unused") MissingResourceException
e) { /* Shouldn't happen */ }
- return parent.handleGetObject(key);
+ return parent2.handleGetObject(key);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 5ac3302cdc..bfd470e329 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -581,7 +581,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
out.cTag();
if (nn(link))
out.oTag("a").attrUri("href", link).cTag();
- ContentResult cr =
serializeAnything(out, value, pMeta.getClassMeta(), p.getKey().toString(),
pMeta, 2, false, true);
+ ContentResult cr =
serializeAnything(out, value, pMeta.getClassMeta(), p.getKey(), pMeta, 2,
false, true);
if (cr == CR_ELEMENTS)
out.i(i + 2);
if (nn(link))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index dba444ce50..fdefe1212f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -1050,7 +1050,7 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
protected final boolean escapeSolidus;
protected final boolean simpleAttrs;
- private final boolean addBeanTypes;
+ private final boolean addBeanTypes2;
private final Map<BeanPropertyMeta,JsonBeanPropertyMeta>
jsonBeanPropertyMetas = new ConcurrentHashMap<>();
private final Map<ClassMeta<?>,JsonClassMeta> jsonClassMetas = new
ConcurrentHashMap<>();
@@ -1067,7 +1067,7 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
escapeSolidus = builder.escapeSolidus;
simpleAttrs = builder.simpleAttrs;
- addBeanTypes = addBeanTypesJson || super.isAddBeanTypes();
+ addBeanTypes2 = addBeanTypesJson || super.isAddBeanTypes();
}
@Override /* Overridden from Context */
@@ -1124,7 +1124,7 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
* through reflection.
*/
@Override
- protected final boolean isAddBeanTypes() { return addBeanTypes; }
+ protected final boolean isAddBeanTypes() { return addBeanTypes2; }
/**
* Prefix solidus <js>'/'</js> characters with escapes.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
index d8a9baeb4e..18f6769497 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
@@ -62,7 +62,7 @@ public class SchemaUtils {
if (o instanceof String[])
o = joinnl((String[])o);
if (o instanceof String o2) {
- var s = o2.toString();
+ var s = o2;
if (s.isEmpty())
return null;
if ("IGNORE".equalsIgnoreCase(s))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
index 60d9d2b24b..2a30be2477 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
@@ -65,7 +65,7 @@ public class MsgPackInputStream extends ParserInputStream {
private int lastByte;
private int extType;
- int pos = 0;
+ int pos2 = 0;
/**
* Constructor.
@@ -136,7 +136,7 @@ public class MsgPackInputStream extends ParserInputStream {
DataType readDataType() throws IOException {
int i = read();
if (i == -1)
- throw ioex("Unexpected end of file found at position
{0}", pos);
+ throw ioex("Unexpected end of file found at position
{0}", pos2);
currentDataType = TYPES[i];
switch (currentDataType) {
case NULL:
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index c8c9218288..bf95c1737c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -1081,9 +1081,9 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
protected final boolean encoding;
protected final Character quoteCharUon;
protected final ParamFormat paramFormat;
- private final boolean addBeanTypes;
+ private final boolean addBeanTypes2;
- private final char quoteChar;
+ private final char quoteChar2;
private final Map<BeanPropertyMeta,UonBeanPropertyMeta>
uonBeanPropertyMetas = new ConcurrentHashMap<>();
private final Map<ClassMeta<?>,UonClassMeta> uonClassMetas = new
ConcurrentHashMap<>();
@@ -1101,8 +1101,8 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
paramFormat = builder.paramFormat;
quoteCharUon = builder.quoteCharUon;
- addBeanTypes = addBeanTypesUon || super.isAddBeanTypes();
- quoteChar = nn(quoteCharUon) ? quoteCharUon :
nn(super.quoteChar()) ? super.quoteChar() : '\'';
+ addBeanTypes2 = addBeanTypesUon || super.isAddBeanTypes();
+ quoteChar2 = nn(quoteCharUon) ? quoteCharUon :
nn(super.quoteChar()) ? super.quoteChar() : '\'';
}
@Override /* Overridden from Context */
@@ -1171,7 +1171,7 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
* The character used for quoting attributes and values.
*/
@Override
- protected final char getQuoteChar() { return quoteChar; }
+ protected final char getQuoteChar() { return quoteChar2; }
/**
* Add <js>"_type"</js> properties when needed.
@@ -1182,7 +1182,7 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
* through reflection.
*/
@Override
- protected final boolean isAddBeanTypes() { return addBeanTypes; }
+ protected final boolean isAddBeanTypes() { return addBeanTypes2; }
/**
* Encode non-valid URI characters.
@@ -1196,7 +1196,7 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
@Override /* Overridden from WriterSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("addBeanTypes", addBeanTypes)
+ .a("addBeanTypes", addBeanTypes2)
.a("encoding", encoding)
.a("paramFormat", paramFormat);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
index d08e25ee57..a1d075d7b9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
@@ -56,7 +56,7 @@ public class UonWriter extends SerializerWriter {
private final boolean encodeChars, plainTextParams;
- private final char quoteChar;
+ private final char quoteChar2;
/**
* Constructor.
@@ -77,7 +77,7 @@ public class UonWriter extends SerializerWriter {
this.session = session;
this.encodeChars = encodeChars;
this.plainTextParams = plainTextParams;
- this.quoteChar = quoteChar;
+ this.quoteChar2 = quoteChar;
}
@Override /* Overridden from SerializerWriter */
@@ -164,7 +164,7 @@ public class UonWriter extends SerializerWriter {
var esc = plainTextParams ? noChars : escapedChars;
if (needsQuotes)
- w(quoteChar);
+ w(quoteChar2);
for (var i = 0; i < s.length(); i++) {
var c = s.charAt(i);
if (esc.contains(c))
@@ -196,7 +196,7 @@ public class UonWriter extends SerializerWriter {
}
}
if (needsQuotes)
- w(quoteChar);
+ w(quoteChar2);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index b5d0d6fc34..c8cc56ffa6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -1235,7 +1235,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
private final List<Namespace> namespaces;
private final String textNodeDelimiter;
- private final boolean addBeanTypes;
+ private final boolean addBeanTypes2;
private final Map<ClassMeta<?>,XmlClassMeta> xmlClassMetas = new
ConcurrentHashMap<>();
private final Map<BeanMeta<?>,XmlBeanMeta> xmlBeanMetas = new
ConcurrentHashMap<>();
private final Map<BeanPropertyMeta,XmlBeanPropertyMeta>
xmlBeanPropertyMetas = new ConcurrentHashMap<>();
@@ -1256,7 +1256,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
enableNamespaces = builder.enableNamespaces;
namespaces = u(nn(builder.namespaces) ? new
ArrayList<>(builder.namespaces) : new ArrayList<>());
textNodeDelimiter = builder.textNodeDelimiter;
- addBeanTypes = addBeanTypesXml || super.isAddBeanTypes();
+ addBeanTypes2 = addBeanTypesXml || super.isAddBeanTypes();
}
@Override /* Overridden from Context */
@@ -1326,7 +1326,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
* through reflection.
*/
@Override
- protected boolean isAddBeanTypes() { return addBeanTypes; }
+ protected boolean isAddBeanTypes() { return addBeanTypes2; }
/**
* Add namespace URLs to the root element.
@@ -1358,7 +1358,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
@Override /* Overridden from WriterSerializer */
protected FluentMap<String,Object> properties() {
return super.properties()
- .a("addBeanTypes", addBeanTypes)
+ .a("addBeanTypes", addBeanTypes2)
.a("addNamespaceUrlsToRoot", addNamespaceUrlsToRoot)
.a("autoDetectNamespaces", autoDetectNamespaces)
.a("defaultNamespace", defaultNamespace)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index 1b280d8c61..2d93555549 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -73,7 +73,7 @@ public class XmlUtils {
Object o = i.next();
if (o instanceof String o2) {
if (prev == null)
- prev = o2.toString();
+ prev = o2;
else {
prev += o2;
i.remove();
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 4776ad73b9..3ec15c7a96 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
@@ -74,7 +74,7 @@ public class JettyMicroservice extends Microservice {
Boolean jettyXmlResolveVars;
Map<String,Servlet> servlets = map();
Map<String,Object> servletAttributes = map();
- JettyMicroserviceListener listener;
+ JettyMicroserviceListener listener2;
JettyServerFactory factory;
/**
@@ -94,7 +94,7 @@ public class JettyMicroservice extends Microservice {
this.jettyXmlResolveVars = copyFrom.jettyXmlResolveVars;
this.servlets = copyOf(copyFrom.servlets);
this.servletAttributes =
copyOf(copyFrom.servletAttributes);
- this.listener = copyFrom.listener;
+ this.listener2 = copyFrom.listener2;
}
@Override /* Overridden from MicroserviceBuilder */
@@ -230,7 +230,7 @@ public class JettyMicroservice extends Microservice {
*/
public Builder listener(JettyMicroserviceListener listener) {
super.listener(listener);
- this.listener = listener;
+ this.listener2 = listener;
return this;
}
@@ -453,7 +453,7 @@ public class JettyMicroservice extends Microservice {
}
}
- final Messages messages = Messages.of(JettyMicroservice.class);
+ final Messages messages2 = Messages.of(JettyMicroservice.class);
private final Builder builder;
final JettyMicroserviceListener listener;
@@ -472,7 +472,7 @@ public class JettyMicroservice extends Microservice {
super(builder);
setInstance(this);
this.builder = builder.copy();
- this.listener = nn(builder.listener) ? builder.listener : new
BasicJettyMicroserviceListener();
+ this.listener = nn(builder.listener2) ? builder.listener2 : new
BasicJettyMicroserviceListener();
this.factory = nn(builder.factory) ? builder.factory : new
BasicJettyServerFactory();
}
@@ -744,7 +744,7 @@ public class JettyMicroservice extends Microservice {
@Override /* Overridden from Microservice */
public synchronized JettyMicroservice stop() throws Exception {
final Logger logger = getLogger();
- final Messages mb2 = messages;
+ final Messages mb2 = messages2;
var t = new Thread("JettyMicroserviceStop") {
@Override /* Overridden from Thread */
public void run() {
@@ -790,7 +790,7 @@ public class JettyMicroservice extends Microservice {
protected int startServer() throws Exception {
listener.onStartServer(this);
server.start();
- out(messages, "ServerStarted", getPort());
+ out(messages2, "ServerStarted", getPort());
listener.onPostStartServer(this);
return getPort();
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
index 6ca35ae949..54a3a2d5b2 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
@@ -106,7 +106,7 @@ public class BasicDateHeader extends BasicHeader {
*/
public BasicDateHeader(String name, String value) {
super(name, value);
- this.value = e(value) ? null :
ZonedDateTime.from(RFC_1123_DATE_TIME.parse(value.toString())).truncatedTo(SECONDS);
+ this.value = e(value) ? null :
ZonedDateTime.from(RFC_1123_DATE_TIME.parse(value)).truncatedTo(SECONDS);
this.supplier = null;
}
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 773b5a73d5..b23eb81c38 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
@@ -390,7 +390,7 @@ public class RestResponse extends
HttpServletResponseWrapper {
}
} else {
encoder = match.getEncoder();
- var encoding =
match.getEncoding().toString();
+ var encoding = match.getEncoding();
// Some clients don't recognize
identity as an encoding, so don't set it.
if (! encoding.equals("identity"))
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
index 9949049798..5068bef016 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
@@ -74,7 +74,7 @@ public class ResourceDescription implements
Comparable<ResourceDescription> {
@Override /* Overridden from Comparable */
public int compareTo(ResourceDescription o) {
- return getName().toString().compareTo(o.getName().toString());
+ return getName().compareTo(o.getName());
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
index 2fee4ddb82..ac891c4739 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
@@ -52,7 +52,7 @@ public class RrpcRestOpSession extends RestOpSession {
*/
public static class Builder extends RestOpSession.Builder {
- private RrpcRestOpContext ctx;
+ private RrpcRestOpContext ctx2;
/**
* Constructor.
@@ -64,7 +64,7 @@ public class RrpcRestOpSession extends RestOpSession {
*/
public Builder(RrpcRestOpContext ctx, RestSession session) {
super(assertArgNotNull(ARG_ctx, ctx),
assertArgNotNull(ARG_session, session));
- this.ctx = ctx;
+ this.ctx2 = ctx;
}
@Override
@@ -97,7 +97,7 @@ public class RrpcRestOpSession extends RestOpSession {
*/
protected RrpcRestOpSession(Builder builder) {
super(builder);
- ctx = builder.ctx;
+ ctx = builder.ctx2;
}
@Override /* Overridden from RestOpSession */
