diff --git a/.editorconfig b/.editorconfig index 837d975fa..18b710430 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,4 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true spaces_around_operators = true +max_line_length = 130 diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index 900e049f3..d767d62a6 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -268,8 +268,7 @@ public class DefaultDbMigration implements DbMigration { if (extraDdl != null) { List ddlScript = extraDdl.getDdlScript(); for (DdlScript script : ddlScript) { - if (script.isDrop() == false - && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) { + if (!script.isDrop() && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) { writeExtraDdl(migrationDir, script); } } diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java index b9c7e8392..629c9d202 100644 --- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java @@ -1,10 +1,9 @@ package io.ebeaninternal.extraddl.model; +import io.ebean.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.ebean.util.StringHelper; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; @@ -28,8 +27,7 @@ public class ExtraDdlXmlReader { } StringBuilder sb = new StringBuilder(300); for (DdlScript script : read.getDdlScript()) { - if (script.isDrop() == drops - && matchPlatform(platformName, script.getPlatforms())) { + if (script.isDrop() == drops && matchPlatform(platformName, script.getPlatforms())) { logger.debug("include script {}", script.getName()); String value = script.getValue(); sb.append(value);