refactored into its own package

pixee · Dec 18, 2024 · d9c47ce · d9c47ce
1 parent 394739f
commit d9c47ce
Show file tree

Hide file tree

Showing 93 changed files with 59 additions and 58 deletions.
diff --git a/core-codemods/src/main/java/io/codemodder/codemods/DefaultCodemods.java b/core-codemods/src/main/java/io/codemodder/codemods/DefaultCodemods.java
@@ -12,6 +12,7 @@
 import io.codemodder.codemods.semgrep.SemgrepServletResponseWriterXSSCodemod;
 import io.codemodder.codemods.semgrep.SemgrepWeakRandomCodemod;
 import io.codemodder.codemods.semgrep.SemgrepXXECodemod;
+import io.codemodder.codemods.sonar.*;
 import java.util.List;
 
 /**

diff --git a/...r/codemods/AddMissingOverrideCodemod.java → ...mods/sonar/AddMissingOverrideCodemod.java b/...r/codemods/AddMissingOverrideCodemod.java → ...mods/sonar/AddMissingOverrideCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.MethodDeclaration;

diff --git a/...voidImplicitPublicConstructorCodemod.java → ...voidImplicitPublicConstructorCodemod.java b/...voidImplicitPublicConstructorCodemod.java → ...voidImplicitPublicConstructorCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Modifier;

diff --git a/...codemods/ConstantNameStringGenerator.java → ...ds/sonar/ConstantNameStringGenerator.java b/...codemods/ConstantNameStringGenerator.java → ...ds/sonar/ConstantNameStringGenerator.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import java.util.Set;
 import java.util.regex.Matcher;

diff --git a/...er/codemods/CreateConstantForLiteral.java → ...emods/sonar/CreateConstantForLiteral.java b/...er/codemods/CreateConstantForLiteral.java → ...emods/sonar/CreateConstantForLiteral.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Modifier;

diff --git a/...demods/DeclareVariableOnSeparateLine.java → .../sonar/DeclareVariableOnSeparateLine.java b/...demods/DeclareVariableOnSeparateLine.java → .../sonar/DeclareVariableOnSeparateLine.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;

diff --git a/...DeclareVariableOnSeparateLineCodemod.java → ...DeclareVariableOnSeparateLineCodemod.java b/...DeclareVariableOnSeparateLineCodemod.java → ...DeclareVariableOnSeparateLineCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;

diff --git a/...bleOnSeparateLineForFieldDeclaration.java → ...bleOnSeparateLineForFieldDeclaration.java b/...bleOnSeparateLineForFieldDeclaration.java → ...bleOnSeparateLineForFieldDeclaration.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;

diff --git a/...parateLineForVariableDeclarationExpr.java → ...parateLineForVariableDeclarationExpr.java b/...parateLineForVariableDeclarationExpr.java → ...parateLineForVariableDeclarationExpr.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;

diff --git a/...er/codemods/DefineConstantForLiteral.java → ...emods/sonar/DefineConstantForLiteral.java b/...er/codemods/DefineConstantForLiteral.java → ...emods/sonar/DefineConstantForLiteral.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.CompilationUnit;

diff --git a/...mods/DefineConstantForLiteralCodemod.java → ...onar/DefineConstantForLiteralCodemod.java b/...mods/DefineConstantForLiteralCodemod.java → ...onar/DefineConstantForLiteralCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.StringLiteralExpr;

diff --git a/...mods/FixRedundantStaticOnEnumCodemod.java → ...onar/FixRedundantStaticOnEnumCodemod.java b/...mods/FixRedundantStaticOnEnumCodemod.java → ...onar/FixRedundantStaticOnEnumCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.EnumDeclaration;

diff --git a/...HardenStringParseToPrimitivesCodemod.java → ...HardenStringParseToPrimitivesCodemod.java b/...HardenStringParseToPrimitivesCodemod.java → ...HardenStringParseToPrimitivesCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;

diff --git a/...desMatchParentSynchronizationCodemod.java → ...desMatchParentSynchronizationCodemod.java b/...desMatchParentSynchronizationCodemod.java → ...desMatchParentSynchronizationCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;

diff --git a/.../codemods/RemoveCommentedCodeCodemod.java → ...ods/sonar/RemoveCommentedCodeCodemod.java b/.../codemods/RemoveCommentedCodeCodemod.java → ...ods/sonar/RemoveCommentedCodeCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.comments.Comment;

diff --git a/...moveRedundantVariableCreationCodemod.java → ...moveRedundantVariableCreationCodemod.java b/...moveRedundantVariableCreationCodemod.java → ...moveRedundantVariableCreationCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.*;

diff --git a/...r/codemods/RemoveUnusedImportCodemod.java → ...mods/sonar/RemoveUnusedImportCodemod.java b/...r/codemods/RemoveUnusedImportCodemod.java → ...mods/sonar/RemoveUnusedImportCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.ImportDeclaration;

diff --git a/...ods/RemoveUnusedLocalVariableCodemod.java → ...nar/RemoveUnusedLocalVariableCodemod.java b/...ods/RemoveUnusedLocalVariableCodemod.java → ...nar/RemoveUnusedLocalVariableCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;

diff --git a/...ods/RemoveUnusedPrivateMethodCodemod.java → ...nar/RemoveUnusedPrivateMethodCodemod.java b/...ods/RemoveUnusedPrivateMethodCodemod.java → ...nar/RemoveUnusedPrivateMethodCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;

diff --git a/...mods/RemoveUselessParenthesesCodemod.java → ...onar/RemoveUselessParenthesesCodemod.java b/...mods/RemoveUselessParenthesesCodemod.java → ...onar/RemoveUselessParenthesesCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.EnclosedExpr;

diff --git a/...ReplaceStreamCollectorsToListCodemod.java → ...ReplaceStreamCollectorsToListCodemod.java b/...ReplaceStreamCollectorsToListCodemod.java → ...ReplaceStreamCollectorsToListCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;

diff --git a/...lifyRestControllerAnnotationsCodemod.java → ...lifyRestControllerAnnotationsCodemod.java b/...lifyRestControllerAnnotationsCodemod.java → ...lifyRestControllerAnnotationsCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import static io.codemodder.ast.ASTTransforms.addImportIfMissing;
 import static io.codemodder.ast.ASTTransforms.removeImportIfUnused;

diff --git a/...r/codemods/SonarJNDIInjectionCodemod.java → ...mods/sonar/SonarJNDIInjectionCodemod.java b/...r/codemods/SonarJNDIInjectionCodemod.java → ...mods/sonar/SonarJNDIInjectionCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import io.codemodder.*;

diff --git a/...ds/SonarObjectDeserializationCodemod.java → ...ar/SonarObjectDeserializationCodemod.java b/...ds/SonarObjectDeserializationCodemod.java → ...ar/SonarObjectDeserializationCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import io.codemodder.*;

diff --git a/...narRemoveUnthrowableExceptionCodemod.java → ...narRemoveUnthrowableExceptionCodemod.java b/...narRemoveUnthrowableExceptionCodemod.java → ...narRemoveUnthrowableExceptionCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;

diff --git a/...er/codemods/SonarSQLInjectionCodemod.java → ...emods/sonar/SonarSQLInjectionCodemod.java b/...er/codemods/SonarSQLInjectionCodemod.java → ...emods/sonar/SonarSQLInjectionCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.Expression;

diff --git a/...codemodder/codemods/SonarSSRFCodemod.java → ...dder/codemods/sonar/SonarSSRFCodemod.java b/...codemodder/codemods/SonarSSRFCodemod.java → ...dder/codemods/sonar/SonarSSRFCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import io.codemodder.*;

diff --git a/...arUnsafeReflectionRemediationCodemod.java → ...arUnsafeReflectionRemediationCodemod.java b/...arUnsafeReflectionRemediationCodemod.java → ...arUnsafeReflectionRemediationCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import io.codemodder.*;

diff --git a/.../codemodder/codemods/SonarXXECodemod.java → ...odder/codemods/sonar/SonarXXECodemod.java b/.../codemodder/codemods/SonarXXECodemod.java → ...odder/codemods/sonar/SonarXXECodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import io.codemodder.*;

diff --git a/...codemods/SubstituteReplaceAllCodemod.java → ...ds/sonar/SubstituteReplaceAllCodemod.java b/...codemods/SubstituteReplaceAllCodemod.java → ...ds/sonar/SubstituteReplaceAllCodemod.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.SimpleName;

diff --git a/...demods/UseExistingConstantForLiteral.java → .../sonar/UseExistingConstantForLiteral.java b/...demods/UseExistingConstantForLiteral.java → .../sonar/UseExistingConstantForLiteral.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.StringLiteralExpr;

diff --git a/.../AddMissingOverrideCodemod/description.md → .../AddMissingOverrideCodemod/description.md b/.../AddMissingOverrideCodemod/description.md → .../AddMissingOverrideCodemod/description.md
diff --git a/...ods/AddMissingOverrideCodemod/report.json → ...nar/AddMissingOverrideCodemod/report.json b/...ods/AddMissingOverrideCodemod/report.json → ...nar/AddMissingOverrideCodemod/report.json
diff --git a/...itPublicConstructorCodemod/description.md → ...itPublicConstructorCodemod/description.md b/...itPublicConstructorCodemod/description.md → ...itPublicConstructorCodemod/description.md
diff --git a/...licitPublicConstructorCodemod/report.json → ...licitPublicConstructorCodemod/report.json b/...licitPublicConstructorCodemod/report.json → ...licitPublicConstructorCodemod/report.json
diff --git a/...iableOnSeparateLineCodemod/description.md → ...iableOnSeparateLineCodemod/description.md b/...iableOnSeparateLineCodemod/description.md → ...iableOnSeparateLineCodemod/description.md
diff --git a/...VariableOnSeparateLineCodemod/report.json → ...VariableOnSeparateLineCodemod/report.json b/...VariableOnSeparateLineCodemod/report.json → ...VariableOnSeparateLineCodemod/report.json
diff --git a/...eConstantForLiteralCodemod/description.md → ...eConstantForLiteralCodemod/description.md b/...eConstantForLiteralCodemod/description.md → ...eConstantForLiteralCodemod/description.md
diff --git a/...fineConstantForLiteralCodemod/report.json → ...fineConstantForLiteralCodemod/report.json b/...fineConstantForLiteralCodemod/report.json → ...fineConstantForLiteralCodemod/report.json
diff --git a/...dundantStaticOnEnumCodemod/description.md → ...dundantStaticOnEnumCodemod/description.md b/...dundantStaticOnEnumCodemod/description.md → ...dundantStaticOnEnumCodemod/description.md
diff --git a/...xRedundantStaticOnEnumCodemod/report.json → ...xRedundantStaticOnEnumCodemod/report.json b/...xRedundantStaticOnEnumCodemod/report.json → ...xRedundantStaticOnEnumCodemod/report.json
diff --git a/...ngParseToPrimitivesCodemod/description.md → ...ngParseToPrimitivesCodemod/description.md b/...ngParseToPrimitivesCodemod/description.md → ...ngParseToPrimitivesCodemod/description.md
diff --git a/...tringParseToPrimitivesCodemod/report.json → ...tringParseToPrimitivesCodemod/report.json b/...tringParseToPrimitivesCodemod/report.json → ...tringParseToPrimitivesCodemod/report.json
diff --git a/...rentSynchronizationCodemod/description.md → ...rentSynchronizationCodemod/description.md b/...rentSynchronizationCodemod/description.md → ...rentSynchronizationCodemod/description.md
diff --git a/...hParentSynchronizationCodemod/report.json → ...hParentSynchronizationCodemod/report.json b/...hParentSynchronizationCodemod/report.json → ...hParentSynchronizationCodemod/report.json
diff --git a/...RemoveCommentedCodeCodemod/description.md → ...RemoveCommentedCodeCodemod/description.md b/...RemoveCommentedCodeCodemod/description.md → ...RemoveCommentedCodeCodemod/description.md
diff --git a/...ds/RemoveCommentedCodeCodemod/report.json → ...ar/RemoveCommentedCodeCodemod/report.json b/...ds/RemoveCommentedCodeCodemod/report.json → ...ar/RemoveCommentedCodeCodemod/report.json
diff --git a/...antVariableCreationCodemod/description.md → ...antVariableCreationCodemod/description.md b/...antVariableCreationCodemod/description.md → ...antVariableCreationCodemod/description.md
diff --git a/...undantVariableCreationCodemod/report.json → ...undantVariableCreationCodemod/report.json b/...undantVariableCreationCodemod/report.json → ...undantVariableCreationCodemod/report.json
diff --git a/.../RemoveUnusedImportCodemod/description.md → .../RemoveUnusedImportCodemod/description.md b/.../RemoveUnusedImportCodemod/description.md → .../RemoveUnusedImportCodemod/description.md
diff --git a/...ods/RemoveUnusedImportCodemod/report.json → ...nar/RemoveUnusedImportCodemod/report.json b/...ods/RemoveUnusedImportCodemod/report.json → ...nar/RemoveUnusedImportCodemod/report.json
diff --git a/...UnusedLocalVariableCodemod/description.md → ...UnusedLocalVariableCodemod/description.md b/...UnusedLocalVariableCodemod/description.md → ...UnusedLocalVariableCodemod/description.md
diff --git a/...oveUnusedLocalVariableCodemod/report.json → ...oveUnusedLocalVariableCodemod/report.json b/...oveUnusedLocalVariableCodemod/report.json → ...oveUnusedLocalVariableCodemod/report.json
diff --git a/...UnusedPrivateMethodCodemod/description.md → ...UnusedPrivateMethodCodemod/description.md b/...UnusedPrivateMethodCodemod/description.md → ...UnusedPrivateMethodCodemod/description.md
diff --git a/...oveUnusedPrivateMethodCodemod/report.json → ...oveUnusedPrivateMethodCodemod/report.json b/...oveUnusedPrivateMethodCodemod/report.json → ...oveUnusedPrivateMethodCodemod/report.json
diff --git a/...eUselessParenthesesCodemod/description.md → ...eUselessParenthesesCodemod/description.md b/...eUselessParenthesesCodemod/description.md → ...eUselessParenthesesCodemod/description.md
diff --git a/...moveUselessParenthesesCodemod/report.json → ...moveUselessParenthesesCodemod/report.json b/...moveUselessParenthesesCodemod/report.json → ...moveUselessParenthesesCodemod/report.json
diff --git a/...eamCollectorsToListCodemod/description.md → ...eamCollectorsToListCodemod/description.md b/...eamCollectorsToListCodemod/description.md → ...eamCollectorsToListCodemod/description.md
diff --git a/...StreamCollectorsToListCodemod/report.json → ...StreamCollectorsToListCodemod/report.json b/...StreamCollectorsToListCodemod/report.json → ...StreamCollectorsToListCodemod/report.json
diff --git a/...ntrollerAnnotationsCodemod/description.md → ...ntrollerAnnotationsCodemod/description.md b/...ntrollerAnnotationsCodemod/description.md → ...ntrollerAnnotationsCodemod/description.md
diff --git a/...tControllerAnnotationsCodemod/report.json → ...tControllerAnnotationsCodemod/report.json b/...tControllerAnnotationsCodemod/report.json → ...tControllerAnnotationsCodemod/report.json
diff --git a/...nthrowableExceptionCodemod/description.md → ...nthrowableExceptionCodemod/description.md b/...nthrowableExceptionCodemod/description.md → ...nthrowableExceptionCodemod/description.md
diff --git a/...veUnthrowableExceptionCodemod/report.json → ...veUnthrowableExceptionCodemod/report.json b/...veUnthrowableExceptionCodemod/report.json → ...veUnthrowableExceptionCodemod/report.json
diff --git a/...ubstituteReplaceAllCodemod/description.md → ...ubstituteReplaceAllCodemod/description.md b/...ubstituteReplaceAllCodemod/description.md → ...ubstituteReplaceAllCodemod/description.md
diff --git a/...s/SubstituteReplaceAllCodemod/report.json → ...r/SubstituteReplaceAllCodemod/report.json b/...s/SubstituteReplaceAllCodemod/report.json → ...r/SubstituteReplaceAllCodemod/report.json
diff --git a/...demods/AddMissingOverrideCodemodTest.java → .../sonar/AddMissingOverrideCodemodTest.java b/...demods/AddMissingOverrideCodemodTest.java → .../sonar/AddMissingOverrideCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...ImplicitPublicConstructorCodemodTest.java → ...ImplicitPublicConstructorCodemodTest.java b/...ImplicitPublicConstructorCodemodTest.java → ...ImplicitPublicConstructorCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...mods/ConstantNameStringGeneratorTest.java → ...onar/ConstantNameStringGeneratorTest.java b/...mods/ConstantNameStringGeneratorTest.java → ...onar/ConstantNameStringGeneratorTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...areVariableOnSeparateLineCodemodTest.java → ...areVariableOnSeparateLineCodemodTest.java b/...areVariableOnSeparateLineCodemodTest.java → ...areVariableOnSeparateLineCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/.../DefineConstantForLiteralCodemodTest.java → .../DefineConstantForLiteralCodemodTest.java b/.../DefineConstantForLiteralCodemodTest.java → .../DefineConstantForLiteralCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...DefineConstantForLiteralCodemodTest2.java → ...DefineConstantForLiteralCodemodTest2.java b/...DefineConstantForLiteralCodemodTest2.java → ...DefineConstantForLiteralCodemodTest2.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...DefineConstantForLiteralCodemodTest3.java → ...DefineConstantForLiteralCodemodTest3.java b/...DefineConstantForLiteralCodemodTest3.java → ...DefineConstantForLiteralCodemodTest3.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...DefineConstantForLiteralCodemodTest4.java → ...DefineConstantForLiteralCodemodTest4.java b/...DefineConstantForLiteralCodemodTest4.java → ...DefineConstantForLiteralCodemodTest4.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...DefineConstantForLiteralCodemodTest5.java → ...DefineConstantForLiteralCodemodTest5.java b/...DefineConstantForLiteralCodemodTest5.java → ...DefineConstantForLiteralCodemodTest5.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/.../FixRedundantStaticOnEnumCodemodTest.java → .../FixRedundantStaticOnEnumCodemodTest.java b/.../FixRedundantStaticOnEnumCodemodTest.java → .../FixRedundantStaticOnEnumCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...enStringParseToPrimitivesCodemodTest.java → ...enStringParseToPrimitivesCodemodTest.java b/...enStringParseToPrimitivesCodemodTest.java → ...enStringParseToPrimitivesCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...atchParentSynchronizationCodemodTest.java → ...atchParentSynchronizationCodemodTest.java b/...atchParentSynchronizationCodemodTest.java → ...atchParentSynchronizationCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...emods/RemoveCommentedCodeCodemodTest.java → ...sonar/RemoveCommentedCodeCodemodTest.java b/...emods/RemoveCommentedCodeCodemodTest.java → ...sonar/RemoveCommentedCodeCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...RedundantVariableCreationCodemodTest.java → ...RedundantVariableCreationCodemodTest.java b/...RedundantVariableCreationCodemodTest.java → ...RedundantVariableCreationCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...demods/RemoveUnusedImportCodemodTest.java → .../sonar/RemoveUnusedImportCodemodTest.java b/...demods/RemoveUnusedImportCodemodTest.java → .../sonar/RemoveUnusedImportCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...RemoveUnusedLocalVariableCodemodTest.java → ...RemoveUnusedLocalVariableCodemodTest.java b/...RemoveUnusedLocalVariableCodemodTest.java → ...RemoveUnusedLocalVariableCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...RemoveUnusedPrivateMethodCodemodTest.java → ...RemoveUnusedPrivateMethodCodemodTest.java b/...RemoveUnusedPrivateMethodCodemodTest.java → ...RemoveUnusedPrivateMethodCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/.../RemoveUselessParenthesesCodemodTest.java → .../RemoveUselessParenthesesCodemodTest.java b/.../RemoveUselessParenthesesCodemodTest.java → .../RemoveUselessParenthesesCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...aceStreamCollectorsToListCodemodTest.java → ...aceStreamCollectorsToListCodemodTest.java b/...aceStreamCollectorsToListCodemodTest.java → ...aceStreamCollectorsToListCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...RestControllerAnnotationsCodemodTest.java → ...RestControllerAnnotationsCodemodTest.java b/...RestControllerAnnotationsCodemodTest.java → ...RestControllerAnnotationsCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...demods/SonarJNDIInjectionCodemodTest.java → .../sonar/SonarJNDIInjectionCodemodTest.java b/...demods/SonarJNDIInjectionCodemodTest.java → .../sonar/SonarJNDIInjectionCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.DependencyGAV;
 import io.codemodder.testutils.CodemodTestMixin;

diff --git a/...onarObjectDeserializationCodemodTest.java → ...onarObjectDeserializationCodemodTest.java b/...onarObjectDeserializationCodemodTest.java → ...onarObjectDeserializationCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.DependencyGAV;
 import io.codemodder.testutils.CodemodTestMixin;

diff --git a/...ds/SonarRemoveUnthrowableCodemodTest.java → ...ar/SonarRemoveUnthrowableCodemodTest.java b/...ds/SonarRemoveUnthrowableCodemodTest.java → ...ar/SonarRemoveUnthrowableCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...odemods/SonarSQLInjectionCodemodTest.java → ...s/sonar/SonarSQLInjectionCodemodTest.java b/...odemods/SonarSQLInjectionCodemodTest.java → ...s/sonar/SonarSQLInjectionCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...modder/codemods/SonarSSRFCodemodTest.java → .../codemods/sonar/SonarSSRFCodemodTest.java b/...modder/codemods/SonarSSRFCodemodTest.java → .../codemods/sonar/SonarSSRFCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.DependencyGAV;
 import io.codemodder.testutils.CodemodTestMixin;

diff --git a/...safeReflectionRemediationCodemodTest.java → ...safeReflectionRemediationCodemodTest.java b/...safeReflectionRemediationCodemodTest.java → ...safeReflectionRemediationCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.DependencyGAV;
 import io.codemodder.testutils.CodemodTestMixin;

diff --git a/...emodder/codemods/SonarXXECodemodTest.java → ...r/codemods/sonar/SonarXXECodemodTest.java b/...emodder/codemods/SonarXXECodemodTest.java → ...r/codemods/sonar/SonarXXECodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;

diff --git a/...mods/SubstituteReplaceAllCodemodTest.java → ...onar/SubstituteReplaceAllCodemodTest.java b/...mods/SubstituteReplaceAllCodemodTest.java → ...onar/SubstituteReplaceAllCodemodTest.java
@@ -1,4 +1,4 @@
-package io.codemodder.codemods;
+package io.codemodder.codemods.sonar;
 
 import io.codemodder.testutils.CodemodTestMixin;
 import io.codemodder.testutils.Metadata;