From f4fa77d52246f333cc61227ffb9eab383e7c67f3 Mon Sep 17 00:00:00 2001
From: Miki Rozloznik <mikulas.rozloznik@eccam.com>
Date: Mon, 5 Feb 2024 16:28:52 +0100
Subject: [PATCH] fix spotbugs

---
 .../cpp/CompoundFieldTemplateData.java        | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/compiler/extensions/cpp/src/zserio/extension/cpp/CompoundFieldTemplateData.java b/compiler/extensions/cpp/src/zserio/extension/cpp/CompoundFieldTemplateData.java
index 805eac047..264cb262e 100644
--- a/compiler/extensions/cpp/src/zserio/extension/cpp/CompoundFieldTemplateData.java
+++ b/compiler/extensions/cpp/src/zserio/extension/cpp/CompoundFieldTemplateData.java
@@ -774,19 +774,16 @@ public boolean arrayTraitsNeedsOwner()
     //@compound_read_field_inner
     public String readFieldInner(boolean packed)
     {
-        String callExpr = null;
+        StringBuilder callExpr = null;
         String expr = null;
         if (packed && isPackable && array == null)
         {
             if (compound != null)
             {
-                callExpr = "read(context." + getterName + "(), in";
-                if (compound != null)
-                {
-                    for (InstantiatedParameterData param : compound.getInstantiatedParameters())
-                        callExpr += ", " + param.getExpression();
-                }
-                callExpr += ", allocator)";
+                callExpr = new StringBuilder("read(context." + getterName + "(), in");
+                for (InstantiatedParameterData param : compound.getInstantiatedParameters())
+                	callExpr.append(", " + param.getExpression());                
+                callExpr.append(", allocator)");
             }
             else if (typeInfo.getIsEnum())
             {
@@ -831,17 +828,17 @@ else if (array != null)
             if (array.getLength() != null)
                 args.add("static_cast<size_t>(" + array.getLength() + ")");
 
-            callExpr = "read";
+            callExpr = new StringBuilder("read");
             if (isPackable && (packed || array.getIsPacked()))
-                callExpr += "Packed";
-            callExpr += "(" + String.join(", ", args) + ")";
+                callExpr.append("Packed");
+            callExpr.append("(" + String.join(", ", args) + ")");
         }
         else if (compound != null)
         {
-            callExpr = "read(in";
+            callExpr = new StringBuilder("read(in");
             for (InstantiatedParameterData param : compound.getInstantiatedParameters())
-                callExpr += ", " + param.getExpression();
-            callExpr += ", allocator)";
+                callExpr.append(", " + param.getExpression());
+            callExpr.append(", allocator)");
         }
         else
         {