Fix CT_CONSTRUCTOR_THROWCT spotbugs warning, make generated classes f…

…inal
ndsev · Dec 11, 2023 · 3b7ebb1 · 3b7ebb1
1 parent 9640261
commit 3b7ebb1
Show file tree

Hide file tree

Showing 81 changed files with 22 additions and 272 deletions.
diff --git a/compiler/extensions/java/freemarker/Bitmask.java.ftl b/compiler/extensions/java/freemarker/Bitmask.java.ftl
@@ -14,7 +14,7 @@ new ${arrayableInfo.arrayTraits.name}(<#rt>
 <#if withCodeComments && docComments??>
 <@doc_comments docComments/>
 </#if>
-public class ${name} implements <#if withWriterCode>zserio.runtime.io.<#if usedInPackedArray>Packable</#if>Writer, </#if><#rt>
+public final class ${name} implements <#if withWriterCode>zserio.runtime.io.<#if usedInPackedArray>Packable</#if>Writer, </#if><#rt>
         <#lt>zserio.runtime.<#if usedInPackedArray>Packable</#if>SizeOf,
         zserio.runtime.ZserioBitmask
 {

diff --git a/compiler/extensions/java/freemarker/Choice.java.ftl b/compiler/extensions/java/freemarker/Choice.java.ftl
@@ -89,7 +89,7 @@ ${I}}
 <#if withCodeComments && docComments??>
 <@doc_comments docComments/>
 </#if>
-public class ${name} implements <#rt>
+public final class ${name} implements <#rt>
         <#if withWriterCode>zserio.runtime.io.<#if isPackable && usedInPackedArray>Packable</#if>Writer, <#t>
         <#lt></#if>zserio.runtime.<#if isPackable && usedInPackedArray>Packable</#if>SizeOf
 {

diff --git a/compiler/extensions/java/freemarker/Pubsub.java.ftl b/compiler/extensions/java/freemarker/Pubsub.java.ftl
@@ -6,7 +6,7 @@
 <#if withCodeComments && docComments??>
 <@doc_comments docComments/>
 </#if>
-public class ${name}
+public final class ${name}
 {
 <#if withCodeComments>
     /**

diff --git a/compiler/extensions/java/freemarker/SqlDatabase.java.ftl b/compiler/extensions/java/freemarker/SqlDatabase.java.ftl
@@ -10,7 +10,7 @@
 <#if withCodeComments && docComments??>
 <@doc_comments docComments/>
 </#if>
-public class ${name} implements zserio.runtime.SqlDatabase<#if !withWriterCode>Reader</#if>
+public final class ${name} implements zserio.runtime.SqlDatabase<#if !withWriterCode>Reader</#if>
 {
 <#if withValidationCode && needsParameterProvider>
     <#if withCodeComments>

diff --git a/compiler/extensions/java/freemarker/SqlTable.java.ftl b/compiler/extensions/java/freemarker/SqlTable.java.ftl
@@ -16,7 +16,7 @@
 <#if withCodeComments && docComments??>
 <@doc_comments docComments/>
 </#if>
-public class ${name}
+public final class ${name}
 {
 <#if needsParameterProvider>
     <#if withCodeComments>

diff --git a/compiler/extensions/java/freemarker/SqlTableRow.java.ftl b/compiler/extensions/java/freemarker/SqlTableRow.java.ftl
@@ -6,7 +6,7 @@
 <#if withCodeComments>
 /** Class which describes one row in the table ${name?remove_ending("Row")}. */
 </#if>
-public class ${name}
+public final class ${name}
 {
 <#list fields as field>
     <#if withCodeComments>

diff --git a/compiler/extensions/java/freemarker/Structure.java.ftl b/compiler/extensions/java/freemarker/Structure.java.ftl
@@ -22,7 +22,7 @@
 <#function extended_field_index numFields numExtendedFields fieldIndex>
     <#return fieldIndex - (numFields - numExtendedFields)>
 </#function>
-public class ${name} implements <#rt>
+public final class ${name} implements <#rt>
         <#if withWriterCode>zserio.runtime.io.<#if isPackable && usedInPackedArray>Packable</#if>Writer, <#t>
         <#lt></#if>zserio.runtime.<#if isPackable && usedInPackedArray>Packable</#if>SizeOf
 {

diff --git a/compiler/extensions/java/freemarker/Union.java.ftl b/compiler/extensions/java/freemarker/Union.java.ftl
@@ -13,7 +13,7 @@
 <#if withCodeComments && docComments??>
 <@doc_comments docComments/>
 </#if>
-public class ${name} implements <#rt>
+public final class ${name} implements <#rt>
         <#if withWriterCode>zserio.runtime.io.<#if isPackable && usedInPackedArray>Packable</#if>Writer, <#t>
         <#lt></#if>zserio.runtime.<#if isPackable && usedInPackedArray>Packable</#if>SizeOf
 {

diff --git a/compiler/extensions/java/runtime/spotbugs_filter.xml b/compiler/extensions/java/runtime/spotbugs_filter.xml
@@ -79,8 +79,4 @@
             </And>
         </Or>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/compiler/extensions/java/runtime/test/test_object/ArrayBitmask.java b/compiler/extensions/java/runtime/test/test_object/ArrayBitmask.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class ArrayBitmask implements zserio.runtime.io.PackableWriter, zserio.runtime.PackableSizeOf,
+public final class ArrayBitmask implements zserio.runtime.io.PackableWriter, zserio.runtime.PackableSizeOf,
         zserio.runtime.ZserioBitmask
 {
     public ArrayBitmask()

diff --git a/compiler/extensions/java/runtime/test/test_object/ArrayHolder.java b/compiler/extensions/java/runtime/test/test_object/ArrayHolder.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class ArrayHolder implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class ArrayHolder implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public ArrayHolder()
     {

diff --git a/compiler/extensions/java/runtime/test/test_object/ArrayObject.java b/compiler/extensions/java/runtime/test/test_object/ArrayObject.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class ArrayObject implements zserio.runtime.io.PackableWriter, zserio.runtime.PackableSizeOf
+public final class ArrayObject implements zserio.runtime.io.PackableWriter, zserio.runtime.PackableSizeOf
 {
     public static final class ZserioPackingContext extends zserio.runtime.array.PackingContext
     {

diff --git a/compiler/extensions/java/runtime/test/test_object/CreatorBitmask.java b/compiler/extensions/java/runtime/test/test_object/CreatorBitmask.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class CreatorBitmask implements zserio.runtime.io.Writer, zserio.runtime.SizeOf,
+public final class CreatorBitmask implements zserio.runtime.io.Writer, zserio.runtime.SizeOf,
         zserio.runtime.ZserioBitmask
 {
     public CreatorBitmask()

diff --git a/compiler/extensions/java/runtime/test/test_object/CreatorNested.java b/compiler/extensions/java/runtime/test/test_object/CreatorNested.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class CreatorNested implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class CreatorNested implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public CreatorNested(
             long param_)

diff --git a/compiler/extensions/java/runtime/test/test_object/CreatorObject.java b/compiler/extensions/java/runtime/test/test_object/CreatorObject.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class CreatorObject implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class CreatorObject implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public CreatorObject()
     {

diff --git a/compiler/extensions/java/runtime/test/test_object/SerializeNested.java b/compiler/extensions/java/runtime/test/test_object/SerializeNested.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class SerializeNested implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class SerializeNested implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public SerializeNested(
             byte param_)

diff --git a/compiler/extensions/java/runtime/test/test_object/SerializeObject.java b/compiler/extensions/java/runtime/test/test_object/SerializeObject.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class SerializeObject implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class SerializeObject implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public SerializeObject()
     {

diff --git a/compiler/extensions/java/runtime/test/test_object/WalkerBitmask.java b/compiler/extensions/java/runtime/test/test_object/WalkerBitmask.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class WalkerBitmask implements zserio.runtime.io.Writer, zserio.runtime.SizeOf,
+public final class WalkerBitmask implements zserio.runtime.io.Writer, zserio.runtime.SizeOf,
         zserio.runtime.ZserioBitmask
 {
     public WalkerBitmask()

diff --git a/compiler/extensions/java/runtime/test/test_object/WalkerNested.java b/compiler/extensions/java/runtime/test/test_object/WalkerNested.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class WalkerNested implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class WalkerNested implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public WalkerNested()
     {

diff --git a/compiler/extensions/java/runtime/test/test_object/WalkerObject.java b/compiler/extensions/java/runtime/test/test_object/WalkerObject.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class WalkerObject implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class WalkerObject implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public WalkerObject()
     {

diff --git a/compiler/extensions/java/runtime/test/test_object/WalkerUnion.java b/compiler/extensions/java/runtime/test/test_object/WalkerUnion.java
@@ -5,7 +5,7 @@
 
 package test_object;
 
-public class WalkerUnion implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
+public final class WalkerUnion implements zserio.runtime.io.Writer, zserio.runtime.SizeOf
 {
     public WalkerUnion()
     {
@@ -307,6 +307,6 @@ public test_object.WalkerNested create(zserio.runtime.io.BitStreamReader in, int
         }
     }
 
-    private java.lang.Object objectChoice;
     private int choiceTag = UNDEFINED_CHOICE;
+    private java.lang.Object objectChoice;
 }
diff --git a/...iler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java b/...iler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java
@@ -147,7 +147,7 @@ public void sqlTypeToSqliteType() throws SQLException
         }
     }
 
-    private static class TestSqlDatabase implements SqlDatabaseReader
+    private static final class TestSqlDatabase implements SqlDatabaseReader
     {
         public TestSqlDatabase() throws SQLException
         {

diff --git a/scripts/test_zs.sh b/scripts/test_zs.sh
@@ -160,10 +160,6 @@ EOF
     <Match>
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
-    </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
     </Match>${SPOTBUGS_FILTER_SQLITE}
 </FindBugsFilter>
 EOF

diff --git a/test/arguments/allow_implicit_arrays/spotbugs_filter.xml b/test/arguments/allow_implicit_arrays/spotbugs_filter.xml
@@ -21,8 +21,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/set_top_level_package/spotbugs_filter.xml b/test/arguments/set_top_level_package/spotbugs_filter.xml
@@ -19,8 +19,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/with_range_check_code/spotbugs_filter.xml b/test/arguments/with_range_check_code/spotbugs_filter.xml
@@ -3,8 +3,4 @@
         <!-- May expose internal representation by returning reference to mutable object. -->
         <Bug code="EI"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/with_type_info_code/spotbugs_filter.xml b/test/arguments/with_type_info_code/spotbugs_filter.xml
@@ -53,8 +53,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/with_validation_code/spotbugs_filter.xml b/test/arguments/with_validation_code/spotbugs_filter.xml
@@ -28,8 +28,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/without_cross_extension_check/spotbugs_filter.xml b/test/arguments/without_cross_extension_check/spotbugs_filter.xml
@@ -3,8 +3,4 @@
         <!-- May expose internal representation by returning reference to mutable object. -->
         <Bug code="EI"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/without_pubsub_code/spotbugs_filter.xml b/test/arguments/without_pubsub_code/spotbugs_filter.xml
@@ -3,8 +3,4 @@
         <!-- May expose internal representation by returning reference to mutable object. -->
         <Bug code="EI"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/without_service_code/spotbugs_filter.xml b/test/arguments/without_service_code/spotbugs_filter.xml
@@ -3,8 +3,4 @@
         <!-- May expose internal representation by returning reference to mutable object. -->
         <Bug code="EI"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/without_sql_code/spotbugs_filter.xml b/test/arguments/without_sql_code/spotbugs_filter.xml
@@ -3,8 +3,4 @@
         <!-- May expose internal representation by returning reference to mutable object. -->
         <Bug code="EI"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/arguments/without_writer_code/spotbugs_filter.xml b/test/arguments/without_writer_code/spotbugs_filter.xml
@@ -20,8 +20,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/alignment/spotbugs_filter.xml b/test/language/alignment/spotbugs_filter.xml
@@ -3,8 +3,4 @@
         <!-- May expose internal representation by returning reference to mutable object. -->
         <Bug code="EI"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/array_types/spotbugs_filter.xml b/test/language/array_types/spotbugs_filter.xml
@@ -7,8 +7,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/bitmask_types/spotbugs_filter.xml b/test/language/bitmask_types/spotbugs_filter.xml
diff --git a/test/language/builtin_types/spotbugs_filter.xml b/test/language/builtin_types/spotbugs_filter.xml
@@ -7,8 +7,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/choice_types/spotbugs_filter.xml b/test/language/choice_types/spotbugs_filter.xml
@@ -18,8 +18,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/comments/spotbugs_filter.xml b/test/language/comments/spotbugs_filter.xml
@@ -21,8 +21,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/constants/spotbugs_filter.xml b/test/language/constants/spotbugs_filter.xml
diff --git a/test/language/constraints/spotbugs_filter.xml b/test/language/constraints/spotbugs_filter.xml
@@ -7,8 +7,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/default_values/spotbugs_filter.xml b/test/language/default_values/spotbugs_filter.xml
@@ -7,8 +7,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/enumeration_types/spotbugs_filter.xml b/test/language/enumeration_types/spotbugs_filter.xml
diff --git a/test/language/explicit_parameters/spotbugs_filter.xml b/test/language/explicit_parameters/spotbugs_filter.xml
@@ -21,8 +21,4 @@
         <!-- May expose internal representation by incorporating reference to mutable object. -->
         <Bug code="EI2"/>
     </Match>
-    <Match>
-        <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
-        <Bug code="CT"/>
-    </Match>
 </FindBugsFilter>
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,7 +147,7 @@ public void sqlTypeToSqliteType() throws SQLException @@
             }
         }
-        private static class TestSqlDatabase implements SqlDatabaseReader
+        private static final class TestSqlDatabase implements SqlDatabaseReader
         {
             public TestSqlDatabase() throws SQLException
             {
@@ Expand Down @@