From 4c13a3a7790d1876fcc7377d79e0fb055a7a6809 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 26 Aug 2022 14:51:19 +1200 Subject: [PATCH] Refactor move package - server.type.DataBind to server.bind, server.text.json -> server.json The DataBind classes don't need to be in with server.type anymore. The server.text.json package can just reduce package nesting. --- .../java/io/ebeaninternal/api/NoopQueryBindCapture.java | 2 +- .../main/java/io/ebeaninternal/api/SpiQueryBindCapture.java | 2 +- .../io/ebeaninternal/server/{type => bind}/DataBind.java | 2 +- .../server/{type => bind}/DataBindCapture.java | 6 +++--- .../{type/bindcapture => bind/capture}/BindCapture.java | 2 +- .../bindcapture => bind/capture}/BindCaptureEntry.java | 2 +- .../bindcapture => bind/capture}/BindCaptureStatement.java | 2 +- .../capture}/BindCaptureStatementBase.java | 2 +- .../bindcapture => bind/capture}/BindCaptureTypes.java | 2 +- .../io/ebeaninternal/server/core/InternalConfiguration.java | 2 +- .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java | 2 +- .../java/io/ebeaninternal/server/deploy/BeanProperty.java | 1 + .../java/io/ebeaninternal/server/deploy/id/IdBinder.java | 2 +- .../io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java | 2 +- .../io/ebeaninternal/server/deploy/id/IdBinderEmpty.java | 2 +- .../io/ebeaninternal/server/deploy/id/IdBinderSimple.java | 2 +- .../server/expression/DefaultExpressionRequest.java | 2 +- .../server/{text => }/json/DJsonBeanReader.java | 2 +- .../ebeaninternal/server/{text => }/json/DJsonContext.java | 2 +- .../ebeaninternal/server/{text => }/json/DJsonScalar.java | 2 +- .../io/ebeaninternal/server/{text => }/json/PathStack.java | 2 +- .../io/ebeaninternal/server/{text => }/json/ReadJson.java | 2 +- .../io/ebeaninternal/server/{text => }/json/WriteJson.java | 2 +- .../main/java/io/ebeaninternal/server/persist/Binder.java | 1 + .../io/ebeaninternal/server/persist/dml/DmlHandler.java | 2 +- .../server/persist/platform/AbstractMultiValueBind.java | 2 +- .../server/persist/platform/MultiValueBind.java | 2 +- .../io/ebeaninternal/server/query/CQueryBindCapture.java | 2 +- .../main/java/io/ebeaninternal/server/query/CQueryPlan.java | 4 ++-- .../io/ebeaninternal/server/query/CQueryPlanManager.java | 2 +- .../io/ebeaninternal/server/query/CQueryPredicates.java | 2 +- .../java/io/ebeaninternal/server/query/QueryPlanLogger.java | 2 +- .../ebeaninternal/server/query/QueryPlanLoggerExplain.java | 2 +- .../ebeaninternal/server/query/QueryPlanLoggerOracle.java | 2 +- .../ebeaninternal/server/query/QueryPlanLoggerPostgres.java | 2 +- .../server/query/QueryPlanLoggerSqlServer.java | 2 +- .../ebeaninternal/server/querydefn/OrmUpdateProperties.java | 2 +- .../docstore/api/mapping/DocPropertyAdapter.java | 2 +- ebean-core/src/main/java/module-info.java | 2 +- .../server/type/BasePlatformArrayTypeFactoryTest.java | 1 + .../test/java/io/ebeaninternal/server/type/JsonTester.java | 2 +- .../xtest/internal/server/text/json/DJsonScalarTest.java | 2 +- .../xtest/internal/server/text/json/WriteJsonDirtyTest.java | 2 +- .../org/tests/text/json/TestJsonBeanDescriptorParse.java | 2 +- 44 files changed, 47 insertions(+), 44 deletions(-) rename ebean-core/src/main/java/io/ebeaninternal/server/{type => bind}/DataBind.java (99%) rename ebean-core/src/main/java/io/ebeaninternal/server/{type => bind}/DataBindCapture.java (84%) rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCapture.java (93%) rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureEntry.java (81%) rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureStatement.java (98%) rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureStatementBase.java (99%) rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureTypes.java (99%) rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/DJsonBeanReader.java (96%) rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/DJsonContext.java (99%) rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/DJsonScalar.java (96%) rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/PathStack.java (91%) rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/ReadJson.java (99%) rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/WriteJson.java (99%) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java index 33ee06b54..f8b1dd65a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java @@ -1,6 +1,6 @@ package io.ebeaninternal.api; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; final class NoopQueryBindCapture implements SpiQueryBindCapture { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java index db5cbd9b6..3f3a5b768 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java @@ -1,6 +1,6 @@ package io.ebeaninternal.api; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; /** * Capture query bind values and with those actual database query plans. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java similarity index 99% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java index b4ce613be..8ca702c29 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type; +package io.ebeaninternal.server.bind; import io.ebean.core.type.DataBinder; import io.ebeaninternal.api.CoreLog; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBindCapture.java similarity index 84% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBindCapture.java index 659d0ef06..78924bafe 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBindCapture.java @@ -1,8 +1,8 @@ -package io.ebeaninternal.server.type; +package io.ebeaninternal.server.bind; import io.ebeaninternal.server.core.timezone.DataTimeZone; -import io.ebeaninternal.server.type.bindcapture.BindCapture; -import io.ebeaninternal.server.type.bindcapture.BindCaptureStatement; +import io.ebeaninternal.server.bind.capture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCaptureStatement; /** * Special DataBind used to capture bind values for obtaining explain plans. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCapture.java similarity index 93% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCapture.java index 3e75d68a3..c51fb9e97 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCapture.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type.bindcapture; +package io.ebeaninternal.server.bind.capture; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureEntry.java similarity index 81% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureEntry.java index 3bb7d3f95..b1f4ef6ae 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureEntry.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type.bindcapture; +package io.ebeaninternal.server.bind.capture; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java similarity index 98% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java index 916c1c355..04ad70753 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type.bindcapture; +package io.ebeaninternal.server.bind.capture; import java.io.InputStream; import java.io.Reader; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatementBase.java similarity index 99% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatementBase.java index ba4e01524..6e547dcaf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatementBase.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type.bindcapture; +package io.ebeaninternal.server.bind.capture; import java.io.InputStream; import java.io.Reader; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureTypes.java similarity index 99% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureTypes.java index b2e36f828..c8cf8496b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureTypes.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type.bindcapture; +package io.ebeaninternal.server.bind.capture; import java.io.ByteArrayInputStream; import java.io.StringReader; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 67c3142fe..bce133978 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -46,7 +46,7 @@ import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind; import io.ebeaninternal.server.query.*; import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger; import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare; -import io.ebeaninternal.server.text.json.DJsonContext; +import io.ebeaninternal.server.json.DJsonContext; import io.ebeaninternal.server.transaction.*; import io.ebeaninternal.server.type.DefaultTypeManager; import io.ebeaninternal.server.type.TypeManager; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index d86e75a7b..17a5ba950 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -45,7 +45,7 @@ import io.ebeaninternal.server.querydefn.DefaultOrmQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; import io.ebeaninternal.server.querydefn.OrmQueryProperties; import io.ebeaninternal.server.rawsql.SpiRawSql; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import io.ebeaninternal.util.SortByClause; import io.ebeaninternal.util.SortByClauseParser; import io.ebeanservice.docstore.api.DocStoreBeanAdapter; 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 1fc421739..91e1a0ffa 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 @@ -22,6 +22,7 @@ import io.ebeaninternal.api.json.SpiJsonReader; import io.ebeaninternal.api.json.SpiJsonWriter; import io.ebeaninternal.server.core.EncryptAlias; import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.bind.DataBind; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenModified; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java index 01aec83e7..89a3677a2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.query.STreeProperty; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index e3b23e9fb..d2fda9bd2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbSqlContext; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java index af3df49dc..b4bbbff1a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.core.DefaultSqlUpdate; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbSqlContext; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index 0a24c78d2..97f2bae2f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java @@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.persist.MultiValueWrapper; import io.ebeaninternal.server.persist.platform.MultiValueBind; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java index 89273c230..d1b1f4040 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.DeployParser; import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.persist.Binder; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.sql.SQLException; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java similarity index 96% rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java rename to ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java index f16238bfa..8ee649981 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebeaninternal.server.json; import com.fasterxml.jackson.core.JsonParser; import io.ebean.PersistenceIOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java similarity index 99% rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java rename to ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java index c48ead0ca..0dacd596e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebeaninternal.server.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java similarity index 96% rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java rename to ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java index d0ef82204..19607be79 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebeaninternal.server.json; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.core.type.ScalarType; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/PathStack.java similarity index 91% rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java rename to ebean-core/src/main/java/io/ebeaninternal/server/json/PathStack.java index 6cb3b2b67..2d4c19a37 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/PathStack.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebeaninternal.server.json; import io.ebeaninternal.server.util.ArrayStack; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java similarity index 99% rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java rename to ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java index cdb48f76b..77f20c185 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebeaninternal.server.json; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java similarity index 99% rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java rename to ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java index 17c9e9372..60b52620f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebeaninternal.server.json; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java index afb416012..0687c940a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -7,6 +7,7 @@ import io.ebeaninternal.api.BindParams; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.SpiLogManager; import io.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.bind.DataBind; import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.persist.platform.MultiValueBind; import io.ebeaninternal.server.type.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index ef3d9d098..f2afacce1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.persist.BatchedPstmt; import io.ebeaninternal.server.persist.BatchedPstmtHolder; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import io.ebeaninternal.server.util.Str; import javax.persistence.OptimisticLockException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java index f28805a01..18d41b757 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist.platform; import io.ebean.config.dbplatform.ExtraDbTypes; import io.ebean.core.type.ScalarType; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.sql.SQLException; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java index dd06f4f29..59471c793 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.persist.platform; import io.ebean.core.type.ScalarType; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.sql.SQLException; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java index 7f62a855e..4c72f053e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiQueryBindCapture; import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 490949ab1..ad52e4eca 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -11,8 +11,8 @@ import io.ebeaninternal.api.*; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.timezone.DataTimeZone; import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot; -import io.ebeaninternal.server.type.DataBind; -import io.ebeaninternal.server.type.DataBindCapture; +import io.ebeaninternal.server.bind.DataBind; +import io.ebeaninternal.server.bind.DataBindCapture; import io.ebeaninternal.server.type.RsetDataReader; import io.ebeaninternal.server.util.Md5; import io.ebeaninternal.server.util.Str; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java index 88818d687..ac39f6beb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java @@ -5,7 +5,7 @@ import io.ebean.meta.QueryPlanRequest; import io.ebean.metric.TimedMetric; import io.ebeaninternal.api.*; import io.ebeaninternal.server.transaction.TransactionManager; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index 01e64642f..d6833b98e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.persist.Binder; import io.ebeaninternal.server.querydefn.OrmQueryProperties; import io.ebeaninternal.server.querydefn.OrmUpdateProperties; import io.ebeaninternal.server.rawsql.SpiRawSql; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import io.ebeaninternal.server.util.BindParamsParser; import java.sql.Connection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java index aecdfd841..1af72113c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java index 70c0df722..3af04a56c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java index 45c3094af..2230d78cb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java @@ -4,7 +4,7 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java index 8b5253c90..d51c1c351 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java index 2da90d98f..a8c3527a8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.type.bindcapture.BindCapture; +import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java index 5a9d5b392..d4db67d81 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.querydefn; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.deploy.DeployParser; import io.ebeaninternal.server.persist.Binder; -import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.bind.DataBind; import java.sql.SQLException; import java.util.LinkedHashMap; diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java index 5ff1b2cc3..38aac295b 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java @@ -1,6 +1,6 @@ package io.ebeanservice.docstore.api.mapping; -import io.ebeaninternal.server.text.json.PathStack; +import io.ebeaninternal.server.json.PathStack; /** * Adapter for DocPropertyVisitor that does not do anything. diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java index 7511a8d0b..73c0e92f4 100644 --- a/ebean-core/src/main/java/module-info.java +++ b/ebean-core/src/main/java/module-info.java @@ -66,7 +66,7 @@ module io.ebean.core { exports io.ebeaninternal.server.query to io.ebean.test; exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic; exports io.ebeaninternal.server.rawsql to io.ebean.test; - exports io.ebeaninternal.server.text.json to io.ebean.test, io.ebean.elastic; + exports io.ebeaninternal.server.json to io.ebean.test, io.ebean.elastic; exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test; exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache; exports io.ebeaninternal.server.util to io.ebean.querybean; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java index 3e09e8b22..aef8e4ece 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java @@ -1,6 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.ScalarType; +import io.ebeaninternal.server.bind.DataBind; import org.postgresql.util.PGobject; import java.sql.SQLException; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java index 8db4b633e..5e8ee63a4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import io.ebean.config.JsonConfig; import io.ebean.core.type.ScalarType; -import io.ebeaninternal.server.text.json.WriteJson; +import io.ebeaninternal.server.json.WriteJson; import java.io.IOException; import java.io.StringWriter; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java index 6ffd81a10..9f2ed2c8c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.config.DatabaseConfig; import io.ebean.platform.h2.H2Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; -import io.ebeaninternal.server.text.json.DJsonScalar; +import io.ebeaninternal.server.json.DJsonScalar; import io.ebeaninternal.server.type.DefaultTypeManager; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java index 8b41dad56..3a4f72c57 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.text.json.WriteJson; +import io.ebeaninternal.server.json.WriteJson; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index bbc918b6c..9a7acd1a5 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -7,7 +7,7 @@ import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonReader; import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.text.json.ReadJson; +import io.ebeaninternal.server.json.ReadJson; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;