Fix UWF_UNWRITTEN_FIELD spotbugs warning

ndsev · Dec 11, 2023 · e082d67 · e082d67
1 parent ab239be
commit e082d67
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 25 deletions.
diff --git a/compiler/extensions/java/freemarker/Choice.java.ftl b/compiler/extensions/java/freemarker/Choice.java.ftl
@@ -286,21 +286,27 @@ ${I}break;
     @Override
     public boolean equals(java.lang.Object obj)
     {
+<#if compoundParametersData.list?has_content || fieldList?has_content>
         if (obj instanceof ${name})
         {
             final ${name} that = (${name})obj;
 
             return
-<#list compoundParametersData.list as parameter>
-                    <@compound_compare_parameter parameter/> &&
-</#list>
+    <#list compoundParametersData.list as parameter>
+                    <@compound_compare_parameter parameter/><#if parameter_has_next || fieldList?has_content> &&<#else>;</#if>
+    </#list>
+    <#if fieldList?has_content>
                     (
                         (objectChoice == null && that.objectChoice == null) ||
                         (objectChoice != null && objectChoice.equals(that.objectChoice))
                     );
+    </#if>
         }
 
         return false;
+<#else>
+        return obj instanceof ${name};
+</#if>
     }
 
 <#macro choice_hash_code_no_match name indent>
@@ -493,5 +499,7 @@ ${I}break;
 </#list>
 
     <@compound_parameter_members compoundParametersData/>
+<#if fieldList?has_content>
     private java.lang.Object objectChoice;
+</#if>
 }
diff --git a/compiler/extensions/java/freemarker/Union.java.ftl b/compiler/extensions/java/freemarker/Union.java.ftl
@@ -204,22 +204,28 @@ public class ${name} implements <#rt>
     @Override
     public boolean equals(java.lang.Object obj)
     {
+<#if compoundParametersData.list?has_content || fieldList?has_content>
         if (obj instanceof ${name})
         {
             final ${name} that = (${name})obj;
 
             return
-<#list compoundParametersData.list as parameter>
-                    <@compound_compare_parameter parameter/> &&
-</#list>
+    <#list compoundParametersData.list as parameter>
+                    <@compound_compare_parameter parameter/><#if parameter_has_next || fieldList?has_content> &&<#else>;</#if>
+    </#list>
+    <#if fieldList?has_content>
                     choiceTag == that.choiceTag &&
                     (
                         (objectChoice == null && that.objectChoice == null) ||
                         (objectChoice != null && objectChoice.equals(that.objectChoice))
                     );
+    </#if>
         }
 
         return false;
+<#else>
+        return obj instanceof ${name};
+</#if>
     }
 
     @Override
@@ -434,6 +440,8 @@ public class ${name} implements <#rt>
 </#list>
 
     <@compound_parameter_members compoundParametersData/>
-    private java.lang.Object objectChoice;
     private int choiceTag = UNDEFINED_CHOICE;
+<#if fieldList?has_content>
+    private java.lang.Object objectChoice;
+</#if>
 }
diff --git a/compiler/extensions/java/src/zserio/extension/java/JavaCaseExpressionFormattingPolicy.java b/compiler/extensions/java/src/zserio/extension/java/JavaCaseExpressionFormattingPolicy.java
@@ -1,6 +1,5 @@
 package zserio.extension.java;
 
-import zserio.ast.EnumItem;
 import zserio.ast.EnumType;
 import zserio.ast.ZserioType;
 

diff --git a/scripts/test_zs.sh b/scripts/test_zs.sh
@@ -164,10 +164,6 @@ EOF
     <Match>
         <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
         <Bug code="CT"/>
-    </Match>
-    <Match>
-        <!-- Unwritten field - Should be fixed in generated code. -->
-        <Bug code="UwF"/>
     </Match>${SPOTBUGS_FILTER_SQLITE}
 </FindBugsFilter>
 EOF

diff --git a/test/language/array_types/java/array_types/PackedAutoArrayRemovedEnumItemTest.java b/test/language/array_types/java/array_types/PackedAutoArrayRemovedEnumItemTest.java
@@ -7,7 +7,6 @@
 import array_types.packed_auto_array_removed_enum_item.Traffic;
 
 import zserio.runtime.ZserioError;
-import zserio.runtime.io.BitBuffer;
 import zserio.runtime.io.SerializeUtil;
 
 public class PackedAutoArrayRemovedEnumItemTest

diff --git a/test/language/array_types/spotbugs_filter.xml b/test/language/array_types/spotbugs_filter.xml
@@ -11,8 +11,4 @@
         <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
         <Bug code="CT"/>
     </Match>
-    <Match>
-        <!-- Unwritten field - Should be fixed in generated code. -->
-        <Bug code="UwF"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/choice_types/spotbugs_filter.xml b/test/language/choice_types/spotbugs_filter.xml
@@ -22,8 +22,4 @@
         <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
         <Bug code="CT"/>
     </Match>
-    <Match>
-        <!-- Unwritten field - Should be fixed in generated code. -->
-        <Bug code="UwF"/>
-    </Match>
 </FindBugsFilter>
diff --git a/test/language/union_types/spotbugs_filter.xml b/test/language/union_types/spotbugs_filter.xml
@@ -22,8 +22,4 @@
         <!-- Be wary of letting constructors throw exceptions - Should be fixed in generated code. -->
         <Bug code="CT"/>
     </Match>
-    <Match>
-        <!-- Unwritten field - Should be fixed in generated code. -->
-        <Bug code="UwF"/>
-    </Match>
 </FindBugsFilter>