Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify lambda expressions when possible #3736

Merged
merged 3 commits into from
Feb 22, 2023
Merged

Simplify lambda expressions when possible #3736

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c3041a
Use lambda expressions with code block bodies when expression-style b…
arturobernalg Jan 27, 2023
8db2820
Merge branch 'feature/lambda-expressions' of https://github.com/artur…
MalloD12 Feb 21, 2023
22be955
Merge branch 'master' into feature/lambda-expressions
filipelautert Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 11 additions & 33 deletions liquibase-core/src/main/java/liquibase/Liquibase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,7 @@ public void update(Contexts contexts, LabelExpression labelExpression, boolean c
//
ChangeLogIterator runChangeLogIterator = getStandardChangelogIterator(contexts, labelExpression, changeLog);
CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
runChangeLogIterator.run(createUpdateVisitor(), new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> runChangeLogIterator.run(createUpdateVisitor(), new RuntimeEnvironment(database, contexts, labelExpression)));

showUpdateSummary(changeLog, statusVisitor);

Expand Down Expand Up @@ -828,12 +826,9 @@ public void run() throws Exception {
new CountChangeSetFilter(changesToApply));

CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
runChangeLogIterator.run(createUpdateVisitor(), new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> runChangeLogIterator.run(createUpdateVisitor(), new RuntimeEnvironment(database, contexts, labelExpression)));

showUpdateSummary(changeLog, statusVisitor);

hubUpdater.postUpdateHub(updateOperation, bufferLog);
}
catch (Throwable e) {
Expand Down Expand Up @@ -963,12 +958,9 @@ public void run() throws Exception {
new UpToTagChangeSetFilter(tag, ranChangeSetList));

CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
runChangeLogIterator.run(createUpdateVisitor(), new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> runChangeLogIterator.run(createUpdateVisitor(), new RuntimeEnvironment(database, contexts, labelExpression)));

showUpdateSummary(changeLog, statusVisitor);

hubUpdater.postUpdateHub(updateOperation, bufferLog);
}
catch (Throwable e) {
Expand Down Expand Up @@ -1221,17 +1213,13 @@ public void run() throws Exception {

CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
if (rollbackScript == null) {
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
logIterator.run(createRollbackVisitor(), new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> logIterator.run(createRollbackVisitor(), new RuntimeEnvironment(database, contexts, labelExpression)));
} else {
List<ChangeSet> changeSets = determineRollbacks(logIterator, contexts, labelExpression);
Map<String, Object> values = new HashMap<>();
values.put(Scope.Attr.logService.name(), compositeLogService);
values.put(BufferedLogService.class.getName(), bufferLog);
Scope.child(values, () -> {
executeRollbackScript(rollbackScript, changeSets, contexts, labelExpression);
});
Scope.child(values, () -> executeRollbackScript(rollbackScript, changeSets, contexts, labelExpression));
removeRunStatus(changeSets, contexts, labelExpression);
}
hubUpdater.postUpdateHub(rollbackOperation, bufferLog);
Expand Down Expand Up @@ -1497,17 +1485,13 @@ public void run() throws Exception {

CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
if (rollbackScript == null) {
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
logIterator.run(createRollbackVisitor(), new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> logIterator.run(createRollbackVisitor(), new RuntimeEnvironment(database, contexts, labelExpression)));
} else {
List<ChangeSet> changeSets = determineRollbacks(logIterator, contexts, labelExpression);
Map<String, Object> values = new HashMap<>();
values.put(Scope.Attr.logService.name(), compositeLogService);
values.put(BufferedLogService.class.getName(), bufferLog);
Scope.child(values, () -> {
executeRollbackScript(rollbackScript, changeSets, contexts, labelExpression);
});
Scope.child(values, () -> executeRollbackScript(rollbackScript, changeSets, contexts, labelExpression));
removeRunStatus(changeSets, contexts, labelExpression);
}
hubUpdater.postUpdateHub(rollbackOperation, bufferLog);
Expand Down Expand Up @@ -1665,17 +1649,13 @@ public void run() throws Exception {

CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
if (rollbackScript == null) {
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
logIterator.run(createRollbackVisitor(), new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> logIterator.run(createRollbackVisitor(), new RuntimeEnvironment(database, contexts, labelExpression)));
} else {
List<ChangeSet> changeSets = determineRollbacks(logIterator, contexts, labelExpression);
Map<String, Object> values = new HashMap<>();
values.put(Scope.Attr.logService.name(), compositeLogService);
values.put(BufferedLogService.class.getName(), bufferLog);
Scope.child(values, () -> {
executeRollbackScript(rollbackScript, changeSets, contexts, labelExpression);
});
Scope.child(values, () -> executeRollbackScript(rollbackScript, changeSets, contexts, labelExpression));
removeRunStatus(changeSets, contexts, labelExpression);
}
hubUpdater.postUpdateHub(rollbackOperation, bufferLog);
Expand Down Expand Up @@ -1807,10 +1787,8 @@ public void run() throws Exception {

ChangeLogIterator runChangeLogIterator = buildChangeLogIterator(tag, changeLog, contexts, labelExpression);
CompositeLogService compositeLogService = new CompositeLogService(true, bufferLog);
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> {
runChangeLogIterator.run(new ChangeLogSyncVisitor(database, changeLogSyncListener),
new RuntimeEnvironment(database, contexts, labelExpression));
});
Scope.child(Scope.Attr.logService.name(), compositeLogService, () -> runChangeLogIterator.run(new ChangeLogSyncVisitor(database, changeLogSyncListener),
new RuntimeEnvironment(database, contexts, labelExpression)));
hubUpdater.postUpdateHub(changeLogSyncOperation, bufferLog);
}
catch (Exception e) {
Expand Down
4 changes: 1 addition & 3 deletions liquibase-core/src/main/java/liquibase/changelog/ChangeLogIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ public void run() throws Exception {
Map<String, Object> values = new HashMap<>();
values.put(Scope.Attr.logService.name(), compositeLogService);
values.put(BufferedLogService.class.getName(), bufferLog);
Scope.child(values, () -> {
visitor.visit(changeSet, databaseChangeLog, env.getTargetDatabase(), reasonsAccepted);
});
Scope.child(values, () -> visitor.visit(changeSet, databaseChangeLog, env.getTargetDatabase(), reasonsAccepted));
markSeen(changeSet);
} else {
if (visitor instanceof SkippedChangeSetVisitor) {
Expand Down
4 changes: 1 addition & 3 deletions liquibase-core/src/main/java/liquibase/command/core/StartH2CommandStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ public void run(CommandResultsBuilder resultsBuilder) throws Exception {
" Integration Web URL: " + intUrl + System.lineSeparator());


Runtime.getRuntime().addShutdownHook(new Thread(() -> {
Scope.getCurrentScope().getUI().sendMessage("Shutting down H2 database...");
}));
Runtime.getRuntime().addShutdownHook(new Thread(() -> Scope.getCurrentScope().getUI().sendMessage("Shutting down H2 database...")));

Thread.sleep(Long.MAX_VALUE);
} catch (InterruptedException e) {
Expand Down
18 changes: 8 additions & 10 deletions liquibase-core/src/main/java/liquibase/sqlgenerator/core/DropDefaultValueGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@

public class DropDefaultValueGenerator extends AbstractSqlGenerator<DropDefaultValueStatement> {

public static BiFunction DROP_DF_MSSQL = (tableName, columnName) -> {
return "DECLARE @sql [nvarchar](MAX)\r\n" +
"SELECT @sql = N'ALTER TABLE " + tableName + " DROP CONSTRAINT ' + QUOTENAME([df].[name]) " +
"FROM [sys].[columns] AS [c] " +
"INNER JOIN [sys].[default_constraints] AS [df] " +
"ON [df].[object_id] = [c].[default_object_id] " +
"WHERE [c].[object_id] = OBJECT_ID(N'" + tableName + "') " +
"AND [c].[name] = N'" + columnName + "'\r\n" +
"EXEC sp_executesql @sql";
};
public static BiFunction DROP_DF_MSSQL = (tableName, columnName) -> "DECLARE @sql [nvarchar](MAX)\r\n" +
"SELECT @sql = N'ALTER TABLE " + tableName + " DROP CONSTRAINT ' + QUOTENAME([df].[name]) " +
"FROM [sys].[columns] AS [c] " +
"INNER JOIN [sys].[default_constraints] AS [df] " +
"ON [df].[object_id] = [c].[default_object_id] " +
"WHERE [c].[object_id] = OBJECT_ID(N'" + tableName + "') " +
"AND [c].[name] = N'" + columnName + "'\r\n" +
"EXEC sp_executesql @sql";

@Override
public boolean supports(DropDefaultValueStatement statement, Database database) {
Expand Down
4 changes: 1 addition & 3 deletions liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/AbstractLiquibaseMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,9 +779,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
//
Map<String, Object> innerScopeValues = new HashMap<>();
innerScopeValues.put(key, preserveSchemaCase);
Scope.child(innerScopeValues, () -> {
performLiquibaseTask(liquibase);
});
Scope.child(innerScopeValues, () -> performLiquibaseTask(liquibase));
} catch (LiquibaseException e) {
cleanup(database);
throw new MojoExecutionException("\nError setting up or running Liquibase:\n" + e.getMessage(), e);
Expand Down