Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

use GrailsStringUtils.trimToNull() instead of apache commons version #993

Merged
merged 1 commit into from
Mar 7, 2025
Merged

use GrailsStringUtils.trimToNull() instead of apache commons version #993

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
4 changes: 3 additions & 1 deletion grails-database-migration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,21 @@ dependencies {
exclude group: 'com.h2database', module: 'h2'
exclude group: 'org.liquibase', module: 'liquibase-commercial'
}
api 'org.apache.commons:commons-lang3'

api('org.grails:grails-shell') {
exclude group: 'org.slf4j', module: 'slf4j-simple'
}

compileOnly "org.springframework.boot:spring-boot-starter-logging"
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
compileOnly "org.grails.plugins:hibernate5"
compileOnly "org.grails:grails-core"
compileOnly "org.apache.groovy:groovy-sql"
compileOnly "org.apache.groovy:groovy-xml"

testImplementation "org.springframework.boot:spring-boot-starter-tomcat"
testImplementation "org.grails.plugins:hibernate5"
testImplementation "org.grails:grails-core"
testImplementation "org.grails:grails-gorm-testing-support"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "com.h2database:h2"
Expand Down
4 changes: 2 additions & 2 deletions ...vy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import liquibase.database.ObjectQuotingStrategy
import liquibase.diff.DiffResult
import liquibase.diff.output.DiffOutputControl
import liquibase.serializer.ChangeLogSerializerFactory
import org.apache.commons.lang3.StringUtils
import grails.util.GrailsStringUtils

@CompileStatic
class GroovyDiffToChangeLogCommandStep extends DiffChangelogCommandStep {
Expand All @@ -55,7 +55,7 @@ class GroovyDiffToChangeLogCommandStep extends DiffChangelogCommandStep {

try {
referenceDatabase.setObjectQuotingStrategy(ObjectQuotingStrategy.QUOTE_ALL_OBJECTS);
if (StringUtils.trimToNull(changeLogFile) == null) {
if (GrailsStringUtils.trimToNull(changeLogFile) == null) {
createDiffToChangeLogObject(diffResult, diffOutputControl, false).print(outputStream, ChangeLogSerializerFactory.instance.getSerializer('groovy'))
} else {
createDiffToChangeLogObject(diffResult, diffOutputControl, false).print(changeLogFile, ChangeLogSerializerFactory.instance.getSerializer(changeLogFile))
Expand Down
8 changes: 4 additions & 4 deletions .../org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import liquibase.diff.DiffResult
import liquibase.diff.output.DiffOutputControl
import liquibase.diff.output.changelog.DiffToChangeLog
import liquibase.serializer.ChangeLogSerializerFactory
import org.apache.commons.lang3.StringUtils
import grails.util.GrailsStringUtils

@CompileStatic
class GroovyGenerateChangeLogCommandStep extends GenerateChangelogCommandStep {
Expand All @@ -46,7 +46,7 @@ class GroovyGenerateChangeLogCommandStep extends GenerateChangelogCommandStep {
void run(CommandResultsBuilder resultsBuilder) throws Exception {
CommandScope commandScope = resultsBuilder.getCommandScope();

String changeLogFile = StringUtils.trimToNull(commandScope.getArgumentValue(CHANGELOG_FILE_ARG));
String changeLogFile = GrailsStringUtils.trimToNull(commandScope.getArgumentValue(CHANGELOG_FILE_ARG));
if (changeLogFile != null && changeLogFile.toLowerCase().endsWith(".sql")) {
Scope.getCurrentScope().getUI().sendMessage("\n" + INFO_MESSAGE + "\n");
Scope.getCurrentScope().getLog(getClass()).info("\n" + INFO_MESSAGE + "\n");
Expand All @@ -71,7 +71,7 @@ class GroovyGenerateChangeLogCommandStep extends GenerateChangelogCommandStep {
ObjectQuotingStrategy originalStrategy = referenceDatabase.getObjectQuotingStrategy();
try {
referenceDatabase.setObjectQuotingStrategy(ObjectQuotingStrategy.QUOTE_ALL_OBJECTS);
if (StringUtils.trimToNull(changeLogFile) != null) {
if (GrailsStringUtils.trimToNull(changeLogFile) != null) {
changeLogWriter.print(changeLogFile, ChangeLogSerializerFactory.instance.getSerializer(changeLogFile))
} else {
PrintStream outputStream = new PrintStream(resultsBuilder.getOutputStream());
Expand All @@ -82,7 +82,7 @@ class GroovyGenerateChangeLogCommandStep extends GenerateChangelogCommandStep {
}

}
if (StringUtils.trimToNull(changeLogFile) != null) {
if (GrailsStringUtils.trimToNull(changeLogFile) != null) {
Scope.getCurrentScope().getUI().sendMessage("Generated changelog written to " + new File(changeLogFile).getAbsolutePath());
}
} finally {
Expand Down
Loading