Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1776 from liquibase/LB-1222
Refactor LiquibaseConfiguration API
- Loading branch information
Showing
152 changed files
with
2,911 additions
and
1,639 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.liquibase</groupId> | ||
| <artifactId>liquibase-base-module</artifactId> | ||
| <version>${liquibase.version}</version> | ||
| <relativePath>../base-module.pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <description>Liquibase CLI interface</description> | ||
|
|
||
| <artifactId>liquibase-cli</artifactId> | ||
|
|
||
| <dependencies> | ||
|
|
||
| </dependencies> | ||
|
|
||
| </project> |
18 changes: 18 additions & 0 deletions
18
liquibase-cli/src/main/java/liquibase/integration/commandline/NewMain.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package liquibase.integration.commandline; | ||
|
|
||
| import liquibase.Scope; | ||
| import liquibase.configuration.ConfigurationDefinition; | ||
| import liquibase.configuration.LiquibaseConfiguration; | ||
|
|
||
| import java.util.SortedSet; | ||
|
|
||
| public class NewMain { | ||
| public static void main(String[] args) { | ||
| System.out.println("New CLI!"); | ||
|
|
||
| final SortedSet<ConfigurationDefinition> definitions = Scope.getCurrentScope().getSingleton(LiquibaseConfiguration.class).getRegisteredDefinitions(); | ||
| for (ConfigurationDefinition def : definitions) { | ||
| System.out.println("See " + def.getKey() + " = " + def.getCurrentValue() + " -- " + def.getDescription()); | ||
| } | ||
| } | ||
| } |
145 changes: 145 additions & 0 deletions
145
liquibase-core/src/main/java/liquibase/GlobalConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| package liquibase; | ||
|
|
||
| import liquibase.configuration.ConfigurationDefinition; | ||
| import liquibase.configuration.AutoloadedConfigurations; | ||
|
|
||
| /** | ||
| * Configuration container for global properties. | ||
| */ | ||
| public class GlobalConfiguration implements AutoloadedConfigurations { | ||
|
|
||
| public static final ConfigurationDefinition<Boolean> SHOULD_RUN; | ||
| public static final ConfigurationDefinition<String> DATABASECHANGELOG_TABLE_NAME; | ||
| public static final ConfigurationDefinition<String> DATABASECHANGELOGLOCK_TABLE_NAME; | ||
| public static final ConfigurationDefinition<String> LIQUIBASE_TABLESPACE_NAME; | ||
| public static final ConfigurationDefinition<String> LIQUIBASE_CATALOG_NAME; | ||
| public static final ConfigurationDefinition<String> LIQUIBASE_SCHEMA_NAME; | ||
| public static final ConfigurationDefinition<String> OUTPUT_LINE_SEPARATOR; | ||
| public static final ConfigurationDefinition<String> OUTPUT_ENCODING; | ||
| public static final ConfigurationDefinition<Long> CHANGELOGLOCK_WAIT_TIME; | ||
| public static final ConfigurationDefinition<Long> CHANGELOGLOCK_POLL_RATE; | ||
| public static final ConfigurationDefinition<Boolean> CONVERT_DATA_TYPES; | ||
| public static final ConfigurationDefinition<Boolean> GENERATE_CHANGESET_CREATED_VALUES; | ||
| public static final ConfigurationDefinition<Boolean> AUTO_REORG; | ||
| public static final ConfigurationDefinition<Boolean> DIFF_COLUMN_ORDER; | ||
| public static final ConfigurationDefinition<Boolean> ALWAYS_OVERRIDE_STORED_LOGIC_SCHEMA; | ||
| public static final ConfigurationDefinition<Boolean> GENERATED_CHANGESET_IDS_INCLUDE_DESCRIPTION; | ||
| public static final ConfigurationDefinition<Boolean> INCLUDE_CATALOG_IN_SPECIFICATION; | ||
| public static final ConfigurationDefinition<Boolean> SHOULD_SNAPSHOT_DATA; | ||
| public static final ConfigurationDefinition<Boolean> FILTER_LOG_MESSAGES; | ||
| public static final ConfigurationDefinition<Boolean> HEADLESS; | ||
|
|
||
| static { | ||
| ConfigurationDefinition.Builder builder = new ConfigurationDefinition.Builder("liquibase"); | ||
|
|
||
| SHOULD_RUN = builder.define("shouldRun", Boolean.class) | ||
| .setDescription("Should Liquibase commands execute") | ||
| .setDefaultValue(true) | ||
| .addAliasKey("should.run") | ||
| .build(); | ||
|
|
||
| DATABASECHANGELOG_TABLE_NAME = builder.define("databaseChangelogTableName", String.class) | ||
| .addAliasKey("liquibase.databaseChangeLogTableName") | ||
| .setDescription("Name of table to use for tracking change history") | ||
| .setDefaultValue("DATABASECHANGELOG") | ||
| .build(); | ||
|
|
||
| DATABASECHANGELOGLOCK_TABLE_NAME = builder.define("databaseChangelogLockTableName", String.class) | ||
| .addAliasKey("liquibase.databaseChangeLogLockTableName") | ||
| .setDescription("Name of table to use for tracking concurrent Liquibase usage") | ||
| .setDefaultValue("DATABASECHANGELOGLOCK") | ||
| .build(); | ||
|
|
||
| CHANGELOGLOCK_WAIT_TIME = builder.define("changelogLockWaitTimeInMinutes", Long.class) | ||
| .addAliasKey("liquibase.changeLogLockWaitTimeInMinutes") | ||
| .setDescription("Number of minutes to wait for the changelog lock to be available before giving up") | ||
| .setDefaultValue(5L) | ||
| .build(); | ||
|
|
||
| CHANGELOGLOCK_POLL_RATE = builder.define("changelogLockPollRate", Long.class) | ||
| .addAliasKey("liquibase.changeLogLockPollRate") | ||
| .setDescription("Number of seconds wait between checks to the changelog lock when it is locked") | ||
| .setDefaultValue(10L) | ||
| .build(); | ||
|
|
||
| LIQUIBASE_TABLESPACE_NAME = builder.define("tablespaceName", String.class) | ||
| .setDescription("Tablespace to use for Liquibase objects") | ||
| .build(); | ||
|
|
||
| LIQUIBASE_CATALOG_NAME = builder.define("catalogName", String.class) | ||
| .setDescription("Catalog to use for Liquibase objects") | ||
| .build(); | ||
|
|
||
| LIQUIBASE_SCHEMA_NAME = builder.define("schemaName", String.class) | ||
| .setDescription("Schema to use for Liquibase objects") | ||
| .build(); | ||
|
|
||
| OUTPUT_LINE_SEPARATOR = builder.define("outputLineSeparator", String.class) | ||
| .setDescription("Line separator for output. Defaults to OS default") | ||
| .setDefaultValue(System.getProperty("line.separator")) | ||
| .build(); | ||
|
|
||
| OUTPUT_ENCODING = builder.define("outputFileEncoding", String.class) | ||
| .setDescription("Encoding to output text in. Defaults to file.encoding system property or UTF-8") | ||
| .setDefaultValue("UTF-8") | ||
| .addAliasKey("file.encoding") | ||
| .setCommonlyUsed(true) | ||
| .build(); | ||
|
|
||
| CONVERT_DATA_TYPES = builder.define("convertDataTypes", Boolean.class) | ||
| .setDescription("Should Liquibase convert to/from STANDARD data types. Applies to both snapshot and " + | ||
| "update commands.") | ||
| .setDefaultValue(true) | ||
| .build(); | ||
|
|
||
| GENERATE_CHANGESET_CREATED_VALUES = builder.define("generateChangesetCreatedValues", Boolean.class) | ||
| .addAliasKey("liquibase.generateChangeSetCreatedValues") | ||
| .setDescription("Should Liquibase include a 'created' attribute in diff/generateChangelog changesets with" + | ||
| " the current datetime") | ||
| .setDefaultValue(false) | ||
| .build(); | ||
|
|
||
| AUTO_REORG = builder.define("autoReorg", Boolean.class) | ||
| .setDescription("Should Liquibase automatically include REORG TABLE commands when needed?") | ||
| .setDefaultValue(true) | ||
| .build(); | ||
|
|
||
| DIFF_COLUMN_ORDER = builder.define("diffColumnOrder", Boolean.class) | ||
| .setDescription("Should Liquibase compare column order in diff operation?") | ||
| .setDefaultValue(true) | ||
| .build(); | ||
|
|
||
| ALWAYS_OVERRIDE_STORED_LOGIC_SCHEMA = builder.define("alwaysOverrideStoredLogicSchema", Boolean.class) | ||
| .setDescription("When generating SQL for createProcedure, should the procedure schema be forced to the default schema if no schemaName attribute is set?") | ||
| .setDefaultValue(false) | ||
| .build(); | ||
|
|
||
|
|
||
| GENERATED_CHANGESET_IDS_INCLUDE_DESCRIPTION = builder.define("generatedChangesetIdsContainsDescription", Boolean.class) | ||
| .addAliasKey("liquibase.generatedChangeSetIdsContainsDescription") | ||
| .setDescription("Should Liquibase include the change description in the id when generating changesets?") | ||
| .setDefaultValue(false) | ||
| .build(); | ||
|
|
||
| INCLUDE_CATALOG_IN_SPECIFICATION = builder.define("includeCatalogInSpecification", Boolean.class) | ||
| .setDescription("Should Liquibase include the catalog name when determining equality?") | ||
| .setDefaultValue(false) | ||
| .build(); | ||
|
|
||
| SHOULD_SNAPSHOT_DATA = builder.define("shouldSnapshotData", Boolean.class) | ||
| .setDescription("Should Liquibase snapshot data by default?") | ||
| .setDefaultValue(false) | ||
| .build(); | ||
|
|
||
| FILTER_LOG_MESSAGES = builder.define("filterLogMessages", Boolean.class) | ||
| .setDescription("Should Liquibase filter log messages for potentially insecure data?") | ||
| .setDefaultValue(true) | ||
| .build(); | ||
|
|
||
| HEADLESS = builder.define("headless", Boolean.class) | ||
| .setDescription("Force liquibase think it has no access to a keyboard?") | ||
| .setDefaultValue(false) | ||
| .setCommonlyUsed(true) | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.