Remove duplicated methods related to createDefaultConfig

Signed-off-by: Marvin Froeder <[email protected]>

Author: velo

sqrl-testing/sqrl-integration-tests/src/test/java/com/datasqrl/discovery/FlexibleSchemaInferencePreprocessorTest.java

@@ -42,7 +42,7 @@ public class FlexibleSchemaInferencePreprocessorTest extends AbstractAssetSnapsh
   protected FlexibleSchemaInferencePreprocessorTest() {
     super(FILES_DIR.resolve("output"));
     try {
-      packageJson = new PackageJsonImpl(SqrlConfigCommons.fromURL(errors, getClass().getResource("/default-package.json")));
+      packageJson =  SqrlConfigCommons.getDefaultPackageJson(errors);
     } catch (Exception e) {
         System.out.println(ErrorPrinter.prettyPrint(errors));
         throw e;

sqrl-tools/sqrl-config/src/main/java/com/datasqrl/config/SqrlConfigCommons.java

@@ -349,15 +349,19 @@ public static SqrlConfig create(ErrorCollector errors, int version) {
 
   public static TableConfigImpl fromFilesTableConfig(@NonNull Name name, ErrorCollector errors,
       @NonNull List<Path> files) {
-    return new TableConfigImpl(name, fromFiles(errors, "/jsonSchema/tableConfig.json", files));
+    return new TableConfigImpl(name, getPackageConfig(errors, "/jsonSchema/tableConfig.json", files));
+  }
+
+  public static PackageJson getDefaultPackageJson(ErrorCollector errors) {
+    return fromFilesPackageJson(errors, List.of());
   }
 
   public static PackageJson fromFilesPackageJson(ErrorCollector errors, @NonNull List<Path> files) {
-    return new PackageJsonImpl(fromFiles(errors, "/jsonSchema/packageSchema.json", files));
+    return new PackageJsonImpl(getPackageConfig(errors, "/jsonSchema/packageSchema.json", files));
   }
 
   public static PackageJson fromFilesPublishPackageJson(ErrorCollector errors, @NonNull List<Path> files) {
-    return new PackageJsonImpl(fromFiles(errors, "/jsonSchema/publishPackageSchema.json", files));
+    return new PackageJsonImpl(getPackageConfig(errors, "/jsonSchema/publishPackageSchema.json", files));
   }
 
   public static boolean validateJsonFile(Path jsonFilePath, String schemaResourcePath,
@@ -398,10 +402,10 @@ public static boolean validateJsonFile(Path jsonFilePath, String schemaResourceP
   }
 
   public static SqrlConfig fromFiles(ErrorCollector errors, @NonNull Path firstFile) {
-    return fromFiles(errors, null, List.of(firstFile));
+    return getPackageConfig(errors, null, List.of(firstFile));
   }
 
-  public static SqrlConfig fromFiles(ErrorCollector errors, String jsonSchemaResource, @NonNull List<Path> files) {
+  public static SqrlConfig getPackageConfig(ErrorCollector errors, String jsonSchemaResource, @NonNull List<Path> files) {
     Configurations configs = new Configurations();
     boolean isValid = true;
 
@@ -421,11 +425,11 @@ public static SqrlConfig fromFiles(ErrorCollector errors, String jsonSchemaResou
     }
 
     try {
-        URL url = SqrlConfigCommons.class.getResource("/default-package.json");
-		JSONConfiguration config = configs.fileBased(JSONConfiguration.class,   url);
-		combinedConfiguration.addConfiguration(config);
+      URL url = SqrlConfigCommons.class.getResource("/default-package.json");
+      JSONConfiguration config = configs.fileBased(JSONConfiguration.class,   url);
+      combinedConfiguration.addConfiguration(config);
     } catch (ConfigurationException e) {
-        throw errors.withConfig("Error loading default configuration").handle(e);
+      throw errors.withConfig("Error loading default configuration").handle(e);
     }
 
     String configFilename;

sqrl-tools/sqrl-packager/src/main/java/com/datasqrl/cmd/PackageBootstrap.java

@@ -94,12 +94,6 @@ public PackageJson bootstrap(Path rootDir, List<Path> packageFiles,
     return packageJson;
   }
 
-  public PackageJson createDefaultConfig(ErrorCollector errors) {
-    PackageJson packageJson = new PackageJsonImpl(SqrlConfigCommons.fromURL(errors, getClass().getResource("/default-package.json")));
-
-    return packageJson;
-  }
-
   /**
    * We want to guard against confusion with remote repo names and filesystem paths so we can throw sensible error messages
    */