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 f841c7461 Fix SonarQube issues.
f841c7461 is described below

commit f841c7461fe989a579a2660a2eaa8c9d933c97fd
Author: James Bognar <[email protected]>
AuthorDate: Sun Jul 27 18:02:11 2025 -0400

    Fix SonarQube issues.
---
 .../java/org/apache/juneau/dto/LinkString.java     |  2 +-
 .../java/org/apache/juneau/dto/ResultSetList.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/A.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Abbr.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Address.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Area.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Article.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Aside.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Audio.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/B.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Base.java     |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Bdi.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Bdo.java |  2 +-
 .../org/apache/juneau/dto/html5/Blockquote.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Body.java     |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Br.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Button.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Canvas.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Caption.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Cite.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Code.java     |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Col.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Colgroup.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Data.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Datalist.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Dd.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Del.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Dfn.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Div.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Dl.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Dt.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Em.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Embed.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Fieldset.java |  2 +-
 .../org/apache/juneau/dto/html5/Figcaption.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Figure.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Footer.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Form.java     |  2 +-
 .../main/java/org/apache/juneau/dto/html5/H1.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/H2.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/H3.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/H4.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/H5.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/H6.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Head.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Header.java   |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Hr.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Html.java     |  2 +-
 .../org/apache/juneau/dto/html5/HtmlElement.java   |  6 ++--
 .../juneau/dto/html5/HtmlElementContainer.java     | 10 +++---
 .../apache/juneau/dto/html5/HtmlElementMixed.java  | 10 +++---
 .../juneau/dto/html5/HtmlElementRawText.java       |  2 +-
 .../apache/juneau/dto/html5/HtmlElementText.java   |  2 +-
 .../apache/juneau/dto/html5/HtmlElementVoid.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Iframe.java   |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Img.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Input.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Ins.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Kbd.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Keygen.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Label.java    |  4 +--
 .../java/org/apache/juneau/dto/html5/Legend.java   |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Li.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Link.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Main.java     |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Map.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Mark.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Meta.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Meter.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Nav.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Noscript.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Object_.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Ol.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Optgroup.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Option.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Output.java   |  4 +--
 .../main/java/org/apache/juneau/dto/html5/P.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Param.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Pre.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Progress.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Q.java   |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Rb.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Rp.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Rt.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Rtc.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Ruby.java     |  2 +-
 .../main/java/org/apache/juneau/dto/html5/S.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Samp.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Script.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Section.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Select.java   |  9 ++---
 .../java/org/apache/juneau/dto/html5/Small.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Source.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Span.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Strong.java   |  2 +-
 .../java/org/apache/juneau/dto/html5/Style.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Sub.java |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Sup.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Table.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Tbody.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Td.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Template.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Textarea.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Tfoot.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Th.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Thead.java    |  2 +-
 .../java/org/apache/juneau/dto/html5/Time.java     |  2 +-
 .../java/org/apache/juneau/dto/html5/Title.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Tr.java  |  2 +-
 .../java/org/apache/juneau/dto/html5/Track.java    |  4 +--
 .../main/java/org/apache/juneau/dto/html5/U.java   |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Ul.java  |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Var.java |  2 +-
 .../java/org/apache/juneau/dto/html5/Video.java    |  2 +-
 .../main/java/org/apache/juneau/dto/html5/Wbr.java |  2 +-
 .../apache/juneau/dto/jsonschema/JsonSchema.java   | 38 +++++++++++-----------
 .../juneau/dto/jsonschema/JsonSchemaMap.java       |  8 ++---
 .../org/apache/juneau/dto/jsonschema/JsonType.java |  2 +-
 .../org/apache/juneau/dto/openapi3/HeaderInfo.java |  5 +--
 .../java/org/apache/juneau/dto/openapi3/Items.java | 21 ++++++------
 .../apache/juneau/dto/openapi3/OpenApiElement.java | 20 +++++-------
 .../org/apache/juneau/dto/openapi3/SchemaInfo.java |  8 ++---
 .../apache/juneau/dto/openapi3/ServerVariable.java |  4 +--
 .../org/apache/juneau/dto/swagger/HeaderInfo.java  |  4 +--
 .../java/org/apache/juneau/dto/swagger/Items.java  | 19 +++++------
 .../apache/juneau/dto/swagger/ParameterInfo.java   |  4 +--
 .../org/apache/juneau/dto/swagger/SchemaInfo.java  |  8 ++---
 .../org/apache/juneau/dto/swagger/Swagger.java     |  7 +---
 .../apache/juneau/dto/swagger/SwaggerElement.java  | 21 +++++-------
 .../apache/juneau/dto/swagger/ui/SwaggerUI.java    | 16 ++++-----
 130 files changed, 217 insertions(+), 231 deletions(-)

diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
index 7e203cb2f..157e2d8e1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
@@ -182,7 +182,7 @@ public class LinkString implements Comparable<LinkString> {
 
        @Override /* Object */
        public boolean equals(Object o) {
-               return (o instanceof LinkString) && eq(this, (LinkString)o, 
(x,y)->x.name.equals(y.name));
+               return (o instanceof LinkString o2) && eq(this, o2, 
(x,y)->x.name.equals(y.name));
        }
 
        @Override /* Object */
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
index b94a019c0..665beba4f 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
@@ -60,7 +60,7 @@ public final class ResultSetList extends 
LinkedList<Map<String,Object>> {
                                colTypes[i] = rsmd.getColumnType(i+1);
                        }
 
-                       while (--pos > 0 && rs.next()) {}
+                       while (--pos > 0 && rs.next()) { /* Skip to the 
specified position. */ }
 
                        // Get the rows.
                        while (limit-- > 0 && rs.next()) {
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
index a5e3aa57b..0f31c423d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
@@ -149,7 +149,7 @@ public class A extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public A _class(String _class) {
+       public A _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
index cf5de0662..c7086e191 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
@@ -50,7 +50,7 @@ public class Abbr extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Abbr _class(String _class) {
+       public Abbr _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
index b811b70cf..e6907482d 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
@@ -48,7 +48,7 @@ public class Address extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Address _class(String _class) {
+       public Address _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
index d6a02b847..2214ecbd7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
@@ -193,7 +193,7 @@ public class Area extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Area _class(String _class) {
+       public Area _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
index 4d379a385..8b2dfd1f1 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
@@ -93,7 +93,7 @@ public class Article extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Article _class(String _class) {
+       public Article _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
index 87a990d14..c97f8f4d8 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
@@ -48,7 +48,7 @@ public class Aside extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Aside _class(String _class) {
+       public Aside _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
index e044224c7..638647359 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
@@ -187,7 +187,7 @@ public class Audio extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Audio _class(String _class) {
+       public Audio _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
index f237c88e7..5586fab2e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
@@ -48,7 +48,7 @@ public class B extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public B _class(String _class) {
+       public B _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
index 51fae3f1c..b6898f342 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
@@ -90,7 +90,7 @@ public class Base extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Base _class(String _class) {
+       public Base _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
index befc80f31..123b258fa 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
@@ -48,7 +48,7 @@ public class Bdi extends HtmlElementText {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Bdi _class(String _class) {
+       public Bdi _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
index 4cc5c526a..c958a79b1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
@@ -49,7 +49,7 @@ public class Bdo extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Bdo _class(String _class) {
+       public Bdo _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
index 819a9660e..1149445b5 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
@@ -64,7 +64,7 @@ public class Blockquote extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Blockquote _class(String _class) {
+       public Blockquote _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
index 608336179..f0e05e2a6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
@@ -121,7 +121,7 @@ public class Body extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Body _class(String _class) {
+       public Body _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
index 45ee8973f..cddf5b7e6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
@@ -39,7 +39,7 @@ public class Br extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Br _class(String _class) {
+       public Br _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
index e3e8090a4..0978731d6 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
@@ -245,7 +245,7 @@ public class Button extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Button _class(String _class) {
+       public Button _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
index 4812f1a55..5d46efdff 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
@@ -83,7 +83,7 @@ public class Canvas extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Canvas _class(String _class) {
+       public Canvas _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
index 6fa37c9e7..3f216a742 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
@@ -48,7 +48,7 @@ public class Caption extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Caption _class(String _class) {
+       public Caption _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
index 18203faa0..6f52e4dd3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
@@ -48,7 +48,7 @@ public class Cite extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Cite _class(String _class) {
+       public Cite _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
index 9e3170284..62ab04db0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
@@ -48,7 +48,7 @@ public class Code extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Code _class(String _class) {
+       public Code _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
index d3901bc45..5793f8290 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
@@ -65,7 +65,7 @@ public class Col extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Col _class(String _class) {
+       public Col _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
index 54af24168..3f492979f 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
@@ -65,7 +65,7 @@ public class Colgroup extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Colgroup _class(String _class) {
+       public Colgroup _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
index 08440808f..e1d7fc0b4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
@@ -67,7 +67,7 @@ public class Data extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Data _class(String _class) {
+       public Data _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
index c44e83d23..fb1ad7c22 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
@@ -49,7 +49,7 @@ public class Datalist extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Datalist _class(String _class) {
+       public Datalist _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
index 43a927a47..6df871669 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
@@ -48,7 +48,7 @@ public class Dd extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Dd _class(String _class) {
+       public Dd _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
index 94416fe77..373d1a19c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
@@ -77,7 +77,7 @@ public class Del extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Del _class(String _class) {
+       public Del _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
index 6236eb47f..47ee9181e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
@@ -48,7 +48,7 @@ public class Dfn extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Dfn _class(String _class) {
+       public Dfn _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
index 3386a3377..d8b0429e3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
@@ -48,7 +48,7 @@ public class Div extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Div _class(String _class) {
+       public Div _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
index b5bd515ce..843f13aa5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
@@ -48,7 +48,7 @@ public class Dl extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Dl _class(String _class) {
+       public Dl _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
index fd6a50218..e9e0daec5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
@@ -48,7 +48,7 @@ public class Dt extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Dt _class(String _class) {
+       public Dt _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
index 24019d94b..39db8f4ea 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
@@ -48,7 +48,7 @@ public class Em extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Em _class(String _class) {
+       public Em _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
index 1f130d163..f2f7ebf20 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
@@ -122,7 +122,7 @@ public class Embed extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Embed _class(String _class) {
+       public Embed _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
index abb4a74ae..0a32c2d79 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
@@ -93,7 +93,7 @@ public class Fieldset extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Fieldset _class(String _class) {
+       public Fieldset _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
index a50ab8b4e..62df29a26 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
@@ -48,7 +48,7 @@ public class Figcaption extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Figcaption _class(String _class) {
+       public Figcaption _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
index a88ec2894..bd7d32b8c 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
@@ -48,7 +48,7 @@ public class Figure extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Figure _class(String _class) {
+       public Figure _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
index 5777d27e3..5d565115c 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
@@ -48,7 +48,7 @@ public class Footer extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Footer _class(String _class) {
+       public Footer _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
index f523dee1c..a0703a516 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
@@ -184,7 +184,7 @@ public class Form extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Form _class(String _class) {
+       public Form _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
index e540c22ce..0099bacdd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
@@ -48,7 +48,7 @@ public class H1 extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public H1 _class(String _class) {
+       public H1 _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
index 79c78ec22..15c914b8f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
@@ -48,7 +48,7 @@ public class H2 extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public H2 _class(String _class) {
+       public H2 _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
index 565ba77c9..08d1251e8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
@@ -48,7 +48,7 @@ public class H3 extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public H3 _class(String _class) {
+       public H3 _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
index 27b15a977..e96d3face 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
@@ -48,7 +48,7 @@ public class H4 extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public H4 _class(String _class) {
+       public H4 _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
index a6a5b20fc..57db224a2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
@@ -48,7 +48,7 @@ public class H5 extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public H5 _class(String _class) {
+       public H5 _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
index 76ed2daba..7efe1eb64 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
@@ -48,7 +48,7 @@ public class H6 extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public H6 _class(String _class) {
+       public H6 _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
index 158a8f9fb..536e6f98d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
@@ -48,7 +48,7 @@ public class Head extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Head _class(String _class) {
+       public Head _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
index f541a6c21..933840970 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
@@ -48,7 +48,7 @@ public class Header extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Header _class(String _class) {
+       public Header _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
index ce973afc8..fe16d198d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
@@ -39,7 +39,7 @@ public class Hr extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Hr _class(String _class) {
+       public Hr _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
index 557f42f96..05766f5b3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
@@ -63,7 +63,7 @@ public class Html extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Html _class(String _class) {
+       public Html _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
index 3fa54a4a5..24e63dcb5 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
@@ -161,7 +161,7 @@ public abstract class HtmlElement {
         * @return This object.
         */
        @FluentSetter
-       public HtmlElement _class(String _class) {
+       public HtmlElement _class(String _class) {  // NOSONAR - Intentional 
naming.
                attr("class", _class);
                return this;
        }
@@ -918,8 +918,8 @@ public abstract class HtmlElement {
         * @return The deminimized value, or the same value if the value wasn't 
a boolean.
         */
        protected Object deminimize(Object value, String attr) {
-               if (value instanceof Boolean) {
-                       if ((Boolean)value)
+               if (value instanceof Boolean b) {
+                       if (Boolean.TRUE.equals(b))
                                return attr;
                        return null;
                }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
index 13b1b9e92..d93c87c97 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
@@ -85,10 +85,10 @@ public class HtmlElementContainer extends HtmlElement {
                        return getChild(index[0]);
                Object c = this;
                for (int element : index) {
-                       if (c instanceof HtmlElementMixed)
-                               c = ((HtmlElementMixed)c).getChild(element);
-                       else if (c instanceof HtmlElementContainer)
-                               c = ((HtmlElementContainer)c).getChild(element);
+                       if (c instanceof HtmlElementMixed x)
+                               c = x.getChild(element);
+                       else if (c instanceof HtmlElementContainer x)
+                               c = x.getChild(element);
                        else
                                return null;
                }
@@ -145,7 +145,7 @@ public class HtmlElementContainer extends HtmlElement {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public HtmlElementContainer _class(String _class) {
+       public HtmlElementContainer _class(String _class) {  // NOSONAR - 
Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index 807d394be..7abbafda7 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
@@ -85,10 +85,10 @@ public class HtmlElementMixed extends HtmlElement {
                        return getChild(index[0]);
                Object c = this;
                for (int element : index) {
-                       if (c instanceof HtmlElementMixed)
-                               c = ((HtmlElementMixed)c).getChild(element);
-                       else if (c instanceof HtmlElementContainer)
-                               c = ((HtmlElementContainer)c).getChild(element);
+                       if (c instanceof HtmlElementMixed x)
+                               c = x.getChild(element);
+                       else if (c instanceof HtmlElementContainer x)
+                               c = x.getChild(element);
                        else
                                return null;
                }
@@ -152,7 +152,7 @@ public class HtmlElementMixed extends HtmlElement {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public HtmlElementMixed _class(String _class) {
+       public HtmlElementMixed _class(String _class) {  // NOSONAR - 
Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
index d7fc3e858..1db617688 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
@@ -67,7 +67,7 @@ public class HtmlElementRawText extends HtmlElement {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public HtmlElementRawText _class(String _class) {
+       public HtmlElementRawText _class(String _class) {  // NOSONAR - 
Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
index 2d66c79aa..6753149de 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
@@ -66,7 +66,7 @@ public class HtmlElementText extends HtmlElement {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public HtmlElementText _class(String _class) {
+       public HtmlElementText _class(String _class) {  // NOSONAR - 
Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
index 036c51ccf..fba9ddb76 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
@@ -34,7 +34,7 @@ public class HtmlElementVoid extends HtmlElement {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public HtmlElementVoid _class(String _class) {
+       public HtmlElementVoid _class(String _class) {  // NOSONAR - 
Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
index ca0371e97..ee01f3d16 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
@@ -152,7 +152,7 @@ public class Iframe extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Iframe _class(String _class) {
+       public Iframe _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
index 4e2307307..f550d07e9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
@@ -168,7 +168,7 @@ public class Img extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Img _class(String _class) {
+       public Img _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
index 60cdd9c62..f36b552a8 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
@@ -541,7 +541,7 @@ public class Input extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Input _class(String _class) {
+       public Input _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
index cb912fc8d..9749d58b0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
@@ -77,7 +77,7 @@ public class Ins extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Ins _class(String _class) {
+       public Ins _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
index d3667492e..78b578e00 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
@@ -48,7 +48,7 @@ public class Kbd extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Kbd _class(String _class) {
+       public Kbd _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
index 75815e34b..2a4a2c5cd 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
@@ -128,7 +128,7 @@ public class Keygen extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Keygen _class(String _class) {
+       public Keygen _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
index 706ec324d..ba1c487af 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
@@ -50,7 +50,7 @@ public class Label extends HtmlElementMixed {
         * @param _for The new value for this attribute.
         * @return This object.
         */
-       public final Label _for(String _for) {
+       public final Label _for(String _for) {  // NOSONAR - Intentional naming.
                attr("for", _for);
                return this;
        }
@@ -77,7 +77,7 @@ public class Label extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Label _class(String _class) {
+       public Label _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
index 2cf659deb..f4b682fa4 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
@@ -48,7 +48,7 @@ public class Legend extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Legend _class(String _class) {
+       public Legend _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
index f803d587d..b443578ce 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
@@ -48,7 +48,7 @@ public class Li extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Li _class(String _class) {
+       public Li _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
index ea703bc9c..5e253c714 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
@@ -161,7 +161,7 @@ public class Link extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Link _class(String _class) {
+       public Link _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
index 917005683..dbaf4d21c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
@@ -48,7 +48,7 @@ public class Main extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Main _class(String _class) {
+       public Main _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
index d57df491c..1c5578c84 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
@@ -63,7 +63,7 @@ public class Map extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Map _class(String _class) {
+       public Map _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
index deac3636c..44be5132f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
@@ -48,7 +48,7 @@ public class Mark extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Mark _class(String _class) {
+       public Mark _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
index 989ad8c91..ea60826e2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
@@ -99,7 +99,7 @@ public class Meta extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Meta _class(String _class) {
+       public Meta _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
index 12018df41..46636cdde 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
@@ -145,7 +145,7 @@ public class Meter extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Meter _class(String _class) {
+       public Meter _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
index 7f7c21a25..e383f3cbb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
@@ -48,7 +48,7 @@ public class Nav extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Nav _class(String _class) {
+       public Nav _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
index e7fb5e3df..6d9e65724 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
@@ -49,7 +49,7 @@ public class Noscript extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Noscript _class(String _class) {
+       public Noscript _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
index f6754fbb9..ac333c854 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
@@ -170,7 +170,7 @@ public class Object_ extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Object_ _class(String _class) {
+       public Object_ _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
index fa7e0299a..7c5c8cfe2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
@@ -96,7 +96,7 @@ public class Ol extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Ol _class(String _class) {
+       public Ol _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
index 11279d36e..17f134d86 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
@@ -79,7 +79,7 @@ public class Optgroup extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Optgroup _class(String _class) {
+       public Optgroup _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
index 22dd91fab..c193ea450 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
@@ -122,7 +122,7 @@ public class Option extends HtmlElementText {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Option _class(String _class) {
+       public Option _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
index 741283b03..d5e9e99b2 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
@@ -50,7 +50,7 @@ public class Output extends HtmlElementMixed {
         * @param _for The new value for this attribute.
         * @return This object.
         */
-       public final Output _for(String _for) {
+       public final Output _for(String _for) {  // NOSONAR - Intentional 
naming.
                attr("for", _for);
                return this;
        }
@@ -91,7 +91,7 @@ public class Output extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Output _class(String _class) {
+       public Output _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
index 250ec989d..593380023 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
@@ -48,7 +48,7 @@ public class P extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public P _class(String _class) {
+       public P _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
index c62a27334..972c3afff 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
@@ -82,7 +82,7 @@ public class Param extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Param _class(String _class) {
+       public Param _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
index 3cd75baa4..483e83968 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
@@ -60,7 +60,7 @@ public class Pre extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Pre _class(String _class) {
+       public Pre _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
index 77be9fde5..0698c5f04 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
@@ -81,7 +81,7 @@ public class Progress extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Progress _class(String _class) {
+       public Progress _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
index 25fec9a49..49eab8547 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
@@ -63,7 +63,7 @@ public class Q extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Q _class(String _class) {
+       public Q _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
index 29559c85c..4fbd0f56e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
@@ -48,7 +48,7 @@ public class Rb extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Rb _class(String _class) {
+       public Rb _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
index c1a30dd63..310380e7e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
@@ -48,7 +48,7 @@ public class Rp extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Rp _class(String _class) {
+       public Rp _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
index 9a6ca126b..55770a686 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
@@ -48,7 +48,7 @@ public class Rt extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Rt _class(String _class) {
+       public Rt _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
index e3ffabc35..dd9d523f4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
@@ -48,7 +48,7 @@ public class Rtc extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Rtc _class(String _class) {
+       public Rtc _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
index 0cafea17c..888e13ecd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
@@ -48,7 +48,7 @@ public class Ruby extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Ruby _class(String _class) {
+       public Ruby _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
index e5b5fe886..c905e6fb9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
@@ -48,7 +48,7 @@ public class S extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public S _class(String _class) {
+       public S _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
index 59eeec138..560de84fa 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
@@ -48,7 +48,7 @@ public class Samp extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Samp _class(String _class) {
+       public Samp _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
index b2550fd70..1ccd9bc78 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
@@ -154,7 +154,7 @@ public class Script extends HtmlElementRawText {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Script _class(String _class) {
+       public Script _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
index 2f6988c76..196b48ab7 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
@@ -48,7 +48,7 @@ public class Section extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Section _class(String _class) {
+       public Section _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
index c079caef5..e3db46708 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
@@ -161,11 +161,8 @@ public class Select extends HtmlElementContainer {
        public Select choose(Object optionValue) {
                if (optionValue != null) {
                        getChildren().forEach(x -> {
-                               if (x instanceof Option) {
-                                       Option o = (Option)x;
-                                       if (eq(optionValue.toString(), 
o.getAttr(String.class, "value")))
-                                               o.selected(true);
-                               }
+                               if (x instanceof Option o && 
eq(optionValue.toString(), o.getAttr(String.class, "value")))
+                                       o.selected(true);
                        });
                }
                return this;
@@ -178,7 +175,7 @@ public class Select extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Select _class(String _class) {
+       public Select _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
index dd86e79fc..6c8e86786 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
@@ -48,7 +48,7 @@ public class Small extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Small _class(String _class) {
+       public Small _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
index d6e89f1eb..b2f6b6032 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
@@ -91,7 +91,7 @@ public class Source extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Source _class(String _class) {
+       public Source _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
index 37226b5a4..5d5b107f1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
@@ -48,7 +48,7 @@ public class Span extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Span _class(String _class) {
+       public Span _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
index 1a1669810..75aad98e7 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
@@ -48,7 +48,7 @@ public class Strong extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Strong _class(String _class) {
+       public Strong _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
index 121884275..84071f4ea 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
@@ -90,7 +90,7 @@ public class Style extends HtmlElementRawText {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Style _class(String _class) {
+       public Style _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
index fa87a2ecc..5d1f5a6db 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
@@ -48,7 +48,7 @@ public class Sub extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Sub _class(String _class) {
+       public Sub _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
index 99ae0f02d..3f32faaeb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
@@ -48,7 +48,7 @@ public class Sup extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Sup _class(String _class) {
+       public Sup _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
index e623c28d9..b3c4c96b3 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
@@ -62,7 +62,7 @@ public class Table extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Table _class(String _class) {
+       public Table _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
index 5d6eb3904..ff5820c14 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
@@ -48,7 +48,7 @@ public class Tbody extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Tbody _class(String _class) {
+       public Tbody _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
index a45861a89..a02c13535 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
@@ -95,7 +95,7 @@ public class Td extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Td _class(String _class) {
+       public Td _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
index fce8b50aa..4264d5421 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
@@ -49,7 +49,7 @@ public class Template extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Template _class(String _class) {
+       public Template _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
index 97c9f879e..c12d37049 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
@@ -278,7 +278,7 @@ public class Textarea extends HtmlElementRawText {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Textarea _class(String _class) {
+       public Textarea _class(String _class) {  // NOSONAR - Intentional 
naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
index 2a013459a..03e6565d5 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
@@ -48,7 +48,7 @@ public class Tfoot extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Tfoot _class(String _class) {
+       public Tfoot _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
index e4708e53d..f3eab9faa 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
@@ -137,7 +137,7 @@ public class Th extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Th _class(String _class) {
+       public Th _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
index a59c70b05..fdba448dd 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
@@ -48,7 +48,7 @@ public class Thead extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Thead _class(String _class) {
+       public Thead _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
index 4a9e86d15..46a5f9015 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
@@ -64,7 +64,7 @@ public class Time extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Time _class(String _class) {
+       public Time _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
index 112020225..8d3995b41 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
@@ -48,7 +48,7 @@ public class Title extends HtmlElementRawText {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Title _class(String _class) {
+       public Title _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
index 956896bad..d05aea767 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
@@ -48,7 +48,7 @@ public class Tr extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Tr _class(String _class) {
+       public Tr _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
index 1175be3e3..dfa57980b 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
@@ -56,7 +56,7 @@ public class Track extends HtmlElementVoid {
         * @param _default The new value for this attribute.
         * @return This object.
         */
-       public final Track _default(String _default) {
+       public final Track _default(String _default) {  // NOSONAR - 
Intentional naming.
                attr("default", _default);
                return this;
        }
@@ -135,7 +135,7 @@ public class Track extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Track _class(String _class) {
+       public Track _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
index 97d3c99a1..47bb2219d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
@@ -48,7 +48,7 @@ public class U extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public U _class(String _class) {
+       public U _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
index b4ad21a21..b593351cf 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
@@ -48,7 +48,7 @@ public class Ul extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Ul _class(String _class) {
+       public Ul _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
index 9dca2c12c..36c768d4c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
@@ -48,7 +48,7 @@ public class Var extends HtmlElementMixed {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Var _class(String _class) {
+       public Var _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
index 3b18ffaf2..e016166e7 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
@@ -235,7 +235,7 @@ public class Video extends HtmlElementContainer {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Video _class(String _class) {
+       public Video _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
index 9e5944f87..3970ca3f0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
@@ -39,7 +39,7 @@ public class Wbr extends HtmlElementVoid {
        // <FluentSetters>
 
        @Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-       public Wbr _class(String _class) {
+       public Wbr _class(String _class) {  // NOSONAR - Intentional naming.
                super._class(_class);
                return this;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index a626e17e1..3f4971339 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -68,7 +68,7 @@ public class JsonSchema {
        private List<String> required;
        private Boolean additionalPropertiesBoolean;           // Boolean 
representation of additionalProperties
        private JsonSchema additionalPropertiesSchema;             // 
JsonSchema representation of additionalProperties
-       private List<String> _enum;
+       private List<String> _enum;  // NOSONAR - Intentional naming.
        private List<JsonSchema> allOf;
        private List<JsonSchema> anyOf;
        private List<JsonSchema> oneOf;
@@ -255,10 +255,10 @@ public class JsonSchema {
                this.typeJsonType = null;
                this.typeJsonTypeArray = null;
                if (type != null) {
-                       if (type instanceof JsonType)
-                               this.typeJsonType = (JsonType)type;
-                       else if (type instanceof JsonTypeArray)
-                               this.typeJsonTypeArray = (JsonTypeArray)type;
+                       if (type instanceof JsonType x)
+                               this.typeJsonType = x;
+                       else if (type instanceof JsonTypeArray x)
+                               this.typeJsonTypeArray = x;
                        else
                                throw new 
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}'' 
passed in.  Must be one of the following:  SimpleType, SimpleTypeArray", 
className(type));
                }
@@ -607,11 +607,11 @@ public class JsonSchema {
                this.itemsSchema = null;
                this.itemsSchemaArray = null;
                if (items != null) {
-                       if (items instanceof JsonSchema) {
-                               this.itemsSchema = (JsonSchema)items;
+                       if (items instanceof JsonSchema x) {
+                               this.itemsSchema = x;
                                setMasterOn(this.itemsSchema);
-                       } else if (items instanceof JsonSchemaArray) {
-                               this.itemsSchemaArray = (JsonSchemaArray)items;
+                       } else if (items instanceof JsonSchemaArray x) {
+                               this.itemsSchemaArray = x;
                                setMasterOn(this.itemsSchemaArray);
                        } else {
                                throw new 
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}'' 
passed in.  Must be one of the following:  JsonSchema, JsonSchemaArray", 
className(items));
@@ -852,10 +852,10 @@ public class JsonSchema {
                this.additionalItemsBoolean = null;
                this.additionalItemsSchemaArray = null;
                if (additionalItems != null) {
-                       if (additionalItems instanceof Boolean)
-                               this.additionalItemsBoolean = 
(Boolean)additionalItems;
-                       else if (additionalItems instanceof JsonSchemaArray) {
-                               this.additionalItemsSchemaArray = 
(JsonSchemaArray)additionalItems;
+                       if (additionalItems instanceof Boolean x)
+                               this.additionalItemsBoolean = x;
+                       else if (additionalItems instanceof JsonSchemaArray x) {
+                               this.additionalItemsSchemaArray = x;
                                setMasterOn(this.additionalItemsSchemaArray);
                        } else {
                                throw new 
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}'' 
passed in.  Must be one of the following:  Boolean, JsonSchemaArray", 
className(additionalItems));
@@ -1129,10 +1129,10 @@ public class JsonSchema {
                this.additionalPropertiesBoolean = null;
                this.additionalPropertiesSchema = null;
                if (additionalProperties != null) {
-                       if (additionalProperties instanceof Boolean)
-                               this.additionalPropertiesBoolean = 
(Boolean)additionalProperties;
-                       else if (additionalProperties instanceof JsonSchema) {
-                               this.additionalPropertiesSchema = 
(JsonSchema)additionalProperties;
+                       if (additionalProperties instanceof Boolean x)
+                               this.additionalPropertiesBoolean = x;
+                       else if (additionalProperties instanceof JsonSchema x) {
+                               this.additionalPropertiesSchema = x;
                                setMasterOn(this.additionalPropertiesSchema);
                        } else
                                throw new 
BeanRuntimeException(JsonSchemaProperty.class,
@@ -1188,7 +1188,7 @@ public class JsonSchema {
         * @param _enum The new value for the <property>enum</property> 
property on this bean.
         * @return This object.
         */
-       public JsonSchema setEnum(List<String> _enum) {
+       public JsonSchema setEnum(List<String> _enum) {  // NOSONAR - 
Intentional naming.
                this._enum = _enum;
                return this;
        }
@@ -1199,7 +1199,7 @@ public class JsonSchema {
         * @param _enum The list of items to append to the 
<property>enum</property> property on this bean.
         * @return This object.
         */
-       public JsonSchema addEnum(String..._enum) {
+       public JsonSchema addEnum(String..._enum) {  // NOSONAR - Intentional 
naming.
                if (this._enum == null)
                        this._enum = new LinkedList<>();
                for (String e : _enum)
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
index b4b2a0121..79242b2c5 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
@@ -58,8 +58,8 @@ public abstract class JsonSchemaMap extends 
ConcurrentHashMap<URI,JsonSchema> {
         */
        @Override /* Map */
        public JsonSchema get(Object uri) {
-               URI u = toURI(uri);
-               JsonSchema s = super.get(u);
+               var u = toURI(uri);
+               var s = super.get(u);
                if (s != null)
                        return s;
                synchronized(this) {
@@ -84,7 +84,7 @@ public abstract class JsonSchemaMap extends 
ConcurrentHashMap<URI,JsonSchema> {
         * @throws RuntimeException If one or more schema objects did not have 
their ID property set.
         */
        public JsonSchemaMap add(JsonSchema...schemas) {
-               for (JsonSchema schema : schemas) {
+               for (var schema : schemas) {
                        if (schema.getId() == null)
                                throw new IllegalArgumentException("Schema with 
no ID passed to JsonSchemaMap.add(Schema...)");
                        put(schema.getId(), schema);
@@ -108,7 +108,7 @@ public abstract class JsonSchemaMap extends 
ConcurrentHashMap<URI,JsonSchema> {
         * @return The parsed schema.
         */
        public JsonSchema load(URI uri) {
-               try (Reader r = getReader(uri)) {
+               try (var r = getReader(uri)) {
                        if (r == null)
                                return null;
                        return JsonParser.DEFAULT.parse(r, JsonSchema.class);
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index 2e2f5e4ba..19c70ed22 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -78,7 +78,7 @@ public enum JsonType {
                char c = value.charAt(0);
                if (c == 'a') {
                        if (value.equals("array"))
-                       return ARRAY;
+                               return ARRAY;
                        if (value.equals("any"))
                                return ANY;
                }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.java
index ecb1717bc..34ca74912 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.java
@@ -87,10 +87,11 @@ public class HeaderInfo extends OpenApiElement {
                this.deprecated = copyFrom.deprecated;
                if (copyFrom.examples == null)
                        this.examples = null;
-               else
+               else {
                        this.examples = new LinkedHashMap<>();
                        for (Map.Entry<String,Example> e : 
copyFrom.examples.entrySet())
-                               this.examples.put(e.getKey(),   
e.getValue().copy());
+                               this.examples.put(e.getKey(), 
e.getValue().copy());
+               }
        }
 
        /**
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.java
index 31db60487..d11b218d8 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.java
@@ -79,8 +79,8 @@ public class Items extends OpenApiElement {
                exclusiveMinimum,
                uniqueItems;
        private Items items;
-       private Object _default;
-       private List<Object> _enum;
+       private Object _default;  // NOSONAR - Intentional naming.
+       private List<Object> _enum;  // NOSONAR - Intentional naming.
 
        /**
         * Default constructor.
@@ -777,24 +777,23 @@ public class Items extends OpenApiElement {
 
        /* Resolve references in extra attributes */
        private Object resolveRefs(Object o, Swagger swagger, Deque<String> 
refStack, int maxDepth) {
-               if (o instanceof JsonMap) {
-                       JsonMap om = (JsonMap)o;
-                       Object ref = om.get("$ref");
-                       if (ref instanceof CharSequence) {
-                               String sref = ref.toString();
+               if (o instanceof JsonMap om) {
+                       var ref2 = om.get("$ref");
+                       if (ref2 instanceof CharSequence) {
+                               var sref = ref2.toString();
                                if (refStack.contains(sref) || refStack.size() 
>= maxDepth)
                                        return o;
                                refStack.addLast(sref);
-                               Object o2 = swagger.findRef(sref, Object.class);
+                               var o2 = swagger.findRef(sref, Object.class);
                                o2 = resolveRefs(o2, swagger, refStack, 
maxDepth);
                                refStack.removeLast();
                                return o2;
                        }
-                       for (Map.Entry<String,Object> e : om.entrySet())
+                       for (var e : om.entrySet())
                                e.setValue(resolveRefs(e.getValue(), swagger, 
refStack, maxDepth));
                }
-               if (o instanceof JsonList)
-                       for (ListIterator<Object> li = 
((JsonList)o).listIterator(); li.hasNext();)
+               if (o instanceof JsonList x)
+                       for (var li = x.listIterator(); li.hasNext();)
                                li.set(resolveRefs(li.next(), swagger, 
refStack, maxDepth));
                return o;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.java
index 828db225b..cce024fa2 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.java
@@ -88,10 +88,9 @@ public abstract class OpenApiElement {
        public <T> T get(String property, Class<T> type) {
                if (property == null)
                        return null;
-               switch (property) {
-                       case "strict": return toType(isStrict(), type);
-                       default: return toType(get(property), type);
-               }
+               if ("strict".equals(property))
+                       return toType(isStrict(), type);
+               return toType(get(property), type);
        }
 
        /**
@@ -124,14 +123,13 @@ public abstract class OpenApiElement {
        public OpenApiElement set(String property, Object value) {
                if (property == null)
                        return this;
-               switch (property) {
-                       case "strict": return strict(value);
-                       default:
-                               if (extra == null)
-                                       extra = new LinkedHashMap<>();
-                               extra.put(property, value);
-                               return this;
+               if ("strict".equals(property)) {
+                       return strict(value);
                }
+               if (extra == null)
+                       extra = new LinkedHashMap<>();
+               extra.put(property, value);
+               return this;
        }
 
        /**
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.java
index 29cede949..5a6367265 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.java
@@ -88,7 +88,7 @@ public class SchemaInfo extends OpenApiElement {
                readOnly,
                deprecated;
        private Object
-               _default,
+               _default,  // NOSONAR - Intentional naming.
                example;
        private Items items;
        private Xml xml;
@@ -97,7 +97,7 @@ public class SchemaInfo extends OpenApiElement {
                        allOf,
                        oneOf,
                        anyOf,
-                       _enum;
+                       _enum;  // NOSONAR - Intentional naming.
        private List<String>
                required;
        private Discriminator discriminator;
@@ -1155,7 +1155,7 @@ public class SchemaInfo extends OpenApiElement {
        public <T> T get(String property, Class<T> type) {
                if (property == null)
                        return null;
-               switch (property) {
+               switch (property) {  // NOSONAR
                        case "format": return toType(getFormat(), type);
                        case "title": return toType(getTitle(), type);
                        case "description": return toType(getDescription(), 
type);
@@ -1200,7 +1200,7 @@ public class SchemaInfo extends OpenApiElement {
        public SchemaInfo set(String property, Object value) {
                if (property == null)
                        return this;
-               switch (property) {
+               switch (property) {  // NOSONAR
                        case "format": return setFormat(stringify(value));
                        case "title": return setTitle(stringify(value));
                        case "description": return 
setDescription(stringify(value));
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.java
index b9567adaa..219bbae81 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.java
@@ -30,8 +30,8 @@ import java.util.Set;
 @FluentSetters
 public class ServerVariable extends OpenApiElement {
 
-       private List<Object> _enum;
-       private String _default;
+       private List<Object> _enum;  // NOSONAR - Intentional naming.
+       private String _default;  // NOSONAR - Intentional naming.
        private String description;
 
        /**
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index 2be44e8a0..f8ba8f895 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -78,8 +78,8 @@ public class HeaderInfo extends SwaggerElement {
                exclusiveMinimum,
                uniqueItems;
        private Items items;
-       private Object _default;
-       private Set<Object> _enum;
+       private Object _default;  // NOSONAR - Intentional naming.
+       private Set<Object> _enum;  // NOSONAR - Intentional naming.
        private Object example;
 
        /**
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index 37ecf6686..72f183b8d 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -80,8 +80,8 @@ public class Items extends SwaggerElement {
                exclusiveMinimum,
                uniqueItems;
        private Items items;
-       private Object _default;
-       private Set<Object> _enum;
+       private Object _default;  // NOSONAR - Intentional naming.
+       private Set<Object> _enum;  // NOSONAR - Intentional naming.
 
        /**
         * Default constructor.
@@ -751,23 +751,22 @@ public class Items extends SwaggerElement {
 
        /* Resolve references in extra attributes */
        private Object resolveRefs(Object o, Swagger swagger, Deque<String> 
refStack, int maxDepth) {
-               if (o instanceof JsonMap) {
-                       JsonMap om = (JsonMap)o;
-                       Object ref = om.get("$ref");
-                       if (ref instanceof CharSequence) {
-                               String sref = ref.toString();
+               if (o instanceof JsonMap om) {
+                       var ref2 = om.get("$ref");
+                       if (ref2 instanceof CharSequence) {
+                               var sref = ref2.toString();
                                if (refStack.contains(sref) || refStack.size() 
>= maxDepth)
                                        return o;
                                refStack.addLast(sref);
-                               Object o2 = swagger.findRef(sref, Object.class);
+                               var o2 = swagger.findRef(sref, Object.class);
                                o2 = resolveRefs(o2, swagger, refStack, 
maxDepth);
                                refStack.removeLast();
                                return o2;
                        }
                        om.entrySet().forEach(x -> 
x.setValue(resolveRefs(x.getValue(), swagger, refStack, maxDepth)));
                }
-               if (o instanceof JsonList)
-                       for (ListIterator<Object> li = 
((JsonList)o).listIterator(); li.hasNext();)
+               if (o instanceof JsonList x)
+                       for (ListIterator<Object> li = x.listIterator(); 
li.hasNext();)
                                li.set(resolveRefs(li.next(), swagger, 
refStack, maxDepth));
                return o;
        }
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 7d932e542..da80db4ae 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -124,8 +124,8 @@ public class ParameterInfo extends SwaggerElement {
                uniqueItems;
        private SchemaInfo schema;
        private Items items;
-       private Object _default;
-       private Set<Object> _enum;
+       private Object _default;  // NOSONAR - Intentional naming.
+       private Set<Object> _enum;  // NOSONAR - Intentional naming.
        private Object example;
        private Map<String,String> examples;
 
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 36828122a..698a596f6 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -88,13 +88,13 @@ public class SchemaInfo extends SwaggerElement {
                readOnly,
                required;
        private Object
-               _default,
+               _default,  // NOSONAR - Intentional naming.
                example;
        private Items items;
        private Xml xml;
        private ExternalDocumentation externalDocs;
        private Set<Object>
-               _enum,
+               _enum,  // NOSONAR - Intentional naming.
                allOf;
        private Set<String>
                requiredProperties;
@@ -994,7 +994,7 @@ public class SchemaInfo extends SwaggerElement {
        public <T> T get(String property, Class<T> type) {
                if (property == null)
                        return null;
-               switch (property) {
+               switch (property) {  // NOSONAR
                        case "additionalProperties": return 
toType(getAdditionalProperties(), type);
                        case "allOf": return toType(getAllOf(), type);
                        case "default": return toType(getDefault(), type);
@@ -1034,7 +1034,7 @@ public class SchemaInfo extends SwaggerElement {
        public SchemaInfo set(String property, Object value) {
                if (property == null)
                        return this;
-               switch (property) {
+               switch (property) {  // NOSONAR
                        case "additionalProperties": return 
setAdditionalProperties(toType(value, SchemaInfo.class));
                        case "allOf": return setAllOf(value);
                        case "default": return setDefault(value);
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index d0e87a94c..9ffc45680 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -462,12 +462,7 @@ public class Swagger extends SwaggerElement {
        public Swagger addPath(String path, String methodName, Operation 
operation) {
                if (paths == null)
                        paths = new TreeMap<>(PATH_COMPARATOR);
-               OperationMap p = paths.get(path);
-               if (p == null) {
-                       p = new OperationMap();
-                       paths.put(path, p);
-               }
-               p.put(methodName, operation);
+               getPaths().computeIfAbsent(path, k -> new 
OperationMap()).put(methodName, operation);
                return this;
        }
 
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
index 8856510ca..483f5fae2 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
@@ -89,10 +89,9 @@ public abstract class SwaggerElement {
        public <T> T get(String property, Class<T> type) {
                if (property == null)
                        return null;
-               switch (property) {
-                       case "strict": return toType(isStrict(), type);
-                       default: return toType(get(property), type);
-               }
+               if ("strict".equals(property))
+                       return toType(isStrict(), type);
+               return toType(get(property), type);
        }
 
        /**
@@ -125,14 +124,12 @@ public abstract class SwaggerElement {
        public SwaggerElement set(String property, Object value) {
                if (property == null)
                        return this;
-               switch (property) {
-                       case "strict": return strict(value);
-                       default:
-                               if (extra == null)
-                                       extra = map();
-                               extra.put(property, value);
-                               return this;
-               }
+               if ("strict".equals(property))
+                       return strict(value);
+               if (extra == null)
+                       extra = map();
+               extra.put(property, value);
+               return this;
        }
 
        /**
diff --git 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
index 6540baaaa..365a9afca 100644
--- 
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
+++ 
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
@@ -74,7 +74,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
 
                Div outer = div(
                        style(css),
-                       script("text/javascript", new 
String[]{RESOURCES.getString("SwaggerUI.js", null).orElse(null)}),
+                       script("text/javascript", 
RESOURCES.getString("SwaggerUI.js", null).orElse(null)),
                        header(s)
                )._class("swagger-ui");
 
@@ -166,12 +166,12 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
        private Div tagBlockContents(Session s, Tag t) {
                Div tagBlockContents = div()._class("tag-block-contents");
 
-               s.swagger.getPaths().forEach((path,v) -> {
+               s.swagger.getPaths().forEach((path,v) ->
                        v.forEach((opName,op) -> {
                                if ((t == null && op.getTags() == null) || (t 
!= null && op.getTags() != null && op.getTags() != null && 
op.getTags().contains(t.getName())))
                                        tagBlockContents.child(opBlock(s, path, 
opName, op));
-                       });
-               });
+                       })
+               );
 
                return tagBlockContents;
        }
@@ -262,15 +262,15 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
                        sectionTable
                )._class("headers");
 
-               ri.getHeaders().forEach((k,v) -> {
+               ri.getHeaders().forEach((k,v) ->
                        sectionTable.child(
                                tr(
                                        td(k)._class("name"),
                                        
td(toBRL(v.getDescription()))._class("description"),
                                        
td(v.asMap().keepAll("type","format","items","collectionFormat","default","maximum","exclusiveMaximum","minimum","exclusiveMinimum","maxLength","minLength","pattern","maxItems","minItems","uniqueItems","enum","multipleOf"))
                                )
-                       );
-               });
+                       )
+               );
 
                return headers;
        }
@@ -316,7 +316,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
 
                        Map<String,?> examples = ri.getExamples();
                        if (examples != null)
-                               examples.forEach((k,v) -> m.put(k,v));
+                               examples.forEach(m::put);
                } catch (Exception e) {
                        e.printStackTrace();
                }

Reply via email to