Merge branch 'master' into something_else

liquibase · Apr 22, 2024 · 9bd6f10 · 9bd6f10
2 parents 2f2c1fa + 43583ad
commit 9bd6f10
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 1 deletion.
diff --git a/...ng/src/main/java/liquibase/extension/testing/testsystem/wrapper/UnimplementedWrapper.java b/...ng/src/main/java/liquibase/extension/testing/testsystem/wrapper/UnimplementedWrapper.java
@@ -7,6 +7,7 @@
  *
  * @deprecated will remove when all TestSystems are created.
  */
+@Deprecated
 public class UnimplementedWrapper extends DatabaseWrapper {
     @Override
     public void start() throws Exception {

diff --git a/...aven-plugin/src/main/java/org/liquibase/maven/plugins/AbstractLiquibaseChangeLogMojo.java b/...aven-plugin/src/main/java/org/liquibase/maven/plugins/AbstractLiquibaseChangeLogMojo.java
@@ -62,6 +62,7 @@ public abstract class AbstractLiquibaseChangeLogMojo extends AbstractLiquibaseMo
      * @deprecated
      */
     @PropertyElement
+    @Deprecated
     protected String labels;
 
     /**

diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/AbstractLiquibaseMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/AbstractLiquibaseMojo.java
@@ -145,6 +145,7 @@ public void setPassword(String password) throws Exception {
      * @parameter property="liquibase.emptyPassword" default-value="false"
      * @deprecated Use an empty or null value for the password instead.
      */
+    @Deprecated
     @PropertyElement
     protected boolean emptyPassword;
     /**
@@ -201,6 +202,7 @@ public void setPassword(String password) throws Exception {
      * @deprecated No longer prompts
      */
     @PropertyElement
+    @Deprecated
     protected boolean promptOnNonLocalDatabase;
 
     /**
@@ -236,6 +238,7 @@ public void setPassword(String password) throws Exception {
      * @deprecated Logging managed by maven
      */
     @PropertyElement
+    @Deprecated
     protected String logging;
 
     /**

diff --git a/liquibase-standard/src/main/java/liquibase/Scope.java b/liquibase-standard/src/main/java/liquibase/Scope.java
@@ -60,6 +60,7 @@ public enum Attr {
         /**
          * @deprecated use {@link GlobalConfiguration#FILE_ENCODING}
          */
+        @Deprecated
         fileEncoding,
         databaseChangeLog,
         changeSet,
@@ -395,6 +396,7 @@ public String getLineSeparator() {
     /**
      * @deprecated use {@link GlobalConfiguration#FILE_ENCODING}
      */
+    @Deprecated
     public Charset getFileEncoding() {
         return get(Attr.fileEncoding, Charset.defaultCharset());
     }

diff --git a/liquibase-standard/src/main/java/liquibase/change/AbstractChange.java b/liquibase-standard/src/main/java/liquibase/change/AbstractChange.java
@@ -603,6 +603,7 @@ protected Change[] createInverses() {
      * @deprecated Should get from {@link Scope}
      */
     @DatabaseChangeProperty(isChangeProperty = false)
+    @Deprecated
     public ResourceAccessor getResourceAccessor() {
         return Scope.getCurrentScope().getResourceAccessor();
     }

diff --git a/liquibase-standard/src/main/java/liquibase/change/AbstractSQLChange.java b/liquibase-standard/src/main/java/liquibase/change/AbstractSQLChange.java
@@ -50,6 +50,7 @@ public abstract class AbstractSQLChange extends AbstractChange implements DbmsTa
      * @deprecated  To be removed when splitStatements is changed to be type Boolean
      *
      */
+    @Deprecated
     private boolean splitStatementsSet;
 
     private String endDelimiter;

diff --git a/liquibase-standard/src/main/java/liquibase/change/Change.java b/liquibase-standard/src/main/java/liquibase/change/Change.java
@@ -58,6 +58,7 @@ public interface Change extends LiquibaseSerializable, Plugin, ExtensibleObject
     * Called automatically by Liquibase during the changelog parsing process.
      * @deprecated this is now set via {@link Scope}
     */
+    @Deprecated
     void setResourceAccessor(ResourceAccessor resourceAccessor);
 
     /**

diff --git a/liquibase-standard/src/main/java/liquibase/change/ChangeFactory.java b/liquibase-standard/src/main/java/liquibase/change/ChangeFactory.java
@@ -136,6 +136,7 @@ public Map<String, Object> getParameters(Change change) {
     /**
      * @deprecated Use {@link liquibase.Scope#getSingleton(Class)}
      */
+    @Deprecated
     public static ChangeFactory getInstance() {
         return Scope.getCurrentScope().getSingleton(ChangeFactory.class);
     }

diff --git a/liquibase-standard/src/main/java/liquibase/change/core/AbstractModifyDataChange.java b/liquibase-standard/src/main/java/liquibase/change/core/AbstractModifyDataChange.java
@@ -61,13 +61,15 @@ public void setWhere(String where) {
      * @deprecated use getWhere().
      */
     @DatabaseChangeProperty(isChangeProperty = false, description = "Deprecated. Use 'where'")
+    @Deprecated
     public String getWhereClause() {
         return where;
     }
 
     /**
      * @deprecated use setWhere()
      */
+    @Deprecated
     public void setWhereClause(String where) {
         this.where = where;
     }

diff --git a/liquibase-standard/src/main/java/liquibase/change/core/AddForeignKeyConstraintChange.java b/liquibase-standard/src/main/java/liquibase/change/core/AddForeignKeyConstraintChange.java
@@ -203,6 +203,7 @@ public void setValidate(Boolean shouldValidate) {
      */
     @DatabaseChangeProperty(
         description = "Deprecated. This is true to set onDelete to Cascade, priority given to onDelete tag if one exists")
+    @Deprecated
     public Boolean getDeleteCascade() {
         return null;
     }

diff --git a/liquibase-standard/src/main/java/liquibase/change/core/CreateProcedureChange.java b/liquibase-standard/src/main/java/liquibase/change/core/CreateProcedureChange.java
@@ -114,6 +114,7 @@ public void setRelativeToChangelogFile(Boolean relativeToChangelogFile) {
     /**
      * @deprecated Use getProcedureText() instead
      */
+    @Deprecated
     public String getProcedureBody() {
         return procedureText;
     }

diff --git a/liquibase-standard/src/main/java/liquibase/changelog/ChangeSet.java b/liquibase-standard/src/main/java/liquibase/changelog/ChangeSet.java
@@ -1038,13 +1038,15 @@ public String getAuthor() {
     /**
      * @deprecated use {@link #getContextFilter()}
      */
+    @Deprecated
     public ContextExpression getContexts() {
         return getContextFilter();
     }
 
     /**
      * @deprecated use {@link #setContextFilter(ContextExpression)}
      */
+    @Deprecated
     public ChangeSet setContexts(ContextExpression contexts) {
         return setContextFilter(contexts);
     }

diff --git a/liquibase-standard/src/main/java/liquibase/command/AbstractCliWrapperCommandStep.java b/liquibase-standard/src/main/java/liquibase/command/AbstractCliWrapperCommandStep.java
@@ -13,6 +13,7 @@
  *
  * @deprecated
  */
+@Deprecated
 public abstract class AbstractCliWrapperCommandStep extends AbstractCommandStep {
 
     @Override

diff --git a/liquibase-standard/src/main/java/liquibase/command/core/DiffChangelogCommandStep.java b/liquibase-standard/src/main/java/liquibase/command/core/DiffChangelogCommandStep.java
@@ -117,7 +117,7 @@ public void run(CommandResultsBuilder resultsBuilder) throws Exception {
             }
         } catch (Exception e) {
             try (MdcObject diffChangelogOutcome = Scope.getCurrentScope().addMdcValue(MdcKey.DIFF_CHANGELOG_OUTCOME, MdcValue.COMMAND_FAILED)) {
-                Scope.getCurrentScope().getLog(getClass()).warning("Diff changelog command failed");
+                Scope.getCurrentScope().getLog(getClass()).warning("Diff changelog command failed: " + e.getMessage());
             }
         }
 

diff --git a/liquibase-standard/src/main/java/liquibase/integration/servlet/GenericServletListener.java b/liquibase-standard/src/main/java/liquibase/integration/servlet/GenericServletListener.java
@@ -74,13 +74,15 @@ public void setContexts(String ctxt) {
     /**
      * @deprecated use {@link #getLabelFilter()}
      */
+    @Deprecated
     public String getLabels() {
         return getLabelFilter();
     }
 
     /**
      * @deprecated use {@link #setLabelFilter(String)}
      */
+    @Deprecated
     public void setLabels(String labels) {
         setLabelFilter(labels);
     }

diff --git a/...ibase-standard/src/main/java/liquibase/integration/spring/MultiTenantSpringLiquibase.java b/...ibase-standard/src/main/java/liquibase/integration/spring/MultiTenantSpringLiquibase.java
@@ -218,13 +218,15 @@ private SpringLiquibase getSpringLiquibase(DataSource dataSource) {
     /**
      * @deprecated use {@link #getLabelFilter()}
      */
+    @Deprecated
     public String getLabels() {
         return getLabelFilter();
     }
 
     /**
      * @deprecated use {@link #setLabelFilter(String)}
      */
+    @Deprecated
     public void setLabels(String labels) {
         setLabelFilter(labels);
     }

diff --git a/liquibase-standard/src/main/java/liquibase/integration/spring/SpringLiquibase.java b/liquibase-standard/src/main/java/liquibase/integration/spring/SpringLiquibase.java
@@ -198,13 +198,15 @@ public void setChangeLog(String dataModel) {
     /**
      * @deprecated use {@link #getLabelFilter()}
      */
+    @Deprecated
     public String getLabels() {
         return getLabelFilter();
     }
 
     /**
      * @deprecated use {@link #setLabelFilter(String)}
      */
+    @Deprecated
     public void setLabels(String labels) {
         setLabelFilter(labels);
     }

diff --git a/liquibase-standard/src/main/java/liquibase/util/BooleanParser.java b/liquibase-standard/src/main/java/liquibase/util/BooleanParser.java
@@ -3,6 +3,7 @@
 /**
  * @deprecated use {@link BooleanUtil}
  */
+@Deprecated
 public class BooleanParser extends BooleanUtil {
 
 }
diff --git a/liquibase-standard/src/main/java/liquibase/util/BooleanUtils.java b/liquibase-standard/src/main/java/liquibase/util/BooleanUtils.java
@@ -3,5 +3,6 @@
 /**
  * @deprecated use {@link BooleanUtil}
  */
+@Deprecated
 public class BooleanUtils extends BooleanUtil {
 }
diff --git a/liquibase-standard/src/main/java/liquibase/util/JdbcUtils.java b/liquibase-standard/src/main/java/liquibase/util/JdbcUtils.java
@@ -3,5 +3,6 @@
 /**
  * @deprecated use {@link JdbcUtil}
  */
+@Deprecated
 public class JdbcUtils extends JdbcUtil {
 }
diff --git a/liquibase-standard/src/main/java/liquibase/util/NumberUtil.java b/liquibase-standard/src/main/java/liquibase/util/NumberUtil.java
@@ -15,6 +15,7 @@ public abstract class NumberUtil {
      *
      * @deprecated use {@link ObjectUtil#convert(Object, Class)}
      */
+    @Deprecated
     public static Number convertNumberToTargetClass(Number number, Class targetClass) throws IllegalArgumentException {
         return (Number) ObjectUtil.convert(number, targetClass);
     }

diff --git a/liquibase-standard/src/main/java/liquibase/util/NumberUtils.java b/liquibase-standard/src/main/java/liquibase/util/NumberUtils.java
@@ -3,5 +3,6 @@
 /**
  * @deprecated use {@link NumberUtil}
  */
+@Deprecated
 public class NumberUtils extends NumberUtil {
 }
diff --git a/liquibase-standard/src/main/java/liquibase/util/StreamUtil.java b/liquibase-standard/src/main/java/liquibase/util/StreamUtil.java
@@ -84,6 +84,7 @@ public static Reader readStreamWithReader(InputStream stream, String encoding) t
     /**
      * @deprecated use {@link ResourceAccessor#openStream(String, String)}
      */
+    @Deprecated
     public static InputStream openStream(String path, Boolean relativeToChangelogFile, ChangeSet changeSet, ResourceAccessor resourceAccessor) throws IOException {
         if (relativeToChangelogFile != null && relativeToChangelogFile) {
             path = resourceAccessor.get(changeSet.getChangeLog().getPhysicalFilePath()).resolveSibling(path).getPath();

diff --git a/liquibase-standard/src/main/java/liquibase/util/StringUtil.java b/liquibase-standard/src/main/java/liquibase/util/StringUtil.java
@@ -144,6 +144,7 @@ public static String[] processMultiLineSQL(String multiLineSQL, boolean stripCom
      * @param stripComments If true then comments will be stripped, if false then they will be left in the code
      * @deprecated The new method is {@link #processMultiLineSQL(String, boolean, boolean, String, ChangeSet)} (String)}
      */
+    @Deprecated
     public static String[] processMutliLineSQL(String multiLineSQL, boolean stripComments, boolean splitStatements, String endDelimiter) {
         return processMultiLineSQL(multiLineSQL, stripComments, splitStatements, endDelimiter, null);
     }
@@ -157,6 +158,7 @@ public static String[] processMutliLineSQL(String multiLineSQL, boolean stripCom
      * @param changeSet     the changeset associated with the sql being parsed
      * @deprecated The new method is {@link #processMultiLineSQL(String, boolean, boolean, String, ChangeSet)} (String)}
      */
+    @Deprecated
     public static String[] processMutliLineSQL(String multiLineSQL, boolean stripComments, boolean splitStatements, String endDelimiter, ChangeSet changeSet) {
         return processMultiLineSQL(multiLineSQL, stripComments, splitStatements, endDelimiter, changeSet);
     }

diff --git a/liquibase-standard/src/main/java/liquibase/util/file/FilenameUtils.java b/liquibase-standard/src/main/java/liquibase/util/file/FilenameUtils.java
@@ -5,11 +5,13 @@
 /**
  * @deprecated use {@link FilenameUtil}
  */
+@Deprecated
 public class FilenameUtils extends FilenameUtil {
 
     /**
      * @deprecated use {@link #getDirectory(String)}
      */
+    @Deprecated
     public static String getFullPath(String filename) {
         return getDirectory(filename);
     }