changes

Author: Anmol202005

src/main/java/org/checkstyle/autofix/CheckstyleAutoFix.java

@@ -17,24 +17,16 @@
 
 package org.checkstyle.autofix;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Properties;
 
 import org.checkstyle.autofix.parser.CheckConfiguration;
 import org.checkstyle.autofix.parser.CheckstyleReportParser;
 import org.checkstyle.autofix.parser.CheckstyleViolation;
-import org.checkstyle.autofix.parser.ConfigurationMapper;
+import org.checkstyle.autofix.parser.ConfigurationLoader;
 import org.openrewrite.Option;
 import org.openrewrite.Recipe;
 
-import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
-import com.puppycrawl.tools.checkstyle.PropertiesExpander;
-import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-
 /**
  * Main recipe that automatically fixes all supported Checkstyle violations.
  */
@@ -86,23 +78,7 @@ public List<Recipe> getRecipeList() {
         return CheckstyleRecipeRegistry.getRecipes(violations);
     }
 
-    private CheckConfiguration loadCheckstyleConfiguration()
-            throws CheckstyleException, IOException {
-        Properties props = new Properties();
-        final String propFile = getPropertiesPath();
-
-        if (propFile == null) {
-            props = System.getProperties();
-        }
-        else {
-            try (FileInputStream input = new FileInputStream(propFile)) {
-                props.load(input);
-            }
-            catch (FileNotFoundException exception) {
-                throw new IllegalArgumentException("Failed to read: " + propFile, exception);
-            }
-        }
-        return ConfigurationMapper.mapConfiguration(ConfigurationLoader.loadConfiguration(
-                getConfigurationPath(), new PropertiesExpander(props)));
+    private CheckConfiguration loadCheckstyleConfiguration() {
+        return ConfigurationLoader.loadConfiguration(getConfigurationPath(), getPropertiesPath());
     }
 }

src/main/java/org/checkstyle/autofix/parser/CheckConfiguration.java

@@ -17,13 +17,14 @@
 
 package org.checkstyle.autofix.parser;
 
+import java.util.List;
 import java.util.Map;
 
 public final class CheckConfiguration {
     private final Map<String, String> properties;
-    private final CheckConfiguration[] children;
+    private final List<CheckConfiguration> children;
 
-    public CheckConfiguration(Map<String, String> properties, CheckConfiguration[] children) {
+    public CheckConfiguration(Map<String, String> properties, List<CheckConfiguration> children) {
         this.properties = properties;
         this.children = children;
     }
@@ -32,7 +33,7 @@ public Map<String, String> getProperties() {
         return properties;
     }
 
-    public CheckConfiguration[] getChildren() {
+    public List<CheckConfiguration> getChildren() {
         return children;
     }
 

src/main/java/org/checkstyle/autofix/parser/ConfigurationMapper.java renamed to src/main/java/org/checkstyle/autofix/parser/ConfigurationLoader.java

@@ -17,15 +17,20 @@
 
 package org.checkstyle.autofix.parser;
 
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
+import com.puppycrawl.tools.checkstyle.PropertiesExpander;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.Configuration;
 
-public final class ConfigurationMapper {
+public final class ConfigurationLoader {
 
-    private ConfigurationMapper() {
+    private ConfigurationLoader() {
         // utility class
     }
 
@@ -39,8 +44,8 @@ public static CheckConfiguration mapConfiguration(Configuration config) {
 
             }
             catch (CheckstyleException exception) {
-                throw new IllegalArgumentException("Error getting property "
-                        + propertyName + ": " + exception.getMessage());
+                throw new IllegalStateException("Error getting property "
+                        + propertyName + ": " + exception);
             }
         }
 
@@ -51,6 +56,36 @@ public static CheckConfiguration mapConfiguration(Configuration config) {
             simpleChildren[index] = mapConfiguration(checkstyleChildren[index]);
         }
 
-        return new CheckConfiguration(properties, simpleChildren);
+        return new CheckConfiguration(properties, List.of(simpleChildren));
     }
+
+    public static CheckConfiguration loadConfiguration(String checkstyleConfigurationPath,
+                                                       String propFile) {
+        Properties props = new Properties();
+
+        if (propFile == null) {
+            props = System.getProperties();
+        }
+        else {
+            try (FileInputStream input = new FileInputStream(propFile)) {
+                props.load(input);
+            }
+            catch (IOException exception) {
+                throw new IllegalStateException("Failed to read: " + propFile, exception);
+            }
+        }
+
+        final Configuration checkstyleConfig;
+        try {
+            checkstyleConfig = com.puppycrawl.tools.checkstyle.ConfigurationLoader
+                    .loadConfiguration(checkstyleConfigurationPath, new PropertiesExpander(props));
+        }
+        catch (CheckstyleException exception) {
+            throw new IllegalStateException("Failed to load configuration:"
+                    + checkstyleConfigurationPath, exception);
+        }
+
+        return mapConfiguration(checkstyleConfig);
+    }
+
 }