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

Upgrade to Liquibase 4.1.0 #10

Merged
merged 1 commit into from
Sep 30, 2020
Merged

Upgrade to Liquibase 4.1.0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</publications>
<dependencies defaultconfmapping="compile->default">
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.30"/>
<dependency org="org.liquibase" name="liquibase-core" rev="4.0.0"/>
<dependency org="org.liquibase" name="liquibase-core" rev="4.1.0"/>
<dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.6.2" conf="test->default"/>
<dependency org="org.mockito" name="mockito-core" rev="3.3.3" conf="test->default"/>
<dependency org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.6.2" conf="junit-platform->default"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/mattbertolini/liquibase/logging/slf4j/Slf4jLogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ public int getPriority() {
*/
@Override
public Logger getLog(Class clazz) {
return new Slf4jLogger(LoggerFactory.getLogger(clazz));
return new Slf4jLogger(LoggerFactory.getLogger(clazz), getFilter());
}
}
4 changes: 3 additions & 1 deletion src/main/java/com/mattbertolini/liquibase/logging/slf4j/Slf4jLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.mattbertolini.liquibase.logging.slf4j;

import liquibase.logging.LogMessageFilter;
import liquibase.logging.core.AbstractLogger;
import org.slf4j.Logger;

Expand Down Expand Up @@ -69,7 +70,8 @@ public class Slf4jLogger extends AbstractLogger {

private final Logger logger;

Slf4jLogger(Logger logger) {
Slf4jLogger(Logger logger, LogMessageFilter filter) {
super(filter);
this.logger = logger;
}

Expand Down
5 changes: 4 additions & 1 deletion src/test/java/com/mattbertolini/liquibase/logging/slf4j/Slf4jLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.mattbertolini.liquibase.logging.slf4j;

import liquibase.logging.LogMessageFilter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
Expand All @@ -36,12 +37,14 @@
class Slf4jLoggerTest {

private Logger delegate;
private LogMessageFilter filter;
private Slf4jLogger logger;

@BeforeEach
void setUp() {
delegate = mock(Logger.class);
logger = new Slf4jLogger(delegate);
filter = mock(LogMessageFilter.class);
logger = new Slf4jLogger(delegate, filter);
}

// log method
Expand Down