Skip to content

Commit

Permalink
Merge pull request #3042 from liquibase/ktaggart-3041
Browse files Browse the repository at this point in the history 
Updated "Change Set" wording to "Changeset"
  • Loading branch information
@nvoxland
nvoxland committed Jul 12, 2022
2 parents 3bf2706 + 920cb4b commit 958ec59
Show file tree
Hide file tree
Showing 53 changed files with 133 additions and 133 deletions.
16 changes: 8 additions & 8 deletions liquibase-core/src/main/java/liquibase/Liquibase.java
View file
Expand Up @@ -509,7 +509,7 @@ public void run() throws Exception {

//
// Create an iterator which will be used with a ListVisitor
// to grab the list of change sets for the update
// to grab the list of changesets for the update
//
ChangeLogIterator listLogIterator = new ChangeLogIterator(changeLog,
new ShouldRunChangeSetFilter(database),
Expand Down Expand Up @@ -626,7 +626,7 @@ public void run() throws Exception {

//
// Create an iterator which will be used with a ListVisitor
// to grab the list of change sets for the update
// to grab the list of changesets for the update
//
List<RanChangeSet> ranChangeSetList = database.getRanChangeSetList();
ChangeLogIterator listLogIterator = new ChangeLogIterator(changeLog,
Expand Down Expand Up @@ -705,7 +705,7 @@ public void run() throws Exception {
/* We have no other choice than to save the current Executer here. */
@SuppressWarnings("squid:S1941")
Executor oldTemplate = getAndReplaceJdbcExecutor(output);
outputHeader("Update " + changesToApply + " Change Sets Database Script");
outputHeader("Update " + changesToApply + " Changesets Database Script");

update(changesToApply, contexts, labelExpression);

Expand Down Expand Up @@ -882,7 +882,7 @@ public void run() throws Exception {

//
// Create an iterator which will be used with a ListVisitor
// to grab the list of change sets for the update
// to grab the list of changesets for the update
//
ChangeLogIterator listLogIterator = new ChangeLogIterator(database.getRanChangeSetList(), changeLog,
new AlreadyRanChangeSetFilter(database.getRanChangeSetList()),
Expand Down Expand Up @@ -1154,7 +1154,7 @@ public void run() throws Exception {

//
// Create an iterator which will be used with a ListVisitor
// to grab the list of change sets for the update
// to grab the list of changesets for the update
//
List<RanChangeSet> ranChangeSetList = database.getRanChangeSetList();
ChangeLogIterator listLogIterator = new ChangeLogIterator(ranChangeSetList, changeLog,
Expand Down Expand Up @@ -1322,7 +1322,7 @@ public void run() throws Exception {

//
// Create an iterator which will be used with a ListVisitor
// to grab the list of change sets for the update
// to grab the list of changesets for the update
//
List<RanChangeSet> ranChangeSetList = database.getRanChangeSetList();
ChangeLogIterator listLogIterator = new ChangeLogIterator(ranChangeSetList, changeLog,
Expand Down Expand Up @@ -1480,7 +1480,7 @@ public void run() throws Exception {

//
// Create an iterator which will be used with a ListVisitor
// to grab the list of change sets for the update
// to grab the list of changesets for the update
//
ChangeLogIterator listLogIterator = buildChangeLogIterator(tag, changeLog, contexts, labelExpression);

Expand Down Expand Up @@ -2070,7 +2070,7 @@ public void reportStatus(boolean verbose, Contexts contexts, LabelExpression lab
out.append(StreamUtil.getLineSeparator());
} else {
out.append(String.valueOf(unrunChangeSets.size()));
out.append(" change sets have not been applied to ");
out.append(" changesets have not been applied to ");
out.append(getDatabase().getConnection().getConnectionUserName());
out.append("@");
out.append(getDatabase().getConnection().getURL());
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/change/core/LoadDataChange.java
View file
Expand Up @@ -484,7 +484,7 @@ public SqlStatement[] generateStatements(Database database) {
} catch (UnexpectedLiquibaseException ule) {
if ((getChangeSet() != null) && (getChangeSet().getFailOnError() != null) && !getChangeSet()
.getFailOnError()) {
LOG.info("Change set " + getChangeSet().toString(false) +
LOG.info("Changeset " + getChangeSet().toString(false) +
" failed, but failOnError was false. Error: " + ule.getMessage());
return new SqlStatement[0];
} else {
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/change/custom/CustomChangeWrapper.java
View file
Expand Up @@ -28,7 +28,7 @@
" want to create your own custom refactoring class.\n" +
"\n" +
"To create your own custom refactoring, simply create a class that implements the liquibase.change.custom.CustomSqlChange " +
"or liquibase.change.custom.CustomTaskChange interface and use the <custom> tag in your change set.\n" +
"or liquibase.change.custom.CustomTaskChange interface and use the <custom> tag in your changeset.\n" +
"\n" +
"If your change can be rolled back, implement the liquibase.change.custom.CustomSqlRollback interface as well.\n" +
"\n" +
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/change/custom/CustomSqlChange.java
View file
Expand Up @@ -9,7 +9,7 @@
* implementing this interface is preferred over CustomTaskChange because the SQL can either be executed
* directly or saved to a text file for later use depending on the migration mode used. To allow
* the change to be rolled back, also implement the CustomSqlRollback interface. If your change requires sql-based
* logic and non-sql-based logic, it is best to create a change set that contains a mix of CustomSqlChange and CustomTaskChange calls.
* logic and non-sql-based logic, it is best to create a changeset that contains a mix of CustomSqlChange and CustomTaskChange calls.
*
* @see liquibase.change.custom.CustomSqlRollback
* @see liquibase.change.custom.CustomTaskChange
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/change/custom/CustomTaskChange.java
View file
Expand Up @@ -8,7 +8,7 @@
* If you are updating a database through SQL, implementing CustomSqlChange is preferred because the SQL can either be executed
* directly or saved to a text file for later use depending on the migration mode used.
* To allow the change to be rolled back, also implement the CustomTaskRollback interface.
* If your change requires sql-based logic and non-sql-based logic, it is best to create a change set that contains a mix of CustomSqlChange and CustomTaskChange calls.
* If your change requires sql-based logic and non-sql-based logic, it is best to create a changeset that contains a mix of CustomSqlChange and CustomTaskChange calls.
*
* @see liquibase.change.custom.CustomTaskRollback
* @see liquibase.change.custom.CustomSqlChange
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/change/custom/package-info.java
View file
Expand Up @@ -4,7 +4,7 @@
* <p>
* To create your own custom refactoring, simply create a class that implements the
* {@link liquibase.change.custom.CustomSqlChange} or {@link liquibase.change.custom.CustomTaskChange} interface and
* use the &lt;custom&gt; tag in your change set.<p>
* use the &lt;custom&gt; tag in your changeset.<p>
* <p>
* If your change can be rolled back, implement the {@link liquibase.change.custom.CustomSqlRollback} interface as
* well.<p>
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/changelog/AbstractChangeLogHistoryService.java
View file
Expand Up @@ -100,7 +100,7 @@ public Date getRanDate(ChangeSet changeSet) throws DatabaseException, DatabaseHi

/**
*
* Return the last deployment ID from the change sets that have been run or null
* Return the last deployment ID from the changesets that have been run or null
*
* @return String
* @throws DatabaseException
Expand Down
8 changes: 4 additions & 4 deletions liquibase-core/src/main/java/liquibase/changelog/ChangeLogIterator.java
View file
Expand Up @@ -93,7 +93,7 @@ public void run() throws Exception {
Scope.child(Scope.Attr.changeSet.name(), changeSet, () -> {
if (finalShouldVisit && !alreadySaw(changeSet)) {
//
// Go validate any change sets with an Executor if
// Go validate any changesets with an Executor if
// we are using a ValidatingVisitor
//
if (visitor instanceof ValidatingVisitor) {
Expand All @@ -103,7 +103,7 @@ public void run() throws Exception {
//
// Execute the visit call in its own scope with a new
// CompositeLogService and BufferLogService in order
// to capture the logging for just this change set. The
// to capture the logging for just this changeset. The
// log is sent to Hub if available
//
Map<String, Object> values = new HashMap<>();
Expand Down Expand Up @@ -131,8 +131,8 @@ public void run() throws Exception {


//
// Make sure that any change set which has a runWith=<executor> setting
// has a valid Executor, and that the changes in the change set
// Make sure that any changeset which has a runWith=<executor> setting
// has a valid Executor, and that the changes in the changeset
// are eligible for execution by this Executor
//
private void validateChangeSetExecutor(ChangeSet changeSet, RuntimeEnvironment env) throws LiquibaseException {
Expand Down
10 changes: 5 additions & 5 deletions liquibase-core/src/main/java/liquibase/changelog/ChangeSet.java
View file
Expand Up @@ -477,7 +477,7 @@ protected void handleRollbackNode(ParsedNode rollbackNode, ResourceAccessor reso
}
}
if (changeSet == null) {
throw new ParsedNodeException("Change set " + new ChangeSet(changeSetId, changeSetAuthor, false, false, changeSetPath, null, null, null).toString(false) + " does not exist");
throw new ParsedNodeException("Changeset " + new ChangeSet(changeSetId, changeSetAuthor, false, false, changeSetPath, null, null, null).toString(false) + " does not exist");
}
for (Change change : changeSet.getChanges()) {
rollback.getChanges().add(change);
Expand Down Expand Up @@ -539,7 +539,7 @@ public ExecType execute(DatabaseChangeLog databaseChangeLog, Database database)
* This method will actually execute each of the changes in the list against the
* specified database.
*
* @return should change set be marked as ran
* @return should changeset be marked as ran
*/
public ExecType execute(DatabaseChangeLog databaseChangeLog, ChangeExecListener listener, Database database)
throws MigrationFailedException {
Expand Down Expand Up @@ -691,7 +691,7 @@ public ExecType execute(DatabaseChangeLog databaseChangeLog, ChangeExecListener
throw new MigrationFailedException(this, e);
}
if ((getFailOnError() != null) && !getFailOnError()) {
log.info("Change set " + toString(false) + " failed, but failOnError was false. Error: " + e.getMessage());
log.info("Changeset " + toString(false) + " failed, but failOnError was false. Error: " + e.getMessage());
log.fine("Failure Stacktrace", e);
execType = ExecType.FAILED;
} else {
Expand Down Expand Up @@ -946,7 +946,7 @@ public Collection<Labels> getInheritableLabels() {

/**
*
* Build and return a string which contains both the change set and inherited context
* Build and return a string which contains both the changeset and inherited context
*
* @return String
*
Expand All @@ -967,7 +967,7 @@ public String buildFullContext() {

/**
*
* Build and return a string which contains both the change set and inherited labels
* Build and return a string which contains both the changeset and inherited labels
*
* @return String
*
Expand Down
12 changes: 6 additions & 6 deletions liquibase-core/src/main/java/liquibase/changelog/ChangeSetStatus.java
View file
Expand Up @@ -66,7 +66,7 @@ public void setComments(String comments) {
}

/**
* Will the change set run next time.
* Will the changeset run next time.
*/
public boolean getWillRun() {
return willRun;
Expand All @@ -77,7 +77,7 @@ public void setWillRun(boolean willRun) {
}

/**
* Reasons the change set will or will not run next time. Returns empty set if no reasons were given
* Reasons the changeset will or will not run next time. Returns empty set if no reasons were given
*/
public Set<ChangeSetFilterResult> getFilterResults() {
return filterResults;
Expand All @@ -88,7 +88,7 @@ public void setFilterResults(Set<ChangeSetFilterResult> filterResults) {
}

/**
* Convenience method to check wither a given ChangeSetFilter type is a reason for running the change set or not.
* Convenience method to check wither a given ChangeSetFilter type is a reason for running the changeset or not.
*/
public boolean isFilteredBy(Class<? extends ChangeSetFilter> filterType) {
if (!willRun) {
Expand All @@ -108,7 +108,7 @@ public boolean isFilteredBy(Class<? extends ChangeSetFilter> filterType) {
}

/**
* Return the checksum stored from the last execution of the change set. Returns null if it has not ran before
* Return the checksum stored from the last execution of the changeset. Returns null if it has not ran before
*/
public CheckSum getStoredCheckSum() {
return storedCheckSum;
Expand All @@ -119,7 +119,7 @@ public void setStoredCheckSum(CheckSum storedCheckSum) {
}

/**
* Return the date the change set was last executed. Returns null if it has not ran before
* Return the date the changeset was last executed. Returns null if it has not ran before
*/
public Date getDateLastExecuted() {
return dateLastExecuted;
Expand All @@ -130,7 +130,7 @@ public void setDateLastExecuted(Date dateLastExecuted) {
}

/**
* Returns true if the change set was ran previously.
* Returns true if the changeset was ran previously.
*/
public boolean getPreviouslyRan() {
return previouslyRan;
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/changelog/RanChangeSet.java
View file
Expand Up @@ -7,7 +7,7 @@
import java.util.Date;

/**
* Encapsulates information about a previously-ran change set. Used to build rollback statements.
* Encapsulates information about a previously-ran changeset. Used to build rollback statements.
*/
public class RanChangeSet {
private final String changeLog;
Expand Down
4 changes: 2 additions & 2 deletions liquibase-core/src/main/java/liquibase/changelog/filter/ActuallyExecutedChangeSetFilter.java
View file
Expand Up @@ -16,9 +16,9 @@ public ChangeSetFilterResult accepts(ChangeSet changeSet) {
RanChangeSet ranChangeSet = getRanChangeSet(changeSet);
if ((ranChangeSet != null) && ((ranChangeSet.getExecType() == null) || ranChangeSet.getExecType().equals
(ChangeSet.ExecType.EXECUTED) || ranChangeSet.getExecType().equals(ChangeSet.ExecType.RERAN))) {
return new ChangeSetFilterResult(true, "Change set was executed previously", this.getClass());
return new ChangeSetFilterResult(true, "Changeset was executed previously", this.getClass());
} else {
return new ChangeSetFilterResult(false, "Change set was not previously executed", this.getClass());
return new ChangeSetFilterResult(false, "Changeset was not previously executed", this.getClass());
}
}
}
4 changes: 2 additions & 2 deletions liquibase-core/src/main/java/liquibase/changelog/filter/AfterTagChangeSetFilter.java
View file
Expand Up @@ -42,9 +42,9 @@ private String changeLogToString(String id, String author, String changeLog) {
@Override
public ChangeSetFilterResult accepts(ChangeSet changeSet) {
if (changeLogsAfterTag.contains(changeLogToString(changeSet.getId(), changeSet.getAuthor(), changeSet.getFilePath()))) {
return new ChangeSetFilterResult(true, "Change set is before tag '"+tag+"'", this.getClass());
return new ChangeSetFilterResult(true, "Changeset is before tag '"+tag+"'", this.getClass());
} else {
return new ChangeSetFilterResult(false, "Change set after tag '"+tag+"'", this.getClass());
return new ChangeSetFilterResult(false, "Changeset after tag '"+tag+"'", this.getClass());
}
}
}
4 changes: 2 additions & 2 deletions liquibase-core/src/main/java/liquibase/changelog/filter/AlreadyRanChangeSetFilter.java
View file
Expand Up @@ -14,9 +14,9 @@ public AlreadyRanChangeSetFilter(List<RanChangeSet> ranChangeSets) {
@Override
public ChangeSetFilterResult accepts(ChangeSet changeSet) {
if (getRanChangeSet(changeSet) != null) {
return new ChangeSetFilterResult(true, "Change set already ran", this.getClass());
return new ChangeSetFilterResult(true, "Changeset already ran", this.getClass());
} else {
return new ChangeSetFilterResult(false, "Change set has not ran", this.getClass());
return new ChangeSetFilterResult(false, "Changeset has not ran", this.getClass());
}
}

Expand Down
4 changes: 2 additions & 2 deletions liquibase-core/src/main/java/liquibase/changelog/filter/ChangeSetFilterResult.java
View file
Expand Up @@ -18,7 +18,7 @@ public ChangeSetFilterResult(boolean accepted, String message, Class<? extends C
}

/**
* Was the change set accepted by the filter
* Was the changeset accepted by the filter
*/
public boolean isAccepted() {
return accepted;
Expand All @@ -32,7 +32,7 @@ public String getMessage() {
}

/**
* Returns the class of the filter that accepted or rejected this change set.
* Returns the class of the filter that accepted or rejected this changeset.
*/
public Class<? extends ChangeSetFilter> getFilter() {
return filter;
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/changelog/filter/ContextChangeSetFilter.java
View file
Expand Up @@ -36,7 +36,7 @@ public ChangeSetFilterResult accepts(ChangeSet changeSet) {

Collection<ContextExpression> inheritableContexts = changeSet.getInheritableContexts();
if (changeSet.getContexts().isEmpty() && inheritableContexts.isEmpty()) {
return new ChangeSetFilterResult(true, "Change set runs under all contexts", this.getClass());
return new ChangeSetFilterResult(true, "Changeset runs under all contexts", this.getClass());
}

if (changeSet.getContexts().matches(contexts) && ContextExpression.matchesAll(inheritableContexts, contexts)) {
Expand Down
4 changes: 2 additions & 2 deletions liquibase-core/src/main/java/liquibase/changelog/filter/CountChangeSetFilter.java
View file
Expand Up @@ -16,9 +16,9 @@ public ChangeSetFilterResult accepts(ChangeSet changeSet) {
changeSetsSeen++;

if (changeSetsSeen <= changeSetsToAllow) {
return new ChangeSetFilterResult(true, "One of "+changeSetsToAllow+" change sets to run", this.getClass());
return new ChangeSetFilterResult(true, "One of "+changeSetsToAllow+" changesets to run", this.getClass());
} else {
return new ChangeSetFilterResult(false, "Only running "+changeSetsToAllow+" change sets", this.getClass());
return new ChangeSetFilterResult(false, "Only running "+changeSetsToAllow+" changesets", this.getClass());
}
}
}
6 changes: 3 additions & 3 deletions liquibase-core/src/main/java/liquibase/changelog/filter/ExecutedAfterChangeSetFilter.java
View file
Expand Up @@ -30,9 +30,9 @@ private String changeLogToString(String id, String author, String changeLog) {
@Override
public ChangeSetFilterResult accepts(ChangeSet changeSet) {
if (changeLogsAfterDate.contains(changeLogToString(changeSet.getId(), changeSet.getAuthor(), changeSet.getFilePath()))) {
return new ChangeSetFilterResult(true, "Change set ran after "+ new ISODateFormat().format(new java.sql.Timestamp(date.getTime())), this.getClass());
return new ChangeSetFilterResult(true, "Changeset ran after "+ new ISODateFormat().format(new java.sql.Timestamp(date.getTime())), this.getClass());
} else {
return new ChangeSetFilterResult(false, "Change set ran before "+ new ISODateFormat().format(new java.sql.Timestamp(date.getTime())), this.getClass());
return new ChangeSetFilterResult(false, "Changeset ran before "+ new ISODateFormat().format(new java.sql.Timestamp(date.getTime())), this.getClass());
}
}
}
}
6 changes: 3 additions & 3 deletions liquibase-core/src/main/java/liquibase/changelog/filter/IgnoreChangeSetFilter.java
View file
Expand Up @@ -5,13 +5,13 @@
public class IgnoreChangeSetFilter implements ChangeSetFilter {
public ChangeSetFilterResult accepts(ChangeSet changeSet) {
if (changeSet.isIgnore()) {
return new ChangeSetFilterResult(false, "Change set is ignored", this.getClass());
return new ChangeSetFilterResult(false, "Changeset is ignored", this.getClass());
}
else {
if (changeSet.isInheritableIgnore()) {
return new ChangeSetFilterResult(false, "Change set is ignored", this.getClass());
return new ChangeSetFilterResult(false, "Changeset is ignored", this.getClass());
}
}
return new ChangeSetFilterResult(true, "Change set is not ignored", this.getClass());
return new ChangeSetFilterResult(true, "Changeset is not ignored", this.getClass());
}
}

0 comments on commit 958ec59

Please sign in to comment.