From 2225d5b7e8391ec12f00afc81e483223dc2d45d9 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 28 Jun 2019 21:30:15 +1200 Subject: [PATCH] #1738 - Refactor tidy internals - refactor move DtoQueryRequest --- src/main/java/io/ebeaninternal/server/core/DefaultServer.java | 2 +- src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java | 2 +- .../io/ebeaninternal/server/core/InternalConfiguration.java | 2 +- .../io/ebeaninternal/server/query/{dto => }/DtoQueryEngine.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/io/ebeaninternal/server/query/{dto => }/DtoQueryEngine.java (97%) diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index dc54b4b39..8fa29c15d 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -102,7 +102,7 @@ import io.ebeaninternal.server.query.LimitOffsetPagedList; import io.ebeaninternal.server.query.QueryFutureIds; import io.ebeaninternal.server.query.QueryFutureList; import io.ebeaninternal.server.query.QueryFutureRowCount; -import io.ebeaninternal.server.query.dto.DtoQueryEngine; +import io.ebeaninternal.server.query.DtoQueryEngine; import io.ebeaninternal.server.querydefn.DefaultDtoQuery; import io.ebeaninternal.server.querydefn.DefaultOrmQuery; import io.ebeaninternal.server.querydefn.DefaultOrmUpdate; diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index 6fd5218df..922fc1a0d 100644 --- a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.dto.DtoColumn; import io.ebeaninternal.server.dto.DtoMappingRequest; import io.ebeaninternal.server.dto.DtoQueryPlan; import io.ebeaninternal.server.persist.Binder; -import io.ebeaninternal.server.query.dto.DtoQueryEngine; +import io.ebeaninternal.server.query.DtoQueryEngine; import io.ebeaninternal.server.type.DataReader; import io.ebeaninternal.server.type.RsetDataReader; diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 3d9486be9..a2aefa3ec 100644 --- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -65,7 +65,7 @@ import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind; import io.ebeaninternal.server.query.CQueryEngine; import io.ebeaninternal.server.query.DefaultOrmQueryEngine; import io.ebeaninternal.server.query.DefaultRelationalQueryEngine; -import io.ebeaninternal.server.query.dto.DtoQueryEngine; +import io.ebeaninternal.server.query.DtoQueryEngine; import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger; import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare; import io.ebeaninternal.server.text.json.DJsonContext; diff --git a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java similarity index 97% rename from src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java rename to src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java index fceed1465..017a53695 100644 --- a/src/main/java/io/ebeaninternal/server/query/dto/DtoQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.query.dto; +package io.ebeaninternal.server.query; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.DtoQueryRequest;