Refactor POMScanner (#227)

Remove static methods

Remove legacyScanFrom method

Author: carlosu7

plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/POMOperator.java

@@ -13,22 +13,14 @@
 
 /** Facade for the POM Operator, providing methods for modifying and querying POM files. */
 public class POMOperator {
-
-  private final Path pomFile;
-  private final Path projectDir;
+  private final POMScanner pomScanner;
 
   public POMOperator(final Path pomFile, final Path projectDir) {
-    this.pomFile = pomFile;
-    this.projectDir = projectDir;
-  }
-
-  public static POMOperator forTesting() {
-    return new POMOperator();
+    this.pomScanner = new POMScanner(pomFile.toFile(), projectDir.toFile());
   }
 
-  private POMOperator() {
-    this.pomFile = null;
-    this.projectDir = null;
+  public POMScanner getPomScanner() {
+    return pomScanner;
   }
 
   /**
@@ -45,7 +37,8 @@ public ProjectModel addDependency(final DependencyGAV newDependencyGAV)
       throws XMLStreamException, URISyntaxException, IOException, DocumentException {
     final Dependency newDependency = new Dependency(newDependencyGAV);
     final ProjectModel projectModel =
-        POMScanner.legacyScanFrom(pomFile.toFile(), projectDir.toFile())
+        pomScanner
+            .scanFrom()
             .withDependency(newDependency)
             .withSkipIfNewer(true)
             .withUseProperties(true)
@@ -69,7 +62,8 @@ public Collection<DependencyGAV> getAllFoundDependencies()
       throws DocumentException, IOException, URISyntaxException, XMLStreamException {
 
     final ProjectModel originalProjectModel =
-        POMScanner.legacyScanFrom(pomFile.toFile(), projectDir.toFile())
+        pomScanner
+            .scanFrom()
             .withSafeQueryType()
             .withRepositoryPath(FileUtils.createTempDirectoryWithPermissions().toFile())
             .build();
@@ -93,7 +87,7 @@ public Collection<DependencyGAV> getAllFoundDependencies()
    * @throws IOException If an I/O error occurs.
    * @throws XMLStreamException If an error occurs while handling XML streams.
    */
-  boolean modify(ProjectModel projectModel)
+  static boolean modify(ProjectModel projectModel)
       throws URISyntaxException, IOException, XMLStreamException {
     return CommandChain.createForModify().execute(projectModel);
   }
@@ -107,7 +101,7 @@ boolean modify(ProjectModel projectModel)
    * @throws IOException If an I/O error occurs.
    * @throws XMLStreamException If an error occurs while handling XML streams.
    */
-  Collection<Dependency> queryDependency(ProjectModel projectModel)
+  static Collection<Dependency> queryDependency(ProjectModel projectModel)
       throws URISyntaxException, IOException, XMLStreamException {
     return queryDependency(projectModel, Collections.emptyList());
   }
@@ -122,7 +116,7 @@ Collection<Dependency> queryDependency(ProjectModel projectModel)
    * @throws IOException If an I/O error occurs.
    * @throws XMLStreamException If an error occurs while handling XML streams.
    */
-  Optional<VersionQueryResponse> queryVersions(ProjectModel projectModel)
+  static Optional<VersionQueryResponse> queryVersions(ProjectModel projectModel)
       throws URISyntaxException, IOException, XMLStreamException {
     Set<VersionDefinition> queryVersionResult =
         queryVersions(projectModel, Collections.emptyList());
@@ -183,7 +177,7 @@ Optional<VersionQueryResponse> queryVersions(ProjectModel projectModel)
    * @param version The version string to map.
    * @return the mapped semantic version.
    */
-  private Version mapVersion(String version) {
+  private static Version mapVersion(String version) {
     String fixedVersion = version + (version.startsWith("1.") ? ".0" : ".0.0");
     return Version.valueOf(fixedVersion);
   }
@@ -194,7 +188,8 @@ private Version mapVersion(String version) {
    * @param projectModel Project Model (Context) class
    * @param commandList do not use (required for tests)
    */
-  Collection<Dependency> queryDependency(ProjectModel projectModel, List<Command> commandList)
+  static Collection<Dependency> queryDependency(
+      ProjectModel projectModel, List<Command> commandList)
       throws URISyntaxException, IOException, XMLStreamException {
     CommandChain chain = CommandChain.createForDependencyQuery(projectModel.getQueryType());
 
@@ -223,7 +218,7 @@ Collection<Dependency> queryDependency(ProjectModel projectModel, List<Command>
    * @param projectModel Project Model (Context) class
    * @param commandList do not use (required for tests)
    */
-  Set<VersionDefinition> queryVersions(ProjectModel projectModel, List<Command> commandList)
+  static Set<VersionDefinition> queryVersions(ProjectModel projectModel, List<Command> commandList)
       throws URISyntaxException, IOException, XMLStreamException {
     CommandChain chain = CommandChain.createForVersionQuery(projectModel.getQueryType());
 
@@ -246,7 +241,7 @@ Set<VersionDefinition> queryVersions(ProjectModel projectModel, List<Command> co
     return lastCommand.result;
   }
 
-  private void executeChain(
+  private static void executeChain(
       List<Command> commandList, CommandChain chain, ProjectModel projectModel)
       throws URISyntaxException, IOException, XMLStreamException {
     if (!commandList.isEmpty()) {