Add UnnecessarySemicolonOperation (java:S2959)

astra-core/src/main/java/org/alfasoftware/astra/core/utils/AstraCore.java

@@ -311,6 +311,10 @@ private void applyOperationsAndSaveWithPreParsedCompilationUnit(
       String[] sources,
       String[] classpath) {
     try {
+      // Ensure SOURCE is available on pre-parsed units (batch path), mirroring readAsCompilationUnit.
+      if (preParseUnit.getProperty(CompilationUnitProperty.SOURCE) == null) {
+        preParseUnit.setProperty(CompilationUnitProperty.SOURCE, fileContentBefore);
+      }
       ASTRewrite rewriter = runOperations(operations, preParseUnit);
       String fileContentAfter = makeChangesFromAST(fileContentBefore, rewriter);
 

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/AnonymousClassSemicolon.java

@@ -0,0 +1,12 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class AnonymousClassSemicolon {
+
+  Runnable r = new Runnable() {
+    ;
+    public void run() {
+    };
+    ;
+  };
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/AnonymousClassSemicolonAfter.java

@@ -0,0 +1,10 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class AnonymousClassSemicolonAfter {
+
+  Runnable r = new Runnable() {
+    public void run() {
+    }
+  };
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/BlockLevelEmptyStatement.java

@@ -0,0 +1,41 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class BlockLevelEmptyStatement {
+
+  static {
+    ;
+    System.out.println("static init");
+  }
+
+  {
+    ;
+    System.out.println("instance init");
+  }
+
+  void singleSemicolon() {
+    ;
+    doSomething();
+  }
+
+  void multipleSemicolons() {
+    ;
+    ;
+    doSomething();
+    ;
+  }
+
+  void semicolonInIfBlock() {
+    if (true) {
+      ;
+      doSomething();
+    }
+  }
+
+  void semicolonInForBlock() {
+    for (int i = 0; i < 10; i++) {
+      ;
+    }
+  }
+
+  void doSomething() {}
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/BlockLevelEmptyStatementAfter.java

@@ -0,0 +1,33 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class BlockLevelEmptyStatementAfter {
+
+  static {
+    System.out.println("static init");
+  }
+
+  {
+    System.out.println("instance init");
+  }
+
+  void singleSemicolon() {
+    doSomething();
+  }
+
+  void multipleSemicolons() {
+    doSomething();
+  }
+
+  void semicolonInIfBlock() {
+    if (true) {
+      doSomething();
+    }
+  }
+
+  void semicolonInForBlock() {
+    for (int i = 0; i < 10; i++) {
+    }
+  }
+
+  void doSomething() {}
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/ClassBraceSemicolon.java

@@ -0,0 +1,9 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class ClassBraceSemicolon {
+
+  public int getValue() {
+    return 42;
+  }
+
+};

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/ClassBraceSemicolonAfter.java

@@ -0,0 +1,9 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class ClassBraceSemicolonAfter {
+
+  public int getValue() {
+    return 42;
+  }
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/ClassLevelSemicolon.java

@@ -0,0 +1,13 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class ClassLevelSemicolon {
+
+  public int getValue() {
+    return 42;
+  };
+
+  public String getName() {
+    return "hello";
+  };
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/ClassLevelSemicolonAfter.java

@@ -0,0 +1,13 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class ClassLevelSemicolonAfter {
+
+  public int getValue() {
+    return 42;
+  }
+
+  public String getName() {
+    return "hello";
+  }
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/CommentedSemicolon.java

@@ -0,0 +1,13 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class CommentedSemicolon {
+
+  // ;
+
+  public int getValue() {
+    return 42;
+  }
+
+  /* ; */
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/CommentedSemicolonAfter.java

@@ -0,0 +1,13 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class CommentedSemicolonAfter {
+
+  // ;
+
+  public int getValue() {
+    return 42;
+  }
+
+  /* ; */
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/EmptyControlFlowBody.java

@@ -0,0 +1,24 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+import java.util.List;
+
+public class EmptyControlFlowBody {
+
+  void emptyWhileBody(List<Object> list) {
+    while (!list.isEmpty()) ;
+  }
+
+  void emptyForBody() {
+    for (int i = 0; i < 10; i++) ;
+  }
+
+  void emptyEnhancedForBody(List<Object> list) {
+    for (Object o : list) ;
+  }
+
+  void emptyIfBody() {
+    if (true) ;
+  }
+
+  void doSomething() {}
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/EmptyControlFlowBodyAfter.java

@@ -0,0 +1,24 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+import java.util.List;
+
+public class EmptyControlFlowBodyAfter {
+
+  void emptyWhileBody(List<Object> list) {
+    while (!list.isEmpty()) ;
+  }
+
+  void emptyForBody() {
+    for (int i = 0; i < 10; i++) ;
+  }
+
+  void emptyEnhancedForBody(List<Object> list) {
+    for (Object o : list) ;
+  }
+
+  void emptyIfBody() {
+    if (true) ;
+  }
+
+  void doSomething() {}
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/EnumBodySemicolon.java

@@ -0,0 +1,17 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class EnumBodySemicolon {
+
+  enum WithMethodsAndSemicolon {
+    RED, GREEN, BLUE;
+
+    public String label() {
+      return name().toLowerCase();
+    };
+    ;
+  }
+
+  enum WithNoBodyDeclarations {
+    ONE, TWO, THREE
+  }
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/EnumBodySemicolonAfter.java

@@ -0,0 +1,16 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class EnumBodySemicolonAfter {
+
+  enum WithMethodsAndSemicolon {
+    RED, GREEN, BLUE;
+
+    public String label() {
+      return name().toLowerCase();
+    }
+  }
+
+  enum WithNoBodyDeclarations {
+    ONE, TWO, THREE
+  }
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/MixedSemicolons.java

@@ -0,0 +1,16 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class MixedSemicolons {
+
+  public int getValue() {
+    ;
+    return 42;
+  };
+
+  public void doSomething() {
+    ;
+    System.out.println("hello");
+    ;
+  };
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/MixedSemicolonsAfter.java

@@ -0,0 +1,13 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class MixedSemicolonsAfter {
+
+  public int getValue() {
+    return 42;
+  }
+
+  public void doSomething() {
+    System.out.println("hello");
+  }
+
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/NestedTypeSemicolon.java

@@ -0,0 +1,20 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class NestedTypeSemicolon {
+
+  static class StaticNested {
+    ;
+    void foo() {
+    };
+    ;
+  }
+
+  class Inner {
+    int x = 1;;
+  }
+
+  interface InnerInterface {
+    ;
+    void method();
+  }
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/NestedTypeSemicolonAfter.java

@@ -0,0 +1,17 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class NestedTypeSemicolonAfter {
+
+  static class StaticNested {
+    void foo() {
+    }
+  }
+
+  class Inner {
+    int x = 1;
+  }
+
+  interface InnerInterface {
+    void method();
+  }
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/SwitchCaseSemicolon.java

@@ -0,0 +1,20 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class SwitchCaseSemicolon {
+
+  void switchStatement(int x) {
+    switch (x) {
+      case 1:
+        ;
+        System.out.println("one");
+        break;
+      case 2:
+        ;
+        ;
+        break;
+      default:
+        ;
+        break;
+    }
+  }
+}

astra-core/src/test/java/org/alfasoftware/astra/core/refactoring/operations/sonar/s2959/SwitchCaseSemicolonAfter.java

@@ -0,0 +1,16 @@
+package org.alfasoftware.astra.core.refactoring.operations.sonar.s2959;
+
+public class SwitchCaseSemicolonAfter {
+
+  void switchStatement(int x) {
+    switch (x) {
+      case 1:
+        System.out.println("one");
+        break;
+      case 2:
+        break;
+      default:
+        break;
+    }
+  }
+}