updated core to 11.1.0, code clean up

Author: AXEPOH

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.pgcodekeeper</groupId>
             <artifactId>pgcodekeeper-core</artifactId>
-            <version>11.0.0</version>
+            <version>11.1.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

src/main/java/org/pgcodekeeper/cli/CliArgs.java

@@ -15,23 +15,7 @@
  *******************************************************************************/
 package org.pgcodekeeper.cli;
 
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.Option;
-import org.kohsuke.args4j.OptionHandlerRegistry;
-import org.kohsuke.args4j.ParserProperties;
-
+import org.kohsuke.args4j.*;
 import org.pgcodekeeper.cli.localizations.CliArgsLocalizationsBundle;
 import org.pgcodekeeper.cli.localizations.Messages;
 import org.pgcodekeeper.cli.opthandlers.BooleanNoDefOptionHandler;
@@ -45,6 +29,16 @@
 import org.pgcodekeeper.core.model.difftree.DbObjType;
 import org.pgcodekeeper.core.settings.ISettings;
 
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Extension of {@link ISettings} with annotated CLI fields.
  * Override getters so that clients will access either CLI or parent fields
@@ -57,7 +51,7 @@ enum CliMode {
         PARSE,
         GRAPH,
         INSERT,
-        VERIFY;
+        VERIFY
     }
 
     private static final String URL_START_JDBC = "jdbc:"; //$NON-NLS-1$
@@ -295,9 +289,6 @@ enum CliMode {
     @Option(name="--verify-rule-set", metaVar=CliArgsLocalizationsBundle.PATH, usage="verify-rule-set")
     private String verifyRuleSetPath;
 
-    private SourceFormat oldSrcFormat;
-    private SourceFormat newSrcFormat;
-
     CliMode getMode() {
         return mode;
     }
@@ -552,14 +543,6 @@ public FormatConfiguration getFormatConfiguration() {
         return null;
     }
 
-    public SourceFormat getNewSrcFormat() {
-        return newSrcFormat;
-    }
-
-    public SourceFormat getOldSrcFormat() {
-        return oldSrcFormat;
-    }
-
     @Override
     public CliArgs copy() {
         var args = new CliArgs();
@@ -595,9 +578,7 @@ public CliArgs copy() {
         args.libSafeMode = libSafeMode;
         args.mode = mode;
         args.newSrc = newSrc;
-        args.newSrcFormat = newSrcFormat;
         args.oldSrc = oldSrc;
-        args.oldSrcFormat = oldSrcFormat;
         args.outCharsetName = outCharsetName;
         args.outputTarget = outputTarget;
         args.postFilePath = postFilePath;
@@ -671,14 +652,8 @@ public boolean parse(PrintWriter writer, String[] args) throws CmdLineException
             if (oldSrc == null || newSrc == null) {
                 badArgs(Messages.CliArgs_error_source_dest);
             }
-            oldSrcFormat = SourceFormat.parsePath(oldSrc);
         } else if (CliMode.PARSE == mode && projUpdate) {
             oldSrc = outputTarget;
-            oldSrcFormat = SourceFormat.parsePath(oldSrc);
-        }
-
-        if (CliMode.VERIFY != mode) {
-            newSrcFormat = SourceFormat.parsePath(newSrc);
         }
 
         return true;

src/main/java/org/pgcodekeeper/cli/PgDiffCli.java

@@ -18,7 +18,6 @@
 import org.pgcodekeeper.cli.exception.LibraryObjectDuplicationException;
 import org.pgcodekeeper.cli.localizations.Messages;
 import org.pgcodekeeper.core.PgCodekeeperException;
-import org.pgcodekeeper.core.PgDiff;
 import org.pgcodekeeper.core.api.DatabaseFactory;
 import org.pgcodekeeper.core.api.PgCodeKeeperApi;
 import org.pgcodekeeper.core.loader.FullAnalyze;
@@ -27,18 +26,21 @@
 import org.pgcodekeeper.core.schema.AbstractDatabase;
 import org.pgcodekeeper.core.schema.PgOverride;
 import org.pgcodekeeper.core.xmlstore.DependenciesXmlStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public final class PgDiffCli extends PgDiff {
-
+public final class PgDiffCli {
+    private static final Logger LOG = LoggerFactory.getLogger(PgDiffCli.class);
+    private final List<Object> errors = new ArrayList<>();
     private final CliArgs arguments;
 
     public PgDiffCli(CliArgs arguments) {
-        super(arguments);
         this.arguments = arguments;
     }
 
@@ -47,25 +49,25 @@ public void updateProject()
         AbstractDatabase oldDatabase = loadOldDatabaseWithLibraries();
         AbstractDatabase newDatabase = loadNewDatabaseWithLibraries();
 
-        PgCodeKeeperApi.update(settings, oldDatabase, newDatabase,
+        PgCodeKeeperApi.update(arguments, oldDatabase, newDatabase,
                 arguments.getOutputTarget(), arguments.getIgnoreLists(), null);
     }
 
     public void exportProject() throws IOException, InterruptedException, PgCodekeeperException {
-        AbstractDatabase newDb = loadNewDatabase();
-        PgCodeKeeperApi.export(settings, newDb, arguments.getOutputTarget(), arguments.getIgnoreLists(), null);
+        AbstractDatabase newDb = loadDatabaseSchema(arguments.getNewSrc());
+        PgCodeKeeperApi.export(arguments, newDb, arguments.getOutputTarget(), arguments.getIgnoreLists(), null);
     }
 
     public String createDiff() throws InterruptedException, IOException, PgCodekeeperException {
         AbstractDatabase oldDatabase = loadOldDatabaseWithLibraries();
         AbstractDatabase newDatabase = loadNewDatabaseWithLibraries();
-        return PgCodeKeeperApi.diff(settings, oldDatabase, newDatabase, arguments.getIgnoreLists());
+        return PgCodeKeeperApi.diff(arguments, oldDatabase, newDatabase, arguments.getIgnoreLists());
     }
 
     public AbstractDatabase loadNewDatabaseWithLibraries()
             throws IOException, InterruptedException, PgCodekeeperException {
         LOG.info(Messages.PgDiffCli_log_load_new_db);
-        AbstractDatabase newDatabase = loadNewDatabase();
+        AbstractDatabase newDatabase = loadDatabaseSchema(arguments.getNewSrc());
         LOG.info(Messages.PgDiffCli_log_load_new_db_lib);
         loadLibraries(newDatabase, arguments.getTargetLibXmls(), arguments.getTargetLibs(),
                 arguments.getTargetLibsWithoutPriv());
@@ -78,7 +80,7 @@ public AbstractDatabase loadNewDatabaseWithLibraries()
 
         // read additional privileges from special folder
         LOG.info(Messages.PgDiffCli_log_load_new_db_overrides);
-        loadOverrides(newDatabase, arguments.getNewSrcFormat(), arguments.getNewSrc());
+        loadOverrides(newDatabase, arguments.getNewSrc());
 
         LOG.info(Messages.PgDiffCli_log_start_db_analyze);
         analyzeDatabase(newDatabase);
@@ -89,7 +91,7 @@ public AbstractDatabase loadNewDatabaseWithLibraries()
     public AbstractDatabase loadOldDatabaseWithLibraries()
             throws IOException, InterruptedException, PgCodekeeperException {
         LOG.info(Messages.PgDiffCli_log_load_old_db);
-        AbstractDatabase oldDatabase = loadOldDatabase();
+        AbstractDatabase oldDatabase = loadDatabaseSchema(arguments.getOldSrc());
 
         LOG.info(Messages.PgDiffCli_log_load_old_db_lib);
         loadLibraries(oldDatabase, arguments.getSourceLibXmls(), arguments.getSourceLibs(),
@@ -102,7 +104,7 @@ public AbstractDatabase loadOldDatabaseWithLibraries()
         }
         LOG.info(Messages.PgDiffCli_log_load_old_db_overrides);
         // read additional privileges from special folder
-        loadOverrides(oldDatabase, arguments.getOldSrcFormat(), arguments.getOldSrc());
+        loadOverrides(oldDatabase, arguments.getOldSrc());
 
         LOG.info(Messages.PgDiffCli_log_start_db_analyze);
         analyzeDatabase(oldDatabase);
@@ -116,53 +118,41 @@ private void analyzeDatabase(AbstractDatabase db)
         assertErrors();
     }
 
-    private void loadOverrides(AbstractDatabase db, SourceFormat format, String source)
+    private void loadOverrides(AbstractDatabase db, String source)
             throws InterruptedException, IOException, PgCodekeeperException {
-        if (SourceFormat.PARSED != format) {
+        if (SourceFormat.PARSED != SourceFormat.parsePath(source)) {
             return;
         }
 
-        new ProjectLoader(source, settings, errors).loadOverrides(db);
+        new ProjectLoader(source, arguments, errors).loadOverrides(db);
         assertErrors();
     }
 
     private void loadLibraries(AbstractDatabase db, Collection<String> libXmls, Collection<String> libs,
-            Collection<String> libsWithoutPriv)
+            Collection<String> libsWithoutPrivileges)
             throws InterruptedException, IOException, PgCodekeeperException {
         LibraryLoader ll = new LibraryLoader(db, Utils.getMetaPath(), errors);
 
         for (String xml : libXmls) {
-            ll.loadXml(new DependenciesXmlStore(Paths.get(xml)), settings);
+            ll.loadXml(new DependenciesXmlStore(Paths.get(xml)), arguments);
         }
 
-        ll.loadLibraries(settings, false, libs);
-        ll.loadLibraries(settings, true, libsWithoutPriv);
+        ll.loadLibraries(arguments, false, libs);
+        ll.loadLibraries(arguments, true, libsWithoutPrivileges);
         assertErrors();
     }
 
-    private AbstractDatabase loadNewDatabase()
-            throws IOException, InterruptedException, PgCodekeeperException {
-        return loadDatabaseSchema(arguments.getNewSrcFormat(), arguments.getNewSrc());
-    }
-
-    private AbstractDatabase loadOldDatabase()
-            throws IOException, InterruptedException, PgCodekeeperException {
-        return loadDatabaseSchema(arguments.getOldSrcFormat(), arguments.getOldSrc());
-    }
-
     /**
      * Loads database schema choosing the provided method.
      *
-     * @param format  format of the database source, must be "dump", "parsed" or
-     *                "db" otherwise exception is thrown
      * @param srcPath path to the database source to load
      *
      * @return the loaded database
      */
-    private AbstractDatabase loadDatabaseSchema(SourceFormat format, String srcPath)
+    private AbstractDatabase loadDatabaseSchema(String srcPath)
             throws InterruptedException, IOException, PgCodekeeperException {
-        var factory = new DatabaseFactory(settings, arguments.isIgnoreErrors(), false);
-        return switch (format) {
+        var factory = new DatabaseFactory(arguments, arguments.isIgnoreErrors(), false);
+        return switch (SourceFormat.parsePath(srcPath)) {
         case DB -> factory.loadFromJdbc(srcPath, arguments.getIgnoreSchemaList());
         case DUMP -> factory.loadFromDump(srcPath);
         case PARSED -> factory.loadFromProject(srcPath, arguments.getIgnoreSchemaList());
@@ -174,4 +164,8 @@ private void assertErrors() throws PgCodekeeperException {
             throw new PgCodekeeperException(Messages.PgDiffCli_error_while_load_database);
         }
     }
+
+    public List<Object> getErrors() {
+        return errors;
+    }
 }

src/test/java/org/pgcodekeeper/cli/TestUtils.java

@@ -42,6 +42,9 @@ public static String readResource(Class<?> clazz, String fileName) throws IOExce
 
     public static Path getPathToResource(Class<?> clazz, String fileName) throws URISyntaxException {
         URL url = clazz.getResource(fileName);
+        if (url == null) {
+            throw new IllegalArgumentException("File not found %s".formatted(fileName));
+        }
         return Paths.get(url.toURI());
     }