[java-decompiler] IDEA-346312 adapt patch 040

- recompile binary
- small fix

GitOrigin-RevId: edea43d2a138b38fc934a74e41ec256123d3a0e1

plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java

@@ -175,7 +175,7 @@ public class MethodProcessorRunnable implements Runnable {
 
     cancellationManager.checkCanceled();
 
-    if (cl.isVersion(CodeConstants.BYTECODE_JAVA_9)) {
+    if (cl.isVersion9()) {
       ConcatenationHelper.simplifyStringConcat(root);
     }
 

plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/StructClass.java

@@ -252,6 +252,10 @@ public class StructClass extends StructMember {
     return majorVersion >= CodeConstants.BYTECODE_JAVA_8;
   }
 
+  public boolean isVersion9() {
+    return majorVersion >= CodeConstants.BYTECODE_JAVA_9;
+  }
+
   public boolean isVersion14() {
     return majorVersion >= CodeConstants.BYTECODE_JAVA_14;
   }

plugins/java-decompiler/engine/testData/results/TestJava11StringConcatEmptyAffix.dec

@@ -26,7 +26,7 @@ public class TestJava11StringConcatEmptyAffix {
    }
 
    public String testIntSuffix(int value) {
-      return "" + value + "suffix";// 32
+      return value + "suffix";// 32
    }
 
    public String testStringSuffix(String value) {