From 53c8827a5256bdb3b26036f4965f0aa715464e9c Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 8 Feb 2022 16:21:25 +0100 Subject: [PATCH] Refactor: remove MConfiguration from BaseDdlBuffer (it is unused, and may/should be re-added to the DdlWrite when needed) --- .../dbmigration/ddlgeneration/DdlBuffer.java | 7 ------- .../dbmigration/ddlgeneration/DdlWrite.java | 21 +++++++------------ .../platform/AbstractHanaDdl.java | 4 ++-- .../ddlgeneration/platform/BaseDdlBuffer.java | 10 +-------- .../platform/HanaColumnStoreDdl.java | 2 +- 5 files changed, 11 insertions(+), 33 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java index dfa3673c0..e1c7365ea 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java @@ -1,17 +1,10 @@ package io.ebeaninternal.dbmigration.ddlgeneration; -import io.ebeaninternal.dbmigration.model.MConfiguration; - /** * Buffer to append generated DDL to. */ public interface DdlBuffer { - /** - * Return the configuration (default tablespaces etc). - */ - MConfiguration getConfiguration(); - /** * Return true if the buffer is empty. */ diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java index 0f37f3374..eff523d09 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java @@ -12,19 +12,19 @@ public class DdlWrite { private final ModelContainer currentModel; - private final DdlBuffer applyDropDependencies; + private final DdlBuffer applyDropDependencies = new BaseDdlBuffer(); - private final DdlBuffer apply; + private final DdlBuffer apply = new BaseDdlBuffer(); - private final DdlBuffer applyForeignKeys; + private final DdlBuffer applyForeignKeys = new BaseDdlBuffer(); - private final DdlBuffer applyHistoryView; + private final DdlBuffer applyHistoryView = new BaseDdlBuffer(); - private final DdlBuffer applyHistoryTrigger; + private final DdlBuffer applyHistoryTrigger = new BaseDdlBuffer(); - private final DdlBuffer dropAllForeignKeys; + private final DdlBuffer dropAllForeignKeys = new BaseDdlBuffer(); - private final DdlBuffer dropAll; + private final DdlBuffer dropAll = new BaseDdlBuffer(); private final DdlOptions options; @@ -40,13 +40,6 @@ public class DdlWrite { */ public DdlWrite(MConfiguration configuration, ModelContainer currentModel, DdlOptions options) { this.currentModel = currentModel; - this.applyDropDependencies = new BaseDdlBuffer(configuration); - this.apply = new BaseDdlBuffer(configuration); - this.applyForeignKeys = new BaseDdlBuffer(configuration); - this.applyHistoryView = new BaseDdlBuffer(configuration); - this.applyHistoryTrigger = new BaseDdlBuffer(configuration); - this.dropAllForeignKeys = new BaseDdlBuffer(configuration); - this.dropAll = new BaseDdlBuffer(configuration); this.options = options; } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java index 717ac044c..dd9e57ff5 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java @@ -51,7 +51,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl { : (alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue()); String defaultValueClause = (defaultValue == null || defaultValue.isEmpty()) ? "" : " default " + defaultValue; - DdlBuffer buffer = new BaseDdlBuffer(null); + DdlBuffer buffer = new BaseDdlBuffer(); if (!isConvertible(currentType, type)) { // add an intermediate conversion if possible if (isNumberType(currentType)) { @@ -115,7 +115,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl { @Override public String alterTableDropUniqueConstraint(String tableName, String uniqueConstraintName) { - DdlBuffer buffer = new BaseDdlBuffer(null); + DdlBuffer buffer = new BaseDdlBuffer(); buffer.append("delimiter $$").newLine(); buffer.append("do").newLine(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java index 6f3017014..78e0632b6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java @@ -11,18 +11,10 @@ public class BaseDdlBuffer implements DdlBuffer { protected final StringBuilder writer; - protected final MConfiguration configuration; - - public BaseDdlBuffer(MConfiguration configuration) { - this.configuration = configuration; + public BaseDdlBuffer() { this.writer = new StringBuilder(); } - @Override - public MConfiguration getConfiguration() { - return configuration; - } - @Override public boolean isEmpty() { return writer.length() == 0; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java index f37f690be..b1fbd08a8 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java @@ -29,7 +29,7 @@ public class HanaColumnStoreDdl extends AbstractHanaDdl { @Override public String dropIndex(String indexName, String tableName, boolean concurrent) { - DdlBuffer buffer = new BaseDdlBuffer(null); + DdlBuffer buffer = new BaseDdlBuffer(); buffer.append("delimiter $$").newLine(); buffer.append("do").newLine(); buffer.append("begin").newLine();