Feature/adding some generics #5830
Open
+164
−206
Conversation
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
make the code more generic
This reverts commit 60bc759.
MichaelKern-IVV
temporarily deployed
to
external
GitHub Actions
Inactive
Signed-off-by: MichaelKern-IVV <102645261+MichaelKern-IVV@users.noreply.github.com>
MichaelKern-IVV
temporarily deployed
to
external
GitHub Actions
Inactive
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
liquibase-standard/src/main/java/liquibase/executor/jvm/JdbcExecutor.java
Fixed
Show resolved
Hide resolved
liquibase-standard/src/main/java/liquibase/executor/jvm/SingleColumnRowMapper.java
Fixed
Show resolved
Hide resolved
liquibase-standard/src/main/java/liquibase/diff/Difference.java
Dismissed
Show resolved
Hide resolved
MichaelKern-IVV
temporarily deployed
to
external
GitHub Actions
Inactive
MichaelKern-IVV
had a problem deploying
to
external
GitHub Actions
Error
MichaelKern-IVV
temporarily deployed
to
external
GitHub Actions
Inactive
MalloD12
reviewed
May 6, 2024
| @@ -12,7 +12,7 @@ | |||
| /** | |||
| * @deprecated Implement commands with {@link liquibase.command.CommandStep} and call them with {@link liquibase.command.CommandFactory#getCommandDefinition(String...)}. | |||
| */ | |||
| public class HistoryCommand extends AbstractCommand { | |||
| public class HistoryCommand extends AbstractCommand<CommandResult> { | |||
There was a problem hiding this comment.
Not sure if this could have a negative impact, but we try to avoid updating public elements (return types, method signatures, class definition, etc) as in some cases it could be a breaking change for some people depending on how they are using methods/classes. Maybe this case doesn't hurt, but considering our guidelines I should revert this one.
MalloD12
reviewed
May 6, 2024
| @@ -31,7 +31,7 @@ public ColumnMapRowMapper(boolean caseSensitiveDatabase) { | |||
| } | |||
|
|
|||
| @Override | |||
| public Object mapRow(ResultSet rs, int rowNum) throws SQLException { | |||
| public Map<String,?> mapRow(ResultSet rs, int rowNum) throws SQLException { | |||
MalloD12
reviewed
May 6, 2024
| @Override | ||
| public Object doInStatement(Statement stmt) throws SQLException, DatabaseException { | ||
| public Integer doInStatement(Statement stmt) throws SQLException, DatabaseException { |
There was a problem hiding this comment.
I think this case I would leave it as it was because it's updating a public method and there is only one place where it is cast to an Integer.
|
Hi @MichaelKern-IVV, Thank you for creating this enhancement PR, as mentioned in some comments we try to avoid updating Thanks, |
MalloD12
reviewed
May 7, 2024
| @@ -36,11 +36,11 @@ public RowMapperNotNullConstraintsResultSetExtractor(RowMapper rowMapper) { | |||
| } | |||
|
|
|||
| @Override | |||
| public Object extractData(ResultSet resultSet) throws SQLException { | |||
| List<Object> resultList = (this.rowsExpected > 0 ? new ArrayList<>(this.rowsExpected) : new ArrayList<>()); | |||
| public List<Map<String,?>> extractData(ResultSet resultSet) throws SQLException { | |||
MalloD12
reviewed
May 7, 2024
| @@ -5,12 +5,10 @@ | |||
| public class CachedRow { | |||
| private final Map row; | |||
|
|
|||
| public CachedRow(Map row) { | |||
| public CachedRow(Map<String,?> row) { | |||
MalloD12
reviewed
May 7, 2024
| @@ -16,8 +16,8 @@ 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); | |||
| public static <T extends Number> T convertNumberToTargetClass(Number number, Class<T> targetClass) throws IllegalArgumentException { | |||
There was a problem hiding this comment.
I think as this is a deprecated method it's not worth to update it.
MalloD12
reviewed
May 7, 2024
| this.sql = sql; | ||
| this.rse = rse; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public Object doInCallableStatement(CallableStatement cs) throws SQLException, DatabaseException { | ||
| public List<T> doInCallableStatement(CallableStatement cs) throws SQLException, DatabaseException { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Impact
Description
Make more use of generics in order to