From d70da1d805f56d0f86ab72a9ac4dc22d37d1e085 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 28 Jun 2019 21:32:15 +1200 Subject: [PATCH] #1738 - Refactor tidy internals - refactor move server.lib.Str --- .../server/core/AbstractSqlQueryRequest.java | 2 +- .../server/core/PersistRequestUpdateSql.java | 2 +- .../io/ebeaninternal/server/lib/{util => }/Str.java | 2 +- .../io/ebeaninternal/server/lib/util/package.html | 12 ------------ .../ebeaninternal/server/persist/dml/DmlHandler.java | 2 +- .../io/ebeaninternal/server/query/CQueryEngine.java | 2 +- .../server/transaction/JdbcTransaction.java | 2 +- .../server/transaction/SavepointTransaction.java | 2 +- 8 files changed, 7 insertions(+), 19 deletions(-) rename src/main/java/io/ebeaninternal/server/lib/{util => }/Str.java (95%) delete mode 100644 src/main/java/io/ebeaninternal/server/lib/util/package.html diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index bd7aa0de9..a2bf783db 100644 --- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiSqlBinding; import io.ebeaninternal.api.SpiTransaction; -import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.lib.Str; import io.ebeaninternal.server.persist.Binder; import io.ebeaninternal.server.persist.TrimLogSql; import io.ebeaninternal.server.util.BindParamsParser; diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index 7efe8ac49..a0ebdbef1 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.core; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiSqlUpdate; import io.ebeaninternal.api.SpiTransaction; -import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.lib.Str; import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.persist.PersistExecute; import io.ebeaninternal.server.persist.TrimLogSql; diff --git a/src/main/java/io/ebeaninternal/server/lib/util/Str.java b/src/main/java/io/ebeaninternal/server/lib/Str.java similarity index 95% rename from src/main/java/io/ebeaninternal/server/lib/util/Str.java rename to src/main/java/io/ebeaninternal/server/lib/Str.java index 9f72e7127..2980331ec 100644 --- a/src/main/java/io/ebeaninternal/server/lib/util/Str.java +++ b/src/main/java/io/ebeaninternal/server/lib/Str.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.lib.util; +package io.ebeaninternal.server.lib; /** * String utility for adding strings together. diff --git a/src/main/java/io/ebeaninternal/server/lib/util/package.html b/src/main/java/io/ebeaninternal/server/lib/util/package.html deleted file mode 100644 index 4f128ef71..000000000 --- a/src/main/java/io/ebeaninternal/server/lib/util/package.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - AvajeLib - - -General utility objects. - -

Provides general utility objects. -

- - diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index ad770bcaf..a7a528219 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.lib.Str; import io.ebeaninternal.server.persist.BatchedPstmt; import io.ebeaninternal.server.persist.BatchedPstmtHolder; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 33f9bf143..9dedbaf7a 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -17,7 +17,7 @@ import io.ebeaninternal.server.core.Message; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.lib.Str; import io.ebeaninternal.server.persist.Binder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 5e1e258c2..fceefc682 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -14,7 +14,7 @@ import io.ebeaninternal.api.TransactionEvent; import io.ebeaninternal.api.TxnProfileEventCodes; import io.ebeaninternal.server.core.PersistDeferredRelationship; import io.ebeaninternal.server.core.PersistRequestBean; -import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.lib.Str; import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeanservice.docstore.api.DocStoreTransaction; diff --git a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java index 7987201e2..271cb1144 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.transaction; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiTransactionProxy; -import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.lib.Str; import javax.persistence.PersistenceException; import java.sql.Connection;