From 08838770e95c7507f6a34bc9100868037b8bc62c Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 17 Feb 2022 14:45:02 +0100 Subject: [PATCH] No effective code change: Removed obsolete IOExceptions --- .../dbmigration/DdlGenerator.java | 16 +-- .../ddlgeneration/BaseDdlHandler.java | 31 +++-- .../dbmigration/ddlgeneration/ColumnDdl.java | 8 +- .../dbmigration/ddlgeneration/DdlHandler.java | 32 +++--- .../dbmigration/ddlgeneration/TableDdl.java | 30 +++-- .../ddlgeneration/platform/BaseTableDdl.java | 107 +++++++++--------- .../ddlgeneration/platform/HanaTableDdl.java | 9 +- .../dbmigration/model/CurrentModel.java | 7 +- .../platform/BaseTableDdlTest.java | 15 ++- .../ddlgeneration/platform/HanaDdlTest.java | 6 +- .../platform/PlatformDdl_AlterColumnTest.java | 4 +- 11 files changed, 121 insertions(+), 144 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index b9fead35b..9e6d7ea28 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -305,21 +305,13 @@ public class DdlGenerator implements SpiDdlGenerator { } protected String generateDropAllDdl() { - try { - dropAllContent = currentModel().getDropAllDdl(); - return dropAllContent; - } catch (IOException e) { - throw new RuntimeException(e); - } + dropAllContent = currentModel().getDropAllDdl(); + return dropAllContent; } protected String generateCreateAllDdl() { - try { - createAllContent = currentModel().getCreateDdl(); - return createAllContent; - } catch (IOException e) { - throw new RuntimeException(e); - } + createAllContent = currentModel().getCreateDdl(); + return createAllContent; } protected String getDropFileName() { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java index 870d90472..a78219962 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java @@ -17,7 +17,6 @@ import io.ebeaninternal.dbmigration.migration.DropHistoryTable; import io.ebeaninternal.dbmigration.migration.DropIndex; import io.ebeaninternal.dbmigration.migration.DropTable; -import java.io.IOException; import java.util.List; /** @@ -36,7 +35,7 @@ public class BaseDdlHandler implements DdlHandler { } @Override - public void generate(DdlWrite writer, ChangeSet changeSet) throws IOException { + public void generate(DdlWrite writer, ChangeSet changeSet) { List changeSetChildren = changeSet.getChangeSetChildren(); for (Object change : changeSetChildren) { @@ -76,72 +75,72 @@ public class BaseDdlHandler implements DdlHandler { } @Override - public void generateProlog(DdlWrite write) throws IOException { + public void generateProlog(DdlWrite write) { tableDdl.generateProlog(write); } @Override - public void generateEpilog(DdlWrite write) throws IOException { + public void generateEpilog(DdlWrite write) { tableDdl.generateEpilog(write); } @Override - public void generate(DdlWrite writer, CreateTable createTable) throws IOException { + public void generate(DdlWrite writer, CreateTable createTable) { tableDdl.generate(writer, createTable); } @Override - public void generate(DdlWrite writer, DropTable dropTable) throws IOException { + public void generate(DdlWrite writer, DropTable dropTable) { tableDdl.generate(writer, dropTable); } @Override - public void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException { + public void generate(DdlWrite writer, AddTableComment addTableComment) { tableDdl.generate(writer, addTableComment); } @Override - public void generate(DdlWrite writer, AddColumn addColumn) throws IOException { + public void generate(DdlWrite writer, AddColumn addColumn) { tableDdl.generate(writer, addColumn); } @Override - public void generate(DdlWrite writer, DropColumn dropColumn) throws IOException { + public void generate(DdlWrite writer, DropColumn dropColumn) { tableDdl.generate(writer, dropColumn); } @Override - public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException { + public void generate(DdlWrite writer, AlterColumn alterColumn) { tableDdl.generate(writer, alterColumn); } @Override - public void generate(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException { + public void generate(DdlWrite writer, AddHistoryTable addHistoryTable) { tableDdl.generate(writer, addHistoryTable); } @Override - public void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException { + public void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) { tableDdl.generate(writer, dropHistoryTable); } @Override - public void generate(DdlWrite writer, CreateIndex createIndex) throws IOException { + public void generate(DdlWrite writer, CreateIndex createIndex) { tableDdl.generate(writer, createIndex); } @Override - public void generate(DdlWrite writer, DropIndex dropIndex) throws IOException { + public void generate(DdlWrite writer, DropIndex dropIndex) { tableDdl.generate(writer, dropIndex); } @Override - public void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException { + public void generate(DdlWrite writer, AddUniqueConstraint constraint) { tableDdl.generate(writer, constraint); } @Override - public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException { + public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) { tableDdl.generate(writer, alterForeignKey); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java index fa334e88a..e4189997f 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java @@ -4,8 +4,6 @@ import io.ebeaninternal.dbmigration.migration.AddColumn; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.DropColumn; -import java.io.IOException; - /** * Write DDL for AddColumn , DropColumn or AlterColumn. */ @@ -14,15 +12,15 @@ public interface ColumnDdl { /** * Write the add column change. */ - void generate(DdlWrite writer, AddColumn addColumn) throws IOException; + void generate(DdlWrite writer, AddColumn addColumn); /** * Write the drop column change. */ - void generate(DdlWrite writer, DropColumn dropColumn) throws IOException; + void generate(DdlWrite writer, DropColumn dropColumn); /** * Write the alter column changes. */ - void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException; + void generate(DdlWrite writer, AlterColumn alterColumn); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java index 9a693640f..b16939527 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java @@ -14,40 +14,38 @@ import io.ebeaninternal.dbmigration.migration.DropHistoryTable; import io.ebeaninternal.dbmigration.migration.DropIndex; import io.ebeaninternal.dbmigration.migration.DropTable; -import java.io.IOException; - /** * DDL generation interface. */ public interface DdlHandler { - void generate(DdlWrite writer, ChangeSet changeSet) throws IOException; + void generate(DdlWrite writer, ChangeSet changeSet); - void generate(DdlWrite writer, CreateTable createTable) throws IOException; + void generate(DdlWrite writer, CreateTable createTable); - void generate(DdlWrite writer, DropTable dropTable) throws IOException; + void generate(DdlWrite writer, DropTable dropTable); - void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException; + void generate(DdlWrite writer, AddTableComment addTableComment); - void generate(DdlWrite writer, AddColumn addColumn) throws IOException; + void generate(DdlWrite writer, AddColumn addColumn); - void generate(DdlWrite writer, DropColumn dropColumn) throws IOException; + void generate(DdlWrite writer, DropColumn dropColumn); - void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException; + void generate(DdlWrite writer, AlterColumn alterColumn); - void generate(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException; + void generate(DdlWrite writer, AddHistoryTable addHistoryTable); - void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException; + void generate(DdlWrite writer, DropHistoryTable dropHistoryTable); - void generate(DdlWrite writer, CreateIndex createIndex) throws IOException; + void generate(DdlWrite writer, CreateIndex createIndex); - void generate(DdlWrite writer, DropIndex dropIndex) throws IOException; + void generate(DdlWrite writer, DropIndex dropIndex); - void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException; + void generate(DdlWrite writer, AddUniqueConstraint constraint); - void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException; + void generate(DdlWrite writer, AlterForeignKey alterForeignKey); - void generateProlog(DdlWrite write) throws IOException; + void generateProlog(DdlWrite write); - void generateEpilog(DdlWrite write) throws IOException; + void generateEpilog(DdlWrite write); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java index 1ef34384b..493a0f10d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java @@ -13,8 +13,6 @@ import io.ebeaninternal.dbmigration.migration.DropHistoryTable; import io.ebeaninternal.dbmigration.migration.DropIndex; import io.ebeaninternal.dbmigration.migration.DropTable; -import java.io.IOException; - /** * Write table DDL. */ @@ -23,70 +21,70 @@ public interface TableDdl { /** * Generate the create table change. */ - void generate(DdlWrite writer, CreateTable createTable) throws IOException; + void generate(DdlWrite writer, CreateTable createTable); /** * Write the drop column change. */ - void generate(DdlWrite writer, DropTable dropTable) throws IOException; + void generate(DdlWrite writer, DropTable dropTable); /** * Write the add column change. */ - void generate(DdlWrite writer, AddColumn addColumn) throws IOException; + void generate(DdlWrite writer, AddColumn addColumn); /** * Write the alter column changes. */ - void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException; + void generate(DdlWrite writer, AlterColumn alterColumn); /** * Write the drop column change. */ - void generate(DdlWrite writer, DropColumn dropColumn) throws IOException; + void generate(DdlWrite writer, DropColumn dropColumn); /** * Write the AddTableComment change. */ - void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException; + void generate(DdlWrite writer, AddTableComment addTableComment); /** * Write the AddHistoryTable change. */ - void generate(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException; + void generate(DdlWrite writer, AddHistoryTable addHistoryTable); /** * Write the DropHistoryTable change. */ - void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException; + void generate(DdlWrite writer, DropHistoryTable dropHistoryTable); /** * Generate the create index change. */ - void generate(DdlWrite writer, CreateIndex createIndex) throws IOException; + void generate(DdlWrite writer, CreateIndex createIndex); /** * Write the drop index change. */ - void generate(DdlWrite writer, DropIndex dropIndex) throws IOException; + void generate(DdlWrite writer, DropIndex dropIndex); /** * Write add unique constraint. */ - void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException; + void generate(DdlWrite writer, AddUniqueConstraint constraint); /** * Writes alter foreign key statements. */ - void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException; + void generate(DdlWrite writer, AlterForeignKey alterForeignKey); /** * Generate any extra DDL such as stored procedures or TableValueParameters. */ - void generateProlog(DdlWrite write) throws IOException; + void generateProlog(DdlWrite write); /** * Generate any extra DDL such as regeneration of history triggers. */ - void generateEpilog(DdlWrite write) throws IOException; + void generateEpilog(DdlWrite write); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index 0e80c2676..34839184c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -32,7 +32,6 @@ import io.ebeaninternal.dbmigration.model.MTable; import io.ebeaninternal.dbmigration.model.MTableIdentity; import io.ebeaninternal.server.deploy.IdentityMode; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -141,7 +140,7 @@ public class BaseTableDdl implements TableDdl { after = getScriptsForPlatform(alter.getAfter()); } - void writeBefore(DdlBuffer buffer) throws IOException { + void writeBefore(DdlBuffer buffer) { if (!before.isEmpty()) { buffer.end(); } @@ -154,7 +153,7 @@ public class BaseTableDdl implements TableDdl { } } - void writeAfter(DdlBuffer buffer) throws IOException { + void writeAfter(DdlBuffer buffer) { if (!after.isEmpty() && withHistory) { buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine(); } @@ -235,7 +234,7 @@ public class BaseTableDdl implements TableDdl { * and add them to the appropriate 'apply' and 'rollback' buffers. */ @Override - public void generate(DdlWrite writer, CreateTable createTable) throws IOException { + public void generate(DdlWrite writer, CreateTable createTable) { reset(); String tableName = lowerTableName(createTable.getName()); @@ -308,7 +307,7 @@ public class BaseTableDdl implements TableDdl { /** * Add table and column comments (separate from the create table statement). */ - private void addComments(DdlBuffer apply, CreateTable createTable) throws IOException { + private void addComments(DdlBuffer apply, CreateTable createTable) { if (!platformDdl.isInlineComments()) { String tableComment = createTable.getComment(); if (hasValue(tableComment)) { @@ -325,7 +324,7 @@ public class BaseTableDdl implements TableDdl { /** * Add the table storage engine clause. */ - private void addTableStorageEngine(DdlBuffer apply, CreateTable createTable) throws IOException { + private void addTableStorageEngine(DdlBuffer apply, CreateTable createTable) { if (platformDdl.isIncludeStorageEngine()) { platformDdl.tableStorageEngine(apply, createTable.getStorageEngine()); } @@ -334,7 +333,7 @@ public class BaseTableDdl implements TableDdl { /** * Add the table comment inline with the create table statement. */ - private void addTableCommentInline(DdlBuffer apply, CreateTable createTable) throws IOException { + private void addTableCommentInline(DdlBuffer apply, CreateTable createTable) { if (platformDdl.isInlineComments()) { String tableComment = createTable.getComment(); if (!StringHelper.isNull(tableComment)) { @@ -343,7 +342,7 @@ public class BaseTableDdl implements TableDdl { } } - private void writeTableColumns(DdlBuffer apply, List columns, DdlIdentity identity) throws IOException { + private void writeTableColumns(DdlBuffer apply, List columns, DdlIdentity identity) { platformDdl.writeTableColumns(apply, columns, identity); } @@ -351,7 +350,7 @@ public class BaseTableDdl implements TableDdl { * Specific handling of OneToOne unique constraints for MsSqlServer. * For all other DB platforms these unique constraints are done inline as per normal. */ - protected void writeUniqueOneToOneConstraints(DdlWrite write, CreateTable createTable) throws IOException { + protected void writeUniqueOneToOneConstraints(DdlWrite write, CreateTable createTable) { String tableName = createTable.getName(); for (Column col : externalUnique) { String uqName = col.getUniqueOneToOne(); @@ -373,7 +372,7 @@ public class BaseTableDdl implements TableDdl { } } - protected void writeSequence(DdlWrite writer, DdlIdentity identity) throws IOException { + protected void writeSequence(DdlWrite writer, DdlIdentity identity) { String seqName = identity.getSequenceName(); String createSeq = platformDdl.createSequence(seqName, identity); if (hasValue(createSeq)) { @@ -382,12 +381,12 @@ public class BaseTableDdl implements TableDdl { } } - protected void createWithHistory(DdlWrite writer, String name) throws IOException { + protected void createWithHistory(DdlWrite writer, String name) { MTable table = writer.getTable(name); platformDdl.createWithHistory(writer, table); } - protected void writeInlineForeignKeys(DdlWrite write, CreateTable createTable) throws IOException { + protected void writeInlineForeignKeys(DdlWrite write, CreateTable createTable) { for (Column column : createTable.getColumn()) { String references = column.getReferences(); if (hasValue(references)) { @@ -397,19 +396,19 @@ public class BaseTableDdl implements TableDdl { writeInlineCompoundForeignKeys(write, createTable); } - protected void writeInlineForeignKey(DdlWrite write, Column column) throws IOException { + protected void writeInlineForeignKey(DdlWrite write, Column column) { String fkConstraint = platformDdl.tableInlineForeignKey(new WriteForeignKey(null, column)); write.apply().append(",").newLine().append(" ").append(fkConstraint); } - protected void writeInlineCompoundForeignKeys(DdlWrite write, CreateTable createTable) throws IOException { + protected void writeInlineCompoundForeignKeys(DdlWrite write, CreateTable createTable) { for (ForeignKey key : createTable.getForeignKey()) { String fkConstraint = platformDdl.tableInlineForeignKey(new WriteForeignKey(null, key)); write.apply().append(",").newLine().append(" ").append(fkConstraint); } } - protected void writeAddForeignKeys(DdlWrite write, CreateTable createTable) throws IOException { + protected void writeAddForeignKeys(DdlWrite write, CreateTable createTable) { for (Column column : createTable.getColumn()) { String references = column.getReferences(); if (hasValue(references)) { @@ -419,17 +418,17 @@ public class BaseTableDdl implements TableDdl { writeAddCompoundForeignKeys(write, createTable); } - protected void writeAddCompoundForeignKeys(DdlWrite write, CreateTable createTable) throws IOException { + protected void writeAddCompoundForeignKeys(DdlWrite write, CreateTable createTable) { for (ForeignKey key : createTable.getForeignKey()) { writeForeignKey(write, new WriteForeignKey(createTable.getName(), key)); } } - protected void writeForeignKey(DdlWrite write, String tableName, Column column) throws IOException { + protected void writeForeignKey(DdlWrite write, String tableName, Column column) { writeForeignKey(write, new WriteForeignKey(tableName, column)); } - protected void writeForeignKey(DdlWrite write, WriteForeignKey request) throws IOException { + protected void writeForeignKey(DdlWrite write, WriteForeignKey request) { DdlBuffer fkeyBuffer = write.applyForeignKeys(); String tableName = lowerTableName(request.table()); if (request.indexName() != null) { @@ -446,11 +445,11 @@ public class BaseTableDdl implements TableDdl { write.dropAllForeignKeys().end(); } - protected void alterTableAddForeignKey(DdlOptions options, DdlBuffer buffer, WriteForeignKey request) throws IOException { + protected void alterTableAddForeignKey(DdlOptions options, DdlBuffer buffer, WriteForeignKey request) { buffer.appendStatement(platformDdl.alterTableAddForeignKey(options, request)); } - protected void appendColumns(String[] columns, DdlBuffer buffer) throws IOException { + protected void appendColumns(String[] columns, DdlBuffer buffer) { buffer.append(" ("); for (int i = 0; i < columns.length; i++) { if (i > 0) { @@ -464,18 +463,18 @@ public class BaseTableDdl implements TableDdl { /** * Add 'drop table' statement to the buffer. */ - protected void dropTable(DdlBuffer buffer, String tableName) throws IOException { + protected void dropTable(DdlBuffer buffer, String tableName) { buffer.appendStatement(platformDdl.dropTable(tableName)); } /** * Add 'drop sequence' statement to the buffer. */ - protected void dropSequence(DdlBuffer buffer, String sequenceName) throws IOException { + protected void dropSequence(DdlBuffer buffer, String sequenceName) { buffer.appendStatement(platformDdl.dropSequence(sequenceName)); } - protected void writeCompoundUniqueConstraints(DdlBuffer apply, CreateTable createTable) throws IOException { + protected void writeCompoundUniqueConstraints(DdlBuffer apply, CreateTable createTable) { boolean inlineUniqueWhenNull = platformDdl.isInlineUniqueWhenNullable(); for (UniqueConstraint uniqueConstraint : createTable.getUniqueConstraint()) { if (platformInclude(uniqueConstraint.getPlatforms())) { @@ -498,7 +497,7 @@ public class BaseTableDdl implements TableDdl { /** * Write the unique constraints inline with the create table statement. */ - protected void writeUniqueConstraints(DdlBuffer apply, CreateTable createTable) throws IOException { + protected void writeUniqueConstraints(DdlBuffer apply, CreateTable createTable) { boolean inlineUniqueWhenNullable = platformDdl.isInlineUniqueWhenNullable(); List columns = new WriteUniqueConstraint(createTable.getColumn()).uniqueKeys(); for (Column column : columns) { @@ -515,7 +514,7 @@ public class BaseTableDdl implements TableDdl { /** * Write the unique constraint inline with the create table statement. */ - protected void inlineUniqueConstraintSingle(DdlBuffer buffer, Column column) throws IOException { + protected void inlineUniqueConstraintSingle(DdlBuffer buffer, Column column) { String uqName = column.getUnique(); if (uqName == null) { uqName = column.getUniqueOneToOne(); @@ -530,7 +529,7 @@ public class BaseTableDdl implements TableDdl { /** * Write the primary key constraint inline with the create table statement. */ - protected void writePrimaryKeyConstraint(DdlBuffer buffer, String pkName, String[] pkColumns) throws IOException { + protected void writePrimaryKeyConstraint(DdlBuffer buffer, String pkName, String[] pkColumns) { buffer.append(",").newLine(); buffer.append(" constraint ").append(pkName).append(" primary key"); appendColumns(pkColumns, buffer); @@ -575,7 +574,7 @@ public class BaseTableDdl implements TableDdl { } @Override - public void generate(DdlWrite writer, CreateIndex index) throws IOException { + public void generate(DdlWrite writer, CreateIndex index) { if (platformInclude(index.getPlatforms())) { writer.apply().appendStatement(platformDdl.createIndex(new WriteCreateIndex(index))); writer.dropAll().appendStatement(platformDdl.dropIndex(index.getIndexName(), index.getTableName(), Boolean.TRUE.equals(index.isConcurrent()))); @@ -583,14 +582,14 @@ public class BaseTableDdl implements TableDdl { } @Override - public void generate(DdlWrite writer, DropIndex dropIndex) throws IOException { + public void generate(DdlWrite writer, DropIndex dropIndex) { if (platformInclude(dropIndex.getPlatforms())) { writer.apply().appendStatement(platformDdl.dropIndex(dropIndex.getIndexName(), dropIndex.getTableName(), Boolean.TRUE.equals(dropIndex.isConcurrent()))); } } @Override - public void generate(DdlWrite writer, AddUniqueConstraint constraint) throws IOException { + public void generate(DdlWrite writer, AddUniqueConstraint constraint) { if (platformInclude(constraint.getPlatforms())) { if (DdlHelp.isDropConstraint(constraint.getColumnNames())) { writer.apply().appendStatement(platformDdl.alterTableDropUniqueConstraint(constraint.getTableName(), constraint.getConstraintName())); @@ -604,7 +603,7 @@ public class BaseTableDdl implements TableDdl { } @Override - public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) throws IOException { + public void generate(DdlWrite writer, AlterForeignKey alterForeignKey) { if (DdlHelp.isDropForeignKey(alterForeignKey.getColumnNames())) { writer.apply().appendStatement(platformDdl.alterTableDropForeignKey(alterForeignKey.getTableName(), alterForeignKey.getName())); } else { @@ -616,7 +615,7 @@ public class BaseTableDdl implements TableDdl { * Add add history table DDL. */ @Override - public void generate(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException { + public void generate(DdlWrite writer, AddHistoryTable addHistoryTable) { platformDdl.addHistoryTable(writer, addHistoryTable); } @@ -624,12 +623,12 @@ public class BaseTableDdl implements TableDdl { * Add drop history table DDL. */ @Override - public void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException { + public void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) { platformDdl.dropHistoryTable(writer, dropHistoryTable); } @Override - public void generateProlog(DdlWrite write) throws IOException { + public void generateProlog(DdlWrite write) { platformDdl.generateProlog(write); } @@ -637,7 +636,7 @@ public class BaseTableDdl implements TableDdl { * Called at the end to generate additional ddl such as regenerate history triggers. */ @Override - public void generateEpilog(DdlWrite write) throws IOException { + public void generateEpilog(DdlWrite write) { if (!regenerateHistoryTriggers.isEmpty()) { platformDdl.lockTables(write.applyHistoryTrigger(), regenerateHistoryTriggers.keySet()); @@ -651,7 +650,7 @@ public class BaseTableDdl implements TableDdl { } @Override - public void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException { + public void generate(DdlWrite writer, AddTableComment addTableComment) { if (hasValue(addTableComment.getComment())) { platformDdl.addTableComment(writer.apply(), addTableComment.getName(), addTableComment.getComment()); } @@ -661,7 +660,7 @@ public class BaseTableDdl implements TableDdl { * Add add column DDL. */ @Override - public void generate(DdlWrite writer, AddColumn addColumn) throws IOException { + public void generate(DdlWrite writer, AddColumn addColumn) { String tableName = addColumn.getTableName(); List columns = addColumn.getColumn(); for (Column column : columns) { @@ -687,7 +686,7 @@ public class BaseTableDdl implements TableDdl { * Add drop table DDL. */ @Override - public void generate(DdlWrite writer, DropTable dropTable) throws IOException { + public void generate(DdlWrite writer, DropTable dropTable) { dropTable(writer.apply(), dropTable.getName()); if (hasValue(dropTable.getSequenceCol()) && platformDdl.getPlatform().getDbIdentity().isSupportsSequence()) { @@ -703,7 +702,7 @@ public class BaseTableDdl implements TableDdl { * Add drop column DDL. */ @Override - public void generate(DdlWrite writer, DropColumn dropColumn) throws IOException { + public void generate(DdlWrite writer, DropColumn dropColumn) { String tableName = dropColumn.getTableName(); alterTableDropColumn(writer.apply(), tableName, dropColumn.getColumnName()); @@ -719,7 +718,7 @@ public class BaseTableDdl implements TableDdl { * Add all the appropriate changes based on the column changes. */ @Override - public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException { + public void generate(DdlWrite writer, AlterColumn alterColumn) { DdlMigrationHelp ddlHelp = new DdlMigrationHelp(alterColumn); ddlHelp.writeBefore(writer.apply()); @@ -781,7 +780,7 @@ public class BaseTableDdl implements TableDdl { ddlHelp.writeAfter(writer.apply()); } - private void alterColumnComment(DdlWrite writer, AlterColumn alterColumn) throws IOException { + private void alterColumnComment(DdlWrite writer, AlterColumn alterColumn) { platformDdl.addColumnComment(writer.apply(), alterColumn.getTableName(), alterColumn.getColumnName(), alterColumn.getComment()); } @@ -804,7 +803,7 @@ public class BaseTableDdl implements TableDdl { * This is mysql specific - alter all the base attributes of the column together. * Will be called, if there is a type, dbdefault or notnull change. */ - protected void alterColumnBaseAttributes(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnBaseAttributes(DdlWrite writer, AlterColumn alter) { String ddl = platformDdl.alterColumnBaseAttributes(alter); if (hasValue(ddl)) { writer.apply().appendStatement(ddl); @@ -824,23 +823,23 @@ public class BaseTableDdl implements TableDdl { } } - protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) { writer.apply().appendStatement(platformDdl.alterColumnDefaultValue(alter.getTableName(), alter.getColumnName(), alter.getDefaultValue())); } - protected void dropCheckConstraint(DdlWrite writer, AlterColumn alter, String constraintName) throws IOException { + protected void dropCheckConstraint(DdlWrite writer, AlterColumn alter, String constraintName) { writer.apply().appendStatement(platformDdl.alterTableDropConstraint(alter.getTableName(), constraintName)); } - protected void addCheckConstraint(DdlWrite writer, AlterColumn alter) throws IOException { + protected void addCheckConstraint(DdlWrite writer, AlterColumn alter) { writer.apply().appendStatement(platformDdl.alterTableAddCheckConstraint(alter.getTableName(), alter.getCheckConstraintName(), alter.getCheckConstraint())); } - protected void alterColumnNotnull(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnNotnull(DdlWrite writer, AlterColumn alter) { writer.apply().appendStatement(platformDdl.alterColumnNotnull(alter.getTableName(), alter.getColumnName(), alter.isNotnull())); } - protected void alterColumnType(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnType(DdlWrite writer, AlterColumn alter) { String ddl = platformDdl.alterColumnType(alter.getTableName(), alter.getColumnName(), alter.getType()); if (hasValue(ddl)) { writer.apply().appendStatement(ddl); @@ -853,27 +852,27 @@ public class BaseTableDdl implements TableDdl { } } - protected void alterColumnAddForeignKey(DdlWrite writer, AlterColumn alterColumn) throws IOException { + protected void alterColumnAddForeignKey(DdlWrite writer, AlterColumn alterColumn) { alterTableAddForeignKey(writer.getOptions(), writer.apply(), new WriteForeignKey(alterColumn)); } - protected void alterColumnDropForeignKey(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnDropForeignKey(DdlWrite writer, AlterColumn alter) { writer.apply().appendStatement(platformDdl.alterTableDropForeignKey(alter.getTableName(), alter.getDropForeignKey())); } - protected void alterColumnDropUniqueConstraint(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnDropUniqueConstraint(DdlWrite writer, AlterColumn alter) { writer.apply().appendStatement(platformDdl.alterTableDropUniqueConstraint(alter.getTableName(), alter.getDropUnique())); } - protected void alterColumnAddUniqueOneToOneConstraint(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnAddUniqueOneToOneConstraint(DdlWrite writer, AlterColumn alter) { addUniqueConstraint(writer, alter, alter.getUniqueOneToOne()); } - protected void alterColumnAddUniqueConstraint(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnAddUniqueConstraint(DdlWrite writer, AlterColumn alter) { addUniqueConstraint(writer, alter, alter.getUnique()); } - protected void addUniqueConstraint(DdlWrite writer, AlterColumn alter, String uqName) throws IOException { + protected void addUniqueConstraint(DdlWrite writer, AlterColumn alter, String uqName) { String[] cols = {alter.getColumnName()}; boolean notNull = alter.isNotnull() != null ? alter.isNotnull() : Boolean.TRUE.equals(alter.isNotnull()); writer.apply().appendStatement(platformDdl.alterTableAddUniqueConstraint(alter.getTableName(), uqName, cols, notNull ? null : cols)); @@ -882,11 +881,11 @@ public class BaseTableDdl implements TableDdl { } - protected void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException { + protected void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) { platformDdl.alterTableDropColumn(buffer, tableName, columnName); } - protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable, boolean withHistory) throws IOException { + protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable, boolean withHistory) { DdlMigrationHelp help = new DdlMigrationHelp(tableName, column, withHistory); if (!onHistoryTable) { help.writeBefore(buffer); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java index 341fe9517..f15d7c718 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java @@ -9,7 +9,6 @@ import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.DropColumn; import io.ebeaninternal.dbmigration.model.MTable; -import java.io.IOException; import java.util.List; public class HanaTableDdl extends BaseTableDdl { @@ -29,12 +28,12 @@ public class HanaTableDdl extends BaseTableDdl { } @Override - protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) throws IOException { + protected void alterColumnDefaultValue(DdlWrite writer, AlterColumn alter) { // done in alterColumnBaseAttributes } @Override - public void generate(DdlWrite writer, AddColumn addColumn) throws IOException { + public void generate(DdlWrite writer, AddColumn addColumn) { String tableName = addColumn.getTableName(); MTable table = writer.getTable(tableName); if (table == null) { @@ -63,7 +62,7 @@ public class HanaTableDdl extends BaseTableDdl { } @Override - public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException { + public void generate(DdlWrite writer, AlterColumn alterColumn) { String tableName = alterColumn.getTableName(); MTable table = writer.getTable(tableName); if (table == null) { @@ -103,7 +102,7 @@ public class HanaTableDdl extends BaseTableDdl { } @Override - public void generate(DdlWrite writer, DropColumn dropColumn) throws IOException { + public void generate(DdlWrite writer, DropColumn dropColumn) { String tableName = dropColumn.getTableName(); MTable table = writer.getTable(tableName); if (table == null) { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java index e5c8743d2..f9b46f866 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java @@ -16,7 +16,6 @@ import io.ebeaninternal.extraddl.model.ExtraDdl; import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder; -import java.io.IOException; import java.util.List; import static io.ebeaninternal.api.PlatformMatch.matchPlatform; @@ -117,7 +116,7 @@ public class CurrentModel { /** * Return the 'Create' DDL. */ - public String getCreateDdl() throws IOException { + public String getCreateDdl() { createDdl(); @@ -150,7 +149,7 @@ public class CurrentModel { /** * Return the 'Drop' DDL. */ - public String getDropAllDdl() throws IOException { + public String getDropAllDdl() { createDdl(); @@ -166,7 +165,7 @@ public class CurrentModel { /** * Create all the DDL based on the changeSet. */ - private void createDdl() throws IOException { + private void createDdl() { if (write == null) { ChangeSet createChangeSet = getChangeSet(); write = new DdlWrite(new MConfiguration(), model, ddlOptions); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java index d6af52969..3383898b5 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java @@ -15,7 +15,6 @@ import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.CreateTable; import org.junit.jupiter.api.Test; -import java.io.IOException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +27,7 @@ public class BaseTableDdlTest { private final PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform()); @Test - public void testAlterColumn() throws IOException { + public void testAlterColumn() { BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, h2ddl); DdlWrite write = new DdlWrite(); @@ -46,7 +45,7 @@ public class BaseTableDdlTest { } @Test - public void testAddColumn_withTypeConversion() throws IOException { + public void testAddColumn_withTypeConversion() { BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, PlatformDdlBuilder.create(new OraclePlatform())); @@ -63,7 +62,7 @@ public class BaseTableDdlTest { } @Test - public void testAddColumn_withTypeConversion_clickHouseVarchar() throws IOException { + public void testAddColumn_withTypeConversion_clickHouseVarchar() { ClickHouseTableDdl ddlGen = new ClickHouseTableDdl(serverConfig, PlatformDdlBuilder.create(new ClickHousePlatform())); @@ -80,7 +79,7 @@ public class BaseTableDdlTest { } @Test - public void testAlterColumnComment() throws IOException { + public void testAlterColumnComment() { BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, h2ddl); @@ -98,7 +97,7 @@ public class BaseTableDdlTest { } @Test - public void alterTableAddColumnWithComment() throws IOException { + public void alterTableAddColumnWithComment() { BaseTableDdl ddl = new BaseTableDdl(serverConfig, h2ddl); DdlWrite write = new DdlWrite(); Column column = new Column(); @@ -113,7 +112,7 @@ public class BaseTableDdlTest { } @Test - public void testAddTableComment() throws IOException { + public void testAddTableComment() { BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, h2ddl); @@ -130,7 +129,7 @@ public class BaseTableDdlTest { } @Test - public void testAddTableComment_mysql() throws IOException { + public void testAddTableComment_mysql() { BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, PlatformDdlBuilder.create(new MySqlPlatform())); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java index 3e467babe..64bb09d9a 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java @@ -5,14 +5,12 @@ import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; import io.ebeaninternal.dbmigration.migration.Column; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; public class HanaDdlTest { @Test - public void alterTableDropColumn() throws IOException { + public void alterTableDropColumn() { HanaColumnStoreDdl ddl = new HanaColumnStoreDdl(new HanaPlatform()); DdlWrite write = new DdlWrite(); ddl.alterTableDropColumn(write.apply(), "my_table", "my_column"); @@ -20,7 +18,7 @@ public class HanaDdlTest { } @Test - public void alterTableAddColumn() throws IOException { + public void alterTableAddColumn() { HanaColumnStoreDdl ddl = new HanaColumnStoreDdl(new HanaPlatform()); DdlWrite write = new DdlWrite(); Column column = new Column(); diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 2ae1118f1..193385e5f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -16,8 +16,6 @@ import io.ebeaninternal.dbmigration.migration.AlterForeignKey; import io.ebeaninternal.dbmigration.migration.Column; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -252,7 +250,7 @@ public class PlatformDdl_AlterColumnTest { } @Test - public void oracle_alterTableAddColumn() throws IOException { + public void oracle_alterTableAddColumn() { DdlWrite write = new DdlWrite(); oraDdl.alterTableAddColumn(write.apply(), "my_table", simpleColumn(), false, "1"); assertThat(write.apply().getBuffer()).isEqualTo("alter table my_table add my_column int default 1 not null;\n");