From c60077174ed01d4babc0049a0beecc4ae70d0415 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Tue, 20 Apr 2021 15:14:20 +1200 Subject: [PATCH] Tidy use of StringHelper replace() in BeanProperty, BaseTableDdl --- .../java/io/ebeaninternal/server/deploy/BeanProperty.java | 8 +++----- .../dbmigration/ddlgeneration/platform/BaseTableDdl.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 270415a22..d96a3d850 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -56,8 +56,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static io.ebean.util.StringHelper.replace; - /** * Description of a property of a bean. Includes its deployment information such * as database column mapping information. @@ -357,12 +355,12 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { private String tableAliasIntern(BeanDescriptor descriptor, String s, boolean dbEncrypted, String dbColumn) { if (descriptor != null) { - s = replace(s, "${ta}.", "${}"); - s = replace(s, "${ta}", "${}"); + s = s.replace("${ta}.", "${}"); + s = s.replace("${ta}", "${}"); if (dbEncrypted) { s = dbEncryptFunction.getDecryptSql(s); String namedParam = ":encryptkey_" + descriptor.getBaseTable() + "___" + dbColumn; - s = replace(s, "?", namedParam); + s = s.replace("?", namedParam); } } return InternString.intern(s); 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 41e91274e..0e80c2676 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 @@ -150,7 +150,7 @@ public class BaseTableDdl implements TableDdl { buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine(); } for (String ddlScript : before) { - buffer.appendStatement(translate(ddlScript, tableName, columnName, this.defaultValue)); + buffer.appendStatement(translate(ddlScript, tableName, columnName, defaultValue)); } }