diff --git a/src/main/java/io/ebean/text/PathProperties.java b/src/main/java/io/ebean/text/PathProperties.java index 44aa7c837..174fe016b 100644 --- a/src/main/java/io/ebean/text/PathProperties.java +++ b/src/main/java/io/ebean/text/PathProperties.java @@ -2,7 +2,7 @@ package io.ebean.text; import io.ebean.FetchPath; import io.ebean.Query; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/io/ebeaninternal/server/query/SplitName.java b/src/main/java/io/ebean/util/SplitName.java similarity index 97% rename from src/main/java/io/ebeaninternal/server/query/SplitName.java rename to src/main/java/io/ebean/util/SplitName.java index 2da7519a1..3e1e9951e 100644 --- a/src/main/java/io/ebeaninternal/server/query/SplitName.java +++ b/src/main/java/io/ebean/util/SplitName.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.query; +package io.ebean.util; /** * Helper for dot notation property paths. diff --git a/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 97ee89e40..0b6499fec 100644 --- a/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java +++ b/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -3,7 +3,7 @@ package io.ebeaninternal.api; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.el.ElPropertyDeploy; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.query.SqlJoinType; import java.io.Serializable; diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index 6bbf32ce2..391db0366 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index dc756efde..66941c5db 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -61,7 +61,7 @@ import io.ebeaninternal.server.el.ElPropertyValue; import io.ebeaninternal.server.persist.DmlUtil; import io.ebeaninternal.server.query.CQueryPlan; import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.querydefn.OrmQueryDetail; import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.text.json.ReadJson; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index a85b40da1..b035eedec 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -20,7 +20,7 @@ import io.ebeaninternal.server.el.ElPropertyChainBuilder; import io.ebeaninternal.server.el.ElPropertyValue; import io.ebeaninternal.server.properties.BeanPropertyGetter; import io.ebeaninternal.server.properties.BeanPropertySetter; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.query.SqlBeanLoad; import io.ebeaninternal.server.query.SqlJoinType; import io.ebeaninternal.server.text.json.ReadJson; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index e23d883d2..df48456f8 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.id.ImportedIdSimple; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; import io.ebeaninternal.server.el.ElPropertyChainBuilder; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.query.SqlJoinType; import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 34e9b248d..1aebfd160 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.deploy.id.ImportedId; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; import io.ebeaninternal.server.el.ElPropertyChainBuilder; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.query.SqlBeanLoad; import io.ebeaninternal.server.query.SqlJoinType; import io.ebeaninternal.server.text.json.ReadJson; diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java index 1390db6e1..5f6f91fff 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java +++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebeaninternal.server.core.InternString; import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.query.SqlJoinType; /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 980ceef18..caf0fcbe1 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -8,7 +8,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.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.type.DataBind; import java.io.DataInput; diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index b87a4099e..125c71dde 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -5,7 +5,7 @@ import io.ebean.text.StringParser; import io.ebean.util.StringHelper; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import io.ebeaninternal.server.type.ScalarType; import java.util.Arrays; diff --git a/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java index b60272d2a..4ad71dc94 100644 --- a/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiExpressionValidation; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyDeploy; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; /** * Base class for simple expressions. diff --git a/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java index c582d20f2..43574a95d 100644 --- a/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.api.SpiExpressionValidation; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyDeploy; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.io.IOException; diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index 7c139da45..0ea2dc24f 100644 --- a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -11,7 +11,7 @@ import io.ebeaninternal.api.SpiExpressionValidation; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java index 52c6b31d3..d3a3a1da6 100644 --- a/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java @@ -5,7 +5,7 @@ import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.io.IOException; diff --git a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java index aa2dc652e..547bcb36d 100644 --- a/src/main/java/io/ebeaninternal/server/expression/NullExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java @@ -5,7 +5,7 @@ import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.io.IOException; diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 9af904c6a..26dd7aaca 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -9,6 +9,7 @@ import io.ebean.config.dbplatform.SqlLimitResponse; import io.ebean.config.dbplatform.SqlLimiter; import io.ebean.event.readaudit.ReadAuditQueryPlan; import io.ebean.text.PathProperties; +import io.ebean.util.SplitName; import io.ebean.util.StringHelper; import io.ebeaninternal.api.ManyWhereJoins; import io.ebeaninternal.api.SpiQuery; diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java index 95cf4a671..5e8319a1e 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import io.ebean.util.SplitName; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyDeploy; diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index 46a2b924f..5e77b99ca 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import io.ebean.util.SplitName; import io.ebeaninternal.api.ManyWhereJoins; import io.ebeaninternal.api.PropertyJoin; import io.ebeaninternal.api.SpiQuery; diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 9824d665f..cceee4851 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -5,6 +5,7 @@ import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebean.bean.PersistenceContext; +import io.ebean.util.SplitName; import io.ebean.util.StringHelper; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiQuery.Mode; diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index 1125f941a..93d664c79 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -2,6 +2,7 @@ package io.ebeaninternal.server.query; import io.ebean.Version; import io.ebean.bean.EntityBean; +import io.ebean.util.SplitName; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java index f91b5c988..3ec80cbab 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java @@ -2,6 +2,7 @@ package io.ebeaninternal.server.query; import io.ebean.Version; import io.ebean.bean.EntityBean; +import io.ebean.util.SplitName; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index 4ae6a6e33..5eee0cc4b 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import io.ebeaninternal.server.el.ElPropertyDeploy; import io.ebeaninternal.server.el.ElPropertyValue; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import javax.persistence.PersistenceException; import java.io.Serializable; diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java index b804a707a..82c1f1630 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -10,7 +10,7 @@ import io.ebeaninternal.api.SpiExpressionList; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.expression.FilterExprPath; import io.ebeaninternal.server.expression.FilterExpressionList; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java index 0e81da86f..6a4d8bd64 100644 --- a/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java @@ -3,7 +3,7 @@ package io.ebeanservice.docstore.api.mapping; import io.ebean.annotation.DocMapping; import io.ebean.annotation.DocStore; import io.ebean.text.PathProperties; -import io.ebeaninternal.server.query.SplitName; +import io.ebean.util.SplitName; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java index 93603ea72..d26322792 100644 --- a/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java +++ b/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import io.ebean.util.SplitName; import org.junit.Test; import static org.junit.Assert.assertEquals;