From 3b7ebb1a89e0e34385bed55cb91214059d6cef62 Mon Sep 17 00:00:00 2001 From: Milan Kriz Date: Mon, 11 Dec 2023 15:59:48 +0100 Subject: [PATCH] Fix CT_CONSTRUCTOR_THROWCT spotbugs warning, make generated classes final --- compiler/extensions/java/freemarker/Bitmask.java.ftl | 2 +- compiler/extensions/java/freemarker/Choice.java.ftl | 2 +- compiler/extensions/java/freemarker/Pubsub.java.ftl | 2 +- compiler/extensions/java/freemarker/SqlDatabase.java.ftl | 2 +- compiler/extensions/java/freemarker/SqlTable.java.ftl | 2 +- compiler/extensions/java/freemarker/SqlTableRow.java.ftl | 2 +- compiler/extensions/java/freemarker/Structure.java.ftl | 2 +- compiler/extensions/java/freemarker/Union.java.ftl | 2 +- compiler/extensions/java/runtime/spotbugs_filter.xml | 4 ---- .../java/runtime/test/test_object/ArrayBitmask.java | 2 +- .../java/runtime/test/test_object/ArrayHolder.java | 2 +- .../java/runtime/test/test_object/ArrayObject.java | 2 +- .../java/runtime/test/test_object/CreatorBitmask.java | 2 +- .../java/runtime/test/test_object/CreatorNested.java | 2 +- .../java/runtime/test/test_object/CreatorObject.java | 2 +- .../java/runtime/test/test_object/SerializeNested.java | 2 +- .../java/runtime/test/test_object/SerializeObject.java | 2 +- .../java/runtime/test/test_object/WalkerBitmask.java | 2 +- .../java/runtime/test/test_object/WalkerNested.java | 2 +- .../java/runtime/test/test_object/WalkerObject.java | 2 +- .../java/runtime/test/test_object/WalkerUnion.java | 4 ++-- .../zserio/runtime/validation/ValidationSqliteUtilTest.java | 2 +- scripts/test_zs.sh | 4 ---- test/arguments/allow_implicit_arrays/spotbugs_filter.xml | 4 ---- test/arguments/set_top_level_package/spotbugs_filter.xml | 4 ---- test/arguments/with_range_check_code/spotbugs_filter.xml | 4 ---- test/arguments/with_type_info_code/spotbugs_filter.xml | 4 ---- test/arguments/with_validation_code/spotbugs_filter.xml | 4 ---- .../without_cross_extension_check/spotbugs_filter.xml | 4 ---- test/arguments/without_pubsub_code/spotbugs_filter.xml | 4 ---- test/arguments/without_service_code/spotbugs_filter.xml | 4 ---- test/arguments/without_sql_code/spotbugs_filter.xml | 4 ---- test/arguments/without_writer_code/spotbugs_filter.xml | 4 ---- test/language/alignment/spotbugs_filter.xml | 4 ---- test/language/array_types/spotbugs_filter.xml | 4 ---- test/language/bitmask_types/spotbugs_filter.xml | 6 ------ test/language/builtin_types/spotbugs_filter.xml | 4 ---- test/language/choice_types/spotbugs_filter.xml | 4 ---- test/language/comments/spotbugs_filter.xml | 4 ---- test/language/constants/spotbugs_filter.xml | 6 ------ test/language/constraints/spotbugs_filter.xml | 4 ---- test/language/default_values/spotbugs_filter.xml | 4 ---- test/language/enumeration_types/spotbugs_filter.xml | 6 ------ test/language/explicit_parameters/spotbugs_filter.xml | 4 ---- test/language/expressions/spotbugs_filter.xml | 4 ---- test/language/extended_members/spotbugs_filter.xml | 4 ---- test/language/functions/spotbugs_filter.xml | 4 ---- test/language/identifiers/spotbugs_filter.xml | 4 ---- test/language/indexed_offsets/spotbugs_filter.xml | 4 ---- test/language/member_access/spotbugs_filter.xml | 4 ---- test/language/offsets/spotbugs_filter.xml | 4 ---- test/language/optional_members/spotbugs_filter.xml | 4 ---- test/language/packages/spotbugs_filter.xml | 4 ---- test/language/parameterized_types/spotbugs_filter.xml | 4 ---- test/language/pubsub_types/spotbugs_filter.xml | 4 ---- test/language/rules/spotbugs_filter.xml | 6 ------ test/language/service_types/spotbugs_filter.xml | 4 ---- test/language/sql_constraints/spotbugs_filter.xml | 4 ---- test/language/sql_databases/spotbugs_filter.xml | 4 ---- test/language/sql_tables/spotbugs_filter.xml | 4 ---- test/language/sql_types/spotbugs_filter.xml | 4 ---- test/language/sql_virtual_columns/spotbugs_filter.xml | 4 ---- test/language/sql_virtual_tables/spotbugs_filter.xml | 4 ---- test/language/sql_without_rowid_tables/spotbugs_filter.xml | 4 ---- test/language/structure_types/spotbugs_filter.xml | 4 ---- test/language/subtypes/spotbugs_filter.xml | 4 ---- test/language/templates/spotbugs_filter.xml | 4 ---- test/language/union_types/spotbugs_filter.xml | 4 ---- test/others/gif/spotbugs_filter.xml | 4 ---- test/warnings/array_types_warning/spotbugs_filter.xml | 4 ---- test/warnings/choice_types_warning/spotbugs_filter.xml | 4 ---- test/warnings/comments_warning/spotbugs_filter.xml | 4 ---- test/warnings/compatibility_warning/spotbugs_filter.xml | 6 ------ test/warnings/functions_warning/spotbugs_filter.xml | 4 ---- test/warnings/not_handled_warning/spotbugs_filter.xml | 4 ---- test/warnings/optional_members_warning/spotbugs_filter.xml | 4 ---- test/warnings/packages_warning/spotbugs_filter.xml | 4 ---- test/warnings/sql_tables_warning/spotbugs_filter.xml | 4 ---- .../sql_without_rowid_tables_warning/spotbugs_filter.xml | 4 ---- test/warnings/templates_warning/spotbugs_filter.xml | 4 ---- test/warnings/unused_type_warning/spotbugs_filter.xml | 4 ---- 81 files changed, 22 insertions(+), 272 deletions(-) delete mode 100644 test/language/bitmask_types/spotbugs_filter.xml delete mode 100644 test/language/constants/spotbugs_filter.xml delete mode 100644 test/language/enumeration_types/spotbugs_filter.xml delete mode 100644 test/language/rules/spotbugs_filter.xml delete mode 100644 test/warnings/compatibility_warning/spotbugs_filter.xml diff --git a/compiler/extensions/java/freemarker/Bitmask.java.ftl b/compiler/extensions/java/freemarker/Bitmask.java.ftl index 575b72f6a..72b5792cb 100644 --- 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/> -public class ${name} implements <#if withWriterCode>zserio.runtime.io.<#if usedInPackedArray>PackableWriter, <#rt> +public final class ${name} implements <#if withWriterCode>zserio.runtime.io.<#if usedInPackedArray>PackableWriter, <#rt> <#lt>zserio.runtime.<#if usedInPackedArray>PackableSizeOf, zserio.runtime.ZserioBitmask { diff --git a/compiler/extensions/java/freemarker/Choice.java.ftl b/compiler/extensions/java/freemarker/Choice.java.ftl index 0dc453713..3a21bc5dd 100644 --- 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/> -public class ${name} implements <#rt> +public final class ${name} implements <#rt> <#if withWriterCode>zserio.runtime.io.<#if isPackable && usedInPackedArray>PackableWriter, <#t> <#lt>zserio.runtime.<#if isPackable && usedInPackedArray>PackableSizeOf { diff --git a/compiler/extensions/java/freemarker/Pubsub.java.ftl b/compiler/extensions/java/freemarker/Pubsub.java.ftl index aaeb21b94..84aa2c7b0 100644 --- 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/> -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 index c501f954b..d66e0abe0 100644 --- 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/> -public class ${name} implements zserio.runtime.SqlDatabase<#if !withWriterCode>Reader +public final class ${name} implements zserio.runtime.SqlDatabase<#if !withWriterCode>Reader { <#if withValidationCode && needsParameterProvider> <#if withCodeComments> diff --git a/compiler/extensions/java/freemarker/SqlTable.java.ftl b/compiler/extensions/java/freemarker/SqlTable.java.ftl index 7272a4d0e..71b35ee75 100644 --- 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/> -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 index e6e54fe98..aacc7d912 100644 --- 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")}. */ -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 index 161e43b47..0698ca7a2 100644 --- 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)> -public class ${name} implements <#rt> +public final class ${name} implements <#rt> <#if withWriterCode>zserio.runtime.io.<#if isPackable && usedInPackedArray>PackableWriter, <#t> <#lt>zserio.runtime.<#if isPackable && usedInPackedArray>PackableSizeOf { diff --git a/compiler/extensions/java/freemarker/Union.java.ftl b/compiler/extensions/java/freemarker/Union.java.ftl index b511d5597..84cd8d3d6 100644 --- 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/> -public class ${name} implements <#rt> +public final class ${name} implements <#rt> <#if withWriterCode>zserio.runtime.io.<#if isPackable && usedInPackedArray>PackableWriter, <#t> <#lt>zserio.runtime.<#if isPackable && usedInPackedArray>PackableSizeOf { diff --git a/compiler/extensions/java/runtime/spotbugs_filter.xml b/compiler/extensions/java/runtime/spotbugs_filter.xml index 0ec41537f..33e6ed906 100644 --- a/compiler/extensions/java/runtime/spotbugs_filter.xml +++ b/compiler/extensions/java/runtime/spotbugs_filter.xml @@ -79,8 +79,4 @@ - - - - diff --git a/compiler/extensions/java/runtime/test/test_object/ArrayBitmask.java b/compiler/extensions/java/runtime/test/test_object/ArrayBitmask.java index 7c1d43f56..3b78a6167 100644 --- 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 index 6f441ce6f..7015935cc 100644 --- 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 index 94681fd00..cb2a804b6 100644 --- 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 index af326c8db..adfb30eed 100644 --- 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 index 801423826..af3ae80e2 100644 --- 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 index 7fb9de13a..5706853e1 100644 --- 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 index 0719e0761..33941d4f2 100644 --- 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 index a75135d9c..27a5189f6 100644 --- 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 index 37a1456d4..429d46db5 100644 --- 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 index e2987f2db..46f6d8a80 100644 --- 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 index 7ce386ae0..e45e4d7dc 100644 --- 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 index bc6d79768..32b35ae74 100644 --- 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/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java index 0c2c329a7..9f388a84e 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java +++ b/compiler/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 index 8608de6ad..1ff633a99 100755 --- a/scripts/test_zs.sh +++ b/scripts/test_zs.sh @@ -160,10 +160,6 @@ EOF - - - - ${SPOTBUGS_FILTER_SQLITE} EOF diff --git a/test/arguments/allow_implicit_arrays/spotbugs_filter.xml b/test/arguments/allow_implicit_arrays/spotbugs_filter.xml index 297d18590..776bcee5f 100644 --- a/test/arguments/allow_implicit_arrays/spotbugs_filter.xml +++ b/test/arguments/allow_implicit_arrays/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/arguments/set_top_level_package/spotbugs_filter.xml b/test/arguments/set_top_level_package/spotbugs_filter.xml index 90183c6c0..9dc7e51b8 100644 --- a/test/arguments/set_top_level_package/spotbugs_filter.xml +++ b/test/arguments/set_top_level_package/spotbugs_filter.xml @@ -19,8 +19,4 @@ - - - - diff --git a/test/arguments/with_range_check_code/spotbugs_filter.xml b/test/arguments/with_range_check_code/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/arguments/with_range_check_code/spotbugs_filter.xml +++ b/test/arguments/with_range_check_code/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/arguments/with_type_info_code/spotbugs_filter.xml b/test/arguments/with_type_info_code/spotbugs_filter.xml index d1b5a302c..e34699bf0 100644 --- a/test/arguments/with_type_info_code/spotbugs_filter.xml +++ b/test/arguments/with_type_info_code/spotbugs_filter.xml @@ -53,8 +53,4 @@ - - - - diff --git a/test/arguments/with_validation_code/spotbugs_filter.xml b/test/arguments/with_validation_code/spotbugs_filter.xml index 46d14ce70..b2bfab279 100644 --- a/test/arguments/with_validation_code/spotbugs_filter.xml +++ b/test/arguments/with_validation_code/spotbugs_filter.xml @@ -28,8 +28,4 @@ - - - - diff --git a/test/arguments/without_cross_extension_check/spotbugs_filter.xml b/test/arguments/without_cross_extension_check/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/arguments/without_cross_extension_check/spotbugs_filter.xml +++ b/test/arguments/without_cross_extension_check/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/arguments/without_pubsub_code/spotbugs_filter.xml b/test/arguments/without_pubsub_code/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/arguments/without_pubsub_code/spotbugs_filter.xml +++ b/test/arguments/without_pubsub_code/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/arguments/without_service_code/spotbugs_filter.xml b/test/arguments/without_service_code/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/arguments/without_service_code/spotbugs_filter.xml +++ b/test/arguments/without_service_code/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/arguments/without_sql_code/spotbugs_filter.xml b/test/arguments/without_sql_code/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/arguments/without_sql_code/spotbugs_filter.xml +++ b/test/arguments/without_sql_code/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/arguments/without_writer_code/spotbugs_filter.xml b/test/arguments/without_writer_code/spotbugs_filter.xml index eebb54ca2..0986c21bf 100644 --- a/test/arguments/without_writer_code/spotbugs_filter.xml +++ b/test/arguments/without_writer_code/spotbugs_filter.xml @@ -20,8 +20,4 @@ - - - - diff --git a/test/language/alignment/spotbugs_filter.xml b/test/language/alignment/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/language/alignment/spotbugs_filter.xml +++ b/test/language/alignment/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/language/array_types/spotbugs_filter.xml b/test/language/array_types/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/array_types/spotbugs_filter.xml +++ b/test/language/array_types/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/bitmask_types/spotbugs_filter.xml b/test/language/bitmask_types/spotbugs_filter.xml deleted file mode 100644 index 68a69e68f..000000000 --- a/test/language/bitmask_types/spotbugs_filter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/test/language/builtin_types/spotbugs_filter.xml b/test/language/builtin_types/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/builtin_types/spotbugs_filter.xml +++ b/test/language/builtin_types/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/choice_types/spotbugs_filter.xml b/test/language/choice_types/spotbugs_filter.xml index 458028c7f..119b0defb 100644 --- a/test/language/choice_types/spotbugs_filter.xml +++ b/test/language/choice_types/spotbugs_filter.xml @@ -18,8 +18,4 @@ - - - - diff --git a/test/language/comments/spotbugs_filter.xml b/test/language/comments/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/language/comments/spotbugs_filter.xml +++ b/test/language/comments/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/language/constants/spotbugs_filter.xml b/test/language/constants/spotbugs_filter.xml deleted file mode 100644 index 68a69e68f..000000000 --- a/test/language/constants/spotbugs_filter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/test/language/constraints/spotbugs_filter.xml b/test/language/constraints/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/constraints/spotbugs_filter.xml +++ b/test/language/constraints/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/default_values/spotbugs_filter.xml b/test/language/default_values/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/default_values/spotbugs_filter.xml +++ b/test/language/default_values/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/enumeration_types/spotbugs_filter.xml b/test/language/enumeration_types/spotbugs_filter.xml deleted file mode 100644 index 68a69e68f..000000000 --- a/test/language/enumeration_types/spotbugs_filter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/test/language/explicit_parameters/spotbugs_filter.xml b/test/language/explicit_parameters/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/language/explicit_parameters/spotbugs_filter.xml +++ b/test/language/explicit_parameters/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/language/expressions/spotbugs_filter.xml b/test/language/expressions/spotbugs_filter.xml index 97719b1b3..ac7d371a0 100644 --- a/test/language/expressions/spotbugs_filter.xml +++ b/test/language/expressions/spotbugs_filter.xml @@ -13,8 +13,4 @@ - - - - diff --git a/test/language/extended_members/spotbugs_filter.xml b/test/language/extended_members/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/extended_members/spotbugs_filter.xml +++ b/test/language/extended_members/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/functions/spotbugs_filter.xml b/test/language/functions/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/functions/spotbugs_filter.xml +++ b/test/language/functions/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/identifiers/spotbugs_filter.xml b/test/language/identifiers/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/identifiers/spotbugs_filter.xml +++ b/test/language/identifiers/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/indexed_offsets/spotbugs_filter.xml b/test/language/indexed_offsets/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/indexed_offsets/spotbugs_filter.xml +++ b/test/language/indexed_offsets/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/member_access/spotbugs_filter.xml b/test/language/member_access/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/member_access/spotbugs_filter.xml +++ b/test/language/member_access/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/offsets/spotbugs_filter.xml b/test/language/offsets/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/offsets/spotbugs_filter.xml +++ b/test/language/offsets/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/optional_members/spotbugs_filter.xml b/test/language/optional_members/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/optional_members/spotbugs_filter.xml +++ b/test/language/optional_members/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/packages/spotbugs_filter.xml b/test/language/packages/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/packages/spotbugs_filter.xml +++ b/test/language/packages/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/parameterized_types/spotbugs_filter.xml b/test/language/parameterized_types/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/parameterized_types/spotbugs_filter.xml +++ b/test/language/parameterized_types/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/pubsub_types/spotbugs_filter.xml b/test/language/pubsub_types/spotbugs_filter.xml index aeeb02871..98f89e7d5 100644 --- a/test/language/pubsub_types/spotbugs_filter.xml +++ b/test/language/pubsub_types/spotbugs_filter.xml @@ -9,8 +9,4 @@ - - - - diff --git a/test/language/rules/spotbugs_filter.xml b/test/language/rules/spotbugs_filter.xml deleted file mode 100644 index 68a69e68f..000000000 --- a/test/language/rules/spotbugs_filter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/test/language/service_types/spotbugs_filter.xml b/test/language/service_types/spotbugs_filter.xml index 4b1e14ed2..24fa43a25 100644 --- a/test/language/service_types/spotbugs_filter.xml +++ b/test/language/service_types/spotbugs_filter.xml @@ -17,8 +17,4 @@ - - - - diff --git a/test/language/sql_constraints/spotbugs_filter.xml b/test/language/sql_constraints/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/language/sql_constraints/spotbugs_filter.xml +++ b/test/language/sql_constraints/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/language/sql_databases/spotbugs_filter.xml b/test/language/sql_databases/spotbugs_filter.xml index 8bbffb266..7e0961760 100644 --- a/test/language/sql_databases/spotbugs_filter.xml +++ b/test/language/sql_databases/spotbugs_filter.xml @@ -24,8 +24,4 @@ - - - - diff --git a/test/language/sql_tables/spotbugs_filter.xml b/test/language/sql_tables/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/language/sql_tables/spotbugs_filter.xml +++ b/test/language/sql_tables/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/language/sql_types/spotbugs_filter.xml b/test/language/sql_types/spotbugs_filter.xml index e801cb2e8..27f4bcfdb 100644 --- a/test/language/sql_types/spotbugs_filter.xml +++ b/test/language/sql_types/spotbugs_filter.xml @@ -27,8 +27,4 @@ - - - - diff --git a/test/language/sql_virtual_columns/spotbugs_filter.xml b/test/language/sql_virtual_columns/spotbugs_filter.xml index 032b22e18..1141e5be5 100644 --- a/test/language/sql_virtual_columns/spotbugs_filter.xml +++ b/test/language/sql_virtual_columns/spotbugs_filter.xml @@ -22,8 +22,4 @@ - - - - diff --git a/test/language/sql_virtual_tables/spotbugs_filter.xml b/test/language/sql_virtual_tables/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/language/sql_virtual_tables/spotbugs_filter.xml +++ b/test/language/sql_virtual_tables/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/language/sql_without_rowid_tables/spotbugs_filter.xml b/test/language/sql_without_rowid_tables/spotbugs_filter.xml index 1b01cd655..41e7cbb7f 100644 --- a/test/language/sql_without_rowid_tables/spotbugs_filter.xml +++ b/test/language/sql_without_rowid_tables/spotbugs_filter.xml @@ -23,8 +23,4 @@ - - - - diff --git a/test/language/structure_types/spotbugs_filter.xml b/test/language/structure_types/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/language/structure_types/spotbugs_filter.xml +++ b/test/language/structure_types/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/language/subtypes/spotbugs_filter.xml b/test/language/subtypes/spotbugs_filter.xml index eebb54ca2..0986c21bf 100644 --- a/test/language/subtypes/spotbugs_filter.xml +++ b/test/language/subtypes/spotbugs_filter.xml @@ -20,8 +20,4 @@ - - - - diff --git a/test/language/templates/spotbugs_filter.xml b/test/language/templates/spotbugs_filter.xml index 8852fc65f..46264f28e 100644 --- a/test/language/templates/spotbugs_filter.xml +++ b/test/language/templates/spotbugs_filter.xml @@ -30,8 +30,4 @@ - - - - diff --git a/test/language/union_types/spotbugs_filter.xml b/test/language/union_types/spotbugs_filter.xml index 3a269ea23..67983ef8d 100644 --- a/test/language/union_types/spotbugs_filter.xml +++ b/test/language/union_types/spotbugs_filter.xml @@ -18,8 +18,4 @@ - - - - diff --git a/test/others/gif/spotbugs_filter.xml b/test/others/gif/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/others/gif/spotbugs_filter.xml +++ b/test/others/gif/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/warnings/array_types_warning/spotbugs_filter.xml b/test/warnings/array_types_warning/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/warnings/array_types_warning/spotbugs_filter.xml +++ b/test/warnings/array_types_warning/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/warnings/choice_types_warning/spotbugs_filter.xml b/test/warnings/choice_types_warning/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/warnings/choice_types_warning/spotbugs_filter.xml +++ b/test/warnings/choice_types_warning/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/warnings/comments_warning/spotbugs_filter.xml b/test/warnings/comments_warning/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/warnings/comments_warning/spotbugs_filter.xml +++ b/test/warnings/comments_warning/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/warnings/compatibility_warning/spotbugs_filter.xml b/test/warnings/compatibility_warning/spotbugs_filter.xml deleted file mode 100644 index 68a69e68f..000000000 --- a/test/warnings/compatibility_warning/spotbugs_filter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/test/warnings/functions_warning/spotbugs_filter.xml b/test/warnings/functions_warning/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/warnings/functions_warning/spotbugs_filter.xml +++ b/test/warnings/functions_warning/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/warnings/not_handled_warning/spotbugs_filter.xml b/test/warnings/not_handled_warning/spotbugs_filter.xml index 9457c9c75..66276a31c 100644 --- a/test/warnings/not_handled_warning/spotbugs_filter.xml +++ b/test/warnings/not_handled_warning/spotbugs_filter.xml @@ -3,8 +3,4 @@ - - - - diff --git a/test/warnings/optional_members_warning/spotbugs_filter.xml b/test/warnings/optional_members_warning/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/warnings/optional_members_warning/spotbugs_filter.xml +++ b/test/warnings/optional_members_warning/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/warnings/packages_warning/spotbugs_filter.xml b/test/warnings/packages_warning/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/warnings/packages_warning/spotbugs_filter.xml +++ b/test/warnings/packages_warning/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/warnings/sql_tables_warning/spotbugs_filter.xml b/test/warnings/sql_tables_warning/spotbugs_filter.xml index c0860290d..99f7ef0b2 100644 --- a/test/warnings/sql_tables_warning/spotbugs_filter.xml +++ b/test/warnings/sql_tables_warning/spotbugs_filter.xml @@ -21,8 +21,4 @@ - - - - diff --git a/test/warnings/sql_without_rowid_tables_warning/spotbugs_filter.xml b/test/warnings/sql_without_rowid_tables_warning/spotbugs_filter.xml index 3a9ccb014..4c2f2b548 100644 --- a/test/warnings/sql_without_rowid_tables_warning/spotbugs_filter.xml +++ b/test/warnings/sql_without_rowid_tables_warning/spotbugs_filter.xml @@ -22,8 +22,4 @@ - - - - diff --git a/test/warnings/templates_warning/spotbugs_filter.xml b/test/warnings/templates_warning/spotbugs_filter.xml index 0009dbcf1..8177e53f0 100644 --- a/test/warnings/templates_warning/spotbugs_filter.xml +++ b/test/warnings/templates_warning/spotbugs_filter.xml @@ -7,8 +7,4 @@ - - - - diff --git a/test/warnings/unused_type_warning/spotbugs_filter.xml b/test/warnings/unused_type_warning/spotbugs_filter.xml index fb9f5f466..734fcb45d 100644 --- a/test/warnings/unused_type_warning/spotbugs_filter.xml +++ b/test/warnings/unused_type_warning/spotbugs_filter.xml @@ -27,8 +27,4 @@ - - - -