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 8a774593ed SonarQube bug fixes
8a774593ed is described below
commit 8a774593ed478fc33ba0d5e81dc4284a4407824d
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 17:31:49 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/bean/openapi3/ui/OpenApiUI.java | 2 +-
.../org/apache/juneau/bean/swagger/ui/SwaggerUI.java | 2 +-
.../juneau/assertions/FluentThrowableAssertion.java | 4 ++--
.../org/apache/juneau/commons/collections/Maps.java | 2 +-
.../main/java/org/apache/juneau/BeanRegistry.java | 2 +-
.../java/org/apache/juneau/collections/Args.java | 2 +-
.../apache/juneau/html/HtmlSerializerSession.java | 4 ++--
.../main/java/org/apache/juneau/html/HtmlTag.java | 2 +-
.../apache/juneau/json/JsonSerializerSession.java | 2 +-
.../java/org/apache/juneau/marshaller/OpenApi.java | 2 +-
.../juneau/objecttools/NumberMatcherFactory.java | 4 ++--
.../org/apache/juneau/objecttools/ObjectMerger.java | 2 +-
.../org/apache/juneau/objecttools/ObjectRest.java | 6 +++---
.../apache/juneau/objecttools/ObjectSearcher.java | 4 ++--
.../org/apache/juneau/objecttools/ObjectSorter.java | 2 +-
.../juneau/objecttools/TimeMatcherFactory.java | 6 +++---
.../org/apache/juneau/svl/VarResolverSession.java | 4 ++--
.../apache/juneau/swaps/StackTraceElementSwap.java | 2 +-
.../java/org/apache/juneau/uon/UonParserSession.java | 2 +-
.../org/apache/juneau/uon/UonSerializerSession.java | 4 ++--
.../org/apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlUtils.java | 2 +-
.../microservice/resources/DirectoryResource.java | 4 ++--
.../juneau/microservice/resources/LogsResource.java | 4 ++--
.../apache/juneau/rest/client/RestCallHandler.java | 2 +-
.../org/apache/juneau/rest/client/RestClient.java | 20 ++++++++++----------
.../apache/juneau/rest/client/remote/RemoteMeta.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../java/org/apache/juneau/rest/arg/PathArg.java | 2 +-
.../juneau/rest/beans/ChildResourceDescriptions.java | 2 +-
.../juneau/rest/processor/ResponseBeanProcessor.java | 4 ++--
.../rest/swagger/BasicSwaggerProviderSession.java | 2 +-
.../org/apache/juneau/rest/vars/LocalizationVar.java | 2 +-
.../apache/juneau/rest/widget/MenuItemWidget.java | 2 +-
34 files changed, 56 insertions(+), 56 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
index f80222a968..4f98ef2451 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
@@ -120,7 +120,7 @@ public class OpenApiUI extends ObjectSwap<OpenApi,Div> {
if (m.isEmpty())
return null;
- var select = (Select)null;
+ Select select = null;
if (m.size() > 1) {
select =
select().onchange("selectExample(this)")._class("example-select");
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
index 3493a8777f..a230500c3a 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
@@ -122,7 +122,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
if (m.isEmpty())
return null;
- var select = (Select)null;
+ Select select = null;
if (m.size() > 1) {
select =
select().onchange("selectExample(this)")._class("example-select");
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index 511b7b2e5b..3a1e6132e2 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -257,7 +257,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
* @return An assertion against the throwable message. Never
<jk>null</jk>.
*/
public FluentListAssertion<String,R> asLocalizedMessages() {
- var l = (List<String>)null;
+ List<String> l = null;
Throwable t = orElse(null);
if (nn(t)) {
if (t.getCause() == null)
@@ -306,7 +306,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
* @return An assertion against the throwable message. Never
<jk>null</jk>.
*/
public FluentListAssertion<String,R> asMessages() {
- var l = (List<String>)null;
+ List<String> l = null;
Throwable t = orElse(null);
if (nn(t)) {
if (t.getCause() == null)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
index da49e9d0cd..693818ead4 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
@@ -308,7 +308,7 @@ public class Maps<K,V> {
if (sparse && e(map))
return null;
- var map2 = (Map<K,V>)null;
+ Map<K,V> map2 = null;
if (ordered) {
map2 = new LinkedHashMap<>();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index f745357de7..f642d5c0fc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -149,7 +149,7 @@ public class BeanRegistry {
Map<?,?> m =
BeanCreator.of(Map.class).type(ci).run();
m.forEach((k, v) -> {
var typeName = s(k);
- var val = (ClassMeta<?>)null;
+ ClassMeta<?> val = null;
if (v instanceof Type v2)
val =
bc.getClassMeta(v2);
else if (isArray(v))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
index 338b8ea046..2c052044b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
@@ -149,7 +149,7 @@ public class Args extends JsonMap {
}
// Capture the mapped arguments.
- var key = (String)null;
+ String key = null;
while (! argList.isEmpty()) {
String s = argList.remove(0);
if (startsWith(s, '-')) {
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 bfd470e329..be3a2e0535 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
@@ -291,7 +291,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
* @return The same writer passed in.
* @throws IOException If a problem occurred trying to send output to
the writer.
*/
- private XmlWriter doSerialize(Object o, XmlWriter w) throws
IOException, SerializeException {
+ private XmlWriter doSerialize(Object o, XmlWriter w) throws
SerializeException {
serializeAnything(w, o, getExpectedRootType(o), null, null,
getInitialDepth() - 1, true, false);
return w;
}
@@ -724,7 +724,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
* @return The output target object wrapped in an {@link HtmlWriter}.
* @throws IOException Thrown by underlying stream.
*/
- protected final HtmlWriter getHtmlWriter(SerializerPipe out) throws
IOException {
+ protected final HtmlWriter getHtmlWriter(SerializerPipe out) {
Object output = out.getRawOutput();
if (output instanceof HtmlWriter output2)
return output2;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
index 3aecc9ed2b..7529f12697 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
@@ -82,7 +82,7 @@ enum HtmlTag {
static HtmlTag forString(String tag, boolean end) {
var c = tag.charAt(0);
- var t = (HtmlTag)null;
+ HtmlTag t = null;
if (c == 'u')
t = (end ? xUL : UL);
else if (c == 'l')
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 eba3197880..e212da789a 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,7 +299,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
* @return The output target object wrapped in an {@link JsonWriter}.
* @throws IOException Thrown by underlying stream.
*/
- protected final JsonWriter getJsonWriter(SerializerPipe out) throws
IOException {
+ protected final JsonWriter getJsonWriter(SerializerPipe out) {
var output = out.getRawOutput();
if (output instanceof JsonWriter output2)
return output2;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
index 8c2ec66aae..5948f857e4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
@@ -125,7 +125,7 @@ public class OpenApi extends CharMarshaller {
* @throws ParseException Malformed input encountered.
* @throws IOException Thrown by underlying stream.
*/
- public static <T> T to(HttpPartSchema schema, String input, Class<T>
type) throws ParseException, IOException {
+ public static <T> T to(HttpPartSchema schema, String input, Class<T>
type) throws ParseException {
return DEFAULT.p.parse(HttpPartType.ANY, schema, input, type);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
index 55473ded54..69541a0272 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
@@ -85,8 +85,8 @@ public class NumberMatcherFactory extends MatcherFactory {
var mark = 0;
var isNot = false;
var eq = Equality.NONE;
- var n1 = (Integer)null;
- var n2 = (Integer)null;
+ Integer n1 = null;
+ Integer n2 = null;
int i;
for (i = 0; i < s.length(); i++) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
index bb57c2bbcf..30f934a2db 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
@@ -102,7 +102,7 @@ public class ObjectMerger {
*/
@Override /* Overridden from InvocationHandler */
public Object invoke(Object proxy, Method method, Object[]
args) throws ExecutableException {
- var r = (Object)null;
+ Object r = null;
var isGetter = args == null && method.getReturnType()
!= Void.class;
for (var pojo : pojos) {
if (nn(pojo)) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
index 1da29c7599..55163e8bf1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectRest.java
@@ -964,7 +964,7 @@ public class ObjectRest {
return n;
int i = url.indexOf('/');
String parentKey;
- var childUrl = (String)null;
+ String childUrl = null;
if (i == -1) {
parentKey = url;
} else {
@@ -973,9 +973,9 @@ public class ObjectRest {
}
var o = n.o;
- var o2 = (Object)null;
+ Object o2 = null;
var cm = n.cm;
- var ct2 = (ClassMeta)null;
+ ClassMeta ct2 = null;
if (o == null)
return null;
if (cm.isMap()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index 2ea8d2cb24..39594b6716 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -168,7 +168,7 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
Map m = cm.isMap() ? (Map)o : bs.toBeanMap(o);
for (var e : entryMatchers.entrySet()) {
String key = e.getKey();
- var val = (Object)null;
+ Object val = null;
if (m instanceof BeanMap m2) {
val = m2.getRaw(key);
} else {
@@ -244,7 +244,7 @@ public class ObjectSearcher implements
ObjectTool<SearchArgs> {
if (search.isEmpty() || type == null || !
type.isCollectionOrArray())
return input;
- var l = (List<Object>)null;
+ List<Object> l = null;
var rowMatcher = new RowMatcher(session, search);
if (type.isCollection()) {
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 6f75e56cb7..e14d2a49a3 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
@@ -123,7 +123,7 @@ public class ObjectSorter implements ObjectTool<SortArgs> {
if (! type.isCollectionOrArray())
return input;
- var l = (ArrayList<SortEntry>)null;
+ ArrayList<SortEntry> l = null;
if (type.isArray()) {
var size = Array.getLength(input);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
index d54d1787f5..d8f073d432 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
@@ -88,8 +88,8 @@ public class TimeMatcherFactory extends MatcherFactory {
var state = S1;
var mark = 0;
var eq = Equality.NONE;
- var s1 = (String)null;
- var s2 = (String)null;
+ String s1 = null;
+ String s2 = null;
int i;
char c = 0;
@@ -306,7 +306,7 @@ public class TimeMatcherFactory extends MatcherFactory {
if (ranges.length == 0)
return true;
- var zdt = (ZonedDateTime)null;
+ ZonedDateTime zdt = null;
if (cm.isCalendar()) {
var c = (Calendar)o;
zdt =
c.toInstant().atZone(c.getTimeZone().toZoneId());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index 764170c5a7..e53172a200 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -331,8 +331,8 @@ public class VarResolverSession {
var isInEscape = false;
var hasInternalVar = false;
var hasInnerEscapes = false;
- var varType = (String)null;
- var varVal = (String)null;
+ String varType = null;
+ String varVal = null;
var x = 0;
var x2 = 0;
var depth = 0;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
index a8ab09b14d..75876ab52b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
@@ -46,7 +46,7 @@ public class StackTraceElementSwap extends
ObjectSwap<StackTraceElement,String>
@Override /* Overridden from ObjectSwap */
public StackTraceElement unswap(BeanSession session, String in,
ClassMeta<?> hint) {
var methodName = "";
- var fileName = (String)null;
+ String fileName = null;
int lineNumber = -1;
if (in == null)
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 a4a9e729a0..9b78e9f398 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
@@ -681,7 +681,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
boolean isInEscape = false;
var state = S1;
- var currAttr = (K)null;
+ K currAttr = null;
while (c != -1 && c != AMP) {
c = r.read();
if (! isInEscape) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index 85c0580d30..44ccabf45b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -232,7 +232,7 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
}
}
- private final UonWriter getUonWriter(Writer out) throws Exception {
+ private final UonWriter getUonWriter(Writer out) {
return new UonWriter(this, out, isUseWhitespace(),
getMaxIndent(), isEncoding(), isTrimStrings(), plainTextParams, getQuoteChar(),
getUriResolver());
}
@@ -353,7 +353,7 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
* @return The output target object wrapped in an {@link UonWriter}.
* @throws IOException Thrown by underlying stream.
*/
- protected final UonWriter getUonWriter(SerializerPipe out) throws
IOException {
+ protected final UonWriter getUonWriter(SerializerPipe out) {
var output = out.getRawOutput();
if (output instanceof UonWriter output2)
return output2;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index ef3e3bebec..7c1ace68e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -294,7 +294,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
* @return The output target object wrapped in an {@link XmlWriter}.
* @throws IOException Thrown by underlying stream.
*/
- public final XmlWriter getXmlWriter(SerializerPipe out) throws
IOException {
+ public final XmlWriter getXmlWriter(SerializerPipe out) {
var output = out.getRawOutput();
if (output instanceof XmlWriter output2)
return output2;
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 8c1f5421fc..523ddc5815 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 {
*/
public static LinkedList<Object> collapseTextNodes(LinkedList<Object>
value) {
- var prev = (String)null;
+ String prev = null;
for (ListIterator<Object> i = value.listIterator();
i.hasNext();) {
Object o = i.next();
if (o instanceof String o2) {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 8ab33817b6..56364ead23 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -129,7 +129,7 @@ public class DirectoryResource extends BasicRestServlet {
}
@Html(format = HtmlFormat.HTML_CDC)
- public List<Action> getActions() throws Exception {
+ public List<Action> getActions() {
List<Action> l = list();
if (allowViews && f.canRead() && ! f.isDirectory()) {
l.add(new Action("view", uri + "?method=VIEW"));
@@ -210,7 +210,7 @@ public class DirectoryResource extends BasicRestServlet {
final boolean allowUploads;
final boolean allowViews;
- public DirectoryResource(Config c) throws Exception {
+ public DirectoryResource(Config c) {
rootDir = new
File(c.get(DIRECTORY_RESOURCE_rootDir).orElse("."));
allowViews =
c.get(DIRECTORY_RESOURCE_allowViews).asBoolean().orElse(false);
allowDeletes =
c.get(DIRECTORY_RESOURCE_allowDeletes).asBoolean().orElse(false);
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 03c215dc26..3bb2c929c9 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
@@ -106,7 +106,7 @@ public class LogsResource extends BasicRestServlet {
}
@Html(format = HtmlFormat.HTML_CDC)
- public List<Action> getActions() throws Exception {
+ public List<Action> getActions() {
var l = new ArrayList<Action>();
if (f.canRead() && ! f.isDirectory()) {
l.add(new Action("view", uri + "?method=VIEW"));
@@ -200,7 +200,7 @@ public class LogsResource extends BasicRestServlet {
}
@RestInit
- public void init(Config config) throws Exception {
+ public void init(Config config) {
logDir = new
File(config.get("Logging/logDir").asString().orElse("logs"));
allowDeletes =
config.get("Logging/allowDeletes").asBoolean().orElse(true);
leFormatter = new LogEntryFormatter(
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallHandler.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallHandler.java
index 65583350c4..f9309201bc 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallHandler.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallHandler.java
@@ -85,5 +85,5 @@ public interface RestCallHandler {
* @throws IOException In case of a problem or the connection was
aborted.
* @throws ClientProtocolException In case of an http protocol error.
*/
- HttpResponse run(HttpHost target, HttpRequest request, HttpContext
context) throws ClientProtocolException, IOException;
+ HttpResponse run(HttpHost target, HttpRequest request, HttpContext
context) throws IOException;
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 367701514b..534e082c01 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -6480,7 +6480,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public HttpResponse execute(HttpHost target, HttpRequest request)
throws IOException, ClientProtocolException {
+ public HttpResponse execute(HttpHost target, HttpRequest request)
throws IOException {
return httpClient.execute(target, request);
}
@@ -6508,7 +6508,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public HttpResponse execute(HttpHost target, HttpRequest request,
HttpContext context) throws IOException, ClientProtocolException {
+ public HttpResponse execute(HttpHost target, HttpRequest request,
HttpContext context) throws IOException {
return httpClient.execute(target, request, context);
}
@@ -6534,7 +6534,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public <T> T execute(HttpHost target, HttpRequest request,
ResponseHandler<? extends T> responseHandler) throws IOException,
ClientProtocolException {
+ public <T> T execute(HttpHost target, HttpRequest request,
ResponseHandler<? extends T> responseHandler) throws IOException {
return httpClient.execute(target, request, responseHandler);
}
@@ -6561,7 +6561,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public <T> T execute(HttpHost target, HttpRequest request,
ResponseHandler<? extends T> responseHandler, HttpContext context) throws
IOException, ClientProtocolException {
+ public <T> T execute(HttpHost target, HttpRequest request,
ResponseHandler<? extends T> responseHandler, HttpContext context) throws
IOException {
return httpClient.execute(target, request, responseHandler,
context);
}
@@ -6582,7 +6582,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public HttpResponse execute(HttpUriRequest request) throws IOException,
ClientProtocolException {
+ public HttpResponse execute(HttpUriRequest request) throws IOException {
return httpClient.execute(request);
}
@@ -6604,7 +6604,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public HttpResponse execute(HttpUriRequest request, HttpContext
context) throws IOException, ClientProtocolException {
+ public HttpResponse execute(HttpUriRequest request, HttpContext
context) throws IOException {
return httpClient.execute(request, context);
}
@@ -6627,7 +6627,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public <T> T execute(HttpUriRequest request, ResponseHandler<? extends
T> responseHandler) throws IOException, ClientProtocolException {
+ public <T> T execute(HttpUriRequest request, ResponseHandler<? extends
T> responseHandler) throws IOException {
return httpClient.execute(request, responseHandler);
}
@@ -6651,7 +6651,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws ClientProtocolException In case of an http protocol error.
*/
@Override /* Overridden from HttpClient */
- public <T> T execute(HttpUriRequest request, ResponseHandler<? extends
T> responseHandler, HttpContext context) throws IOException,
ClientProtocolException {
+ public <T> T execute(HttpUriRequest request, ResponseHandler<? extends
T> responseHandler, HttpContext context) throws IOException {
return httpClient.execute(request, responseHandler, context);
}
@@ -7979,7 +7979,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @throws IOException In case of a problem or the connection was
aborted.
* @throws ClientProtocolException In case of an http protocol error.
*/
- protected HttpResponse run(HttpHost target, HttpRequest request,
HttpContext context) throws ClientProtocolException, IOException {
+ protected HttpResponse run(HttpHost target, HttpRequest request,
HttpContext context) throws IOException {
return callHandler.run(target, request, context);
}
@@ -7989,7 +7989,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
try {
Object ret = null;
- var res = (RestResponse)null;
+ RestResponse res = null;
rc.rethrow(RuntimeException.class);
rom.forEachException(rc::rethrow);
if (ror.getReturnValue() == RemoteReturn.NONE) {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index 7b4616d65c..ecc3a5f707 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -65,7 +65,7 @@ public class RemoteMeta {
var remotes =
rstream(ci.getAnnotations(Remote.class).toList()).map(AnnotationInfo::inner).toList();
var versionHeader = "Client-Version";
- var clientVersion = (String)null;
+ String clientVersion = null;
var headers = HeaderList.create().resolving();
for (var r : remotes) {
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 45920ce420..1cd8dc8b09 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
@@ -4932,7 +4932,7 @@ public class RestContext extends Context {
* @return A new builder object.
* @throws ServletException Something bad happened.
*/
- public static Builder create(Class<?> resourceClass, RestContext
parentContext, ServletConfig servletConfig) throws ServletException {
+ public static Builder create(Class<?> resourceClass, RestContext
parentContext, ServletConfig servletConfig) {
return new Builder(resourceClass, parentContext, servletConfig);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
index 0397e42770..27d5d2c5e9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/PathArg.java
@@ -91,7 +91,7 @@ public class PathArg implements RestOpArg {
return null;
// Find matching @Path from class-level pathParams array
- var classLevelPath = (Path)null;
+ Path classLevelPath = null;
for (var p : restAnnotation.pathParams()) {
var pName = firstNonEmpty(p.name(), p.value());
if (paramName.equals(pName)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
index 974d99093d..6202117368 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
@@ -76,7 +76,7 @@ public class ChildResourceDescriptions extends
ResourceDescriptions {
*/
public ChildResourceDescriptions(RestContext context, RestRequest req,
boolean sort) {
for (var e : context.getRestChildren().asMap().entrySet()) {
- var title = (String)null;
+ String title = null;
try {
title =
e.getValue().getSwagger(req.getLocale()).map(x -> x == null ? null :
x.getInfo()).map(x -> x == null ? null : x.getTitle()).orElse(null);
} catch (Exception e1) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
index 3655a0e48e..58b4674564 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
@@ -74,7 +74,7 @@ public class ResponseBeanProcessor implements
ResponseProcessor {
var ps = hm.getSchema();
if ("*".equals(n)) {
for (var o2 : iterate(o)) {
- var h = (Header)null;
+ Header h = null;
if (o2 instanceof Map.Entry
o22) {
var x = o22;
var k = s(x.getKey());
@@ -89,7 +89,7 @@ public class ResponseBeanProcessor implements
ResponseProcessor {
res.addHeader(h);
}
} else {
- var h = (Header)null;
+ Header h = null;
if (o instanceof Header o2)
h = o2;
else if (o instanceof NameValuePair o3)
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 6f2c2c2d2d..e5724eaee3 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
@@ -729,7 +729,7 @@ public class BasicSwaggerProviderSession {
piri.put(examplesKey, examples);
}
- private static void addParamExample(RestOpContext sm, JsonMap piri,
RestPartType in, Type type) throws Exception {
+ private static void addParamExample(RestOpContext sm, JsonMap piri,
RestPartType in, Type type) {
var s = piri.getString(SWAGGER_example);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
index 55487f0dc1..fb50efe87e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
@@ -66,7 +66,7 @@ public class LocalizationVar extends MultipartVar {
if (args.length > 0) {
var key = args[0];
String[] a = (args.length > 1) ?
Arrays.copyOfRange(args, 1, args.length) : new String[0];
- var messages = (Messages)null;
+ Messages messages = null;
if (session.getBean(RestRequest.class).isPresent())
messages =
session.getBean(RestRequest.class).get().getMessages();
if (messages == null)
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 f318d6c809..e715591b4e 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
@@ -122,7 +122,7 @@ public abstract class MenuItemWidget extends Widget {
var sb = new StringBuilder();
// Need a unique number to define unique function names.
- var id = (Integer)null;
+ Integer id = null;
var pre = nullIfEmpty(getBeforeShowScript(req, res));
var post = nullIfEmpty(getAfterShowScript(req, res));
