From 514a572efacce1e7f566944bcdcf99d755b14bb6 Mon Sep 17 00:00:00 2001 From: Willem Date: Fri, 13 May 2016 13:27:33 +0200 Subject: [PATCH] Moved 2 interfaces to remove cycle dep --- .../net/forwardfire/tpquery/config/AbstractTPQConfig.java | 4 ++-- .../main/java/net/forwardfire/tpquery/config/TPQConfig.java | 4 ++-- .../forwardfire/tpquery/statement/TPQStatementContext.java | 2 -- .../statement/{language => }/TPQStatementLanguage.java | 4 +--- .../statement/{parameter => }/TPQStatementParameter.java | 3 +-- .../statement/language/AbstractTPQStatementLanguage.java | 1 + .../statement/parameter/AbstractTPQStatementParameter.java | 1 + .../tpquery/store/manager/TPQStoreManagerExecutorContext.java | 2 +- .../store/manager/TPQStoreManagerStatementContext.java | 4 ++-- 9 files changed, 11 insertions(+), 14 deletions(-) rename ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/{language => }/TPQStatementLanguage.java (94%) rename ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/{parameter => }/TPQStatementParameter.java (95%) diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java index 8b50216..00ed0d8 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/AbstractTPQConfig.java @@ -29,8 +29,8 @@ import java.util.Map; import net.forwardfire.tpquery.config.validate.TPQConfigValidator; import net.forwardfire.tpquery.model.TPQuerySet; -import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; -import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; +import net.forwardfire.tpquery.statement.TPQStatementLanguage; +import net.forwardfire.tpquery.statement.TPQStatementParameter; import net.forwardfire.tpquery.store.TPQueryStoreScriptEngine; import net.forwardfire.tpquery.store.TPQueryStoreStatementCache; diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java index c4ae953..dcf9804 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/TPQConfig.java @@ -32,8 +32,8 @@ import org.apache.commons.lang3.Validate; import net.forwardfire.tpquery.config.validate.TPQConfigValidator; import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheck; import net.forwardfire.tpquery.model.TPQuerySet; -import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; -import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; +import net.forwardfire.tpquery.statement.TPQStatementLanguage; +import net.forwardfire.tpquery.statement.TPQStatementParameter; import net.forwardfire.tpquery.store.TPQueryStoreScriptEngine; import net.forwardfire.tpquery.store.TPQueryStoreStatementCache; diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java index 84004a0..dfd445c 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementContext.java @@ -28,8 +28,6 @@ import java.util.Map; import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQueryParameter; -import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; -import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; /** * Gives statement parts the needed references to data. diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementLanguage.java similarity index 94% rename from ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementLanguage.java index 34c9cb8..23b8c36 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/TPQStatementLanguage.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementLanguage.java @@ -20,12 +20,10 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.tpquery.statement.language; +package net.forwardfire.tpquery.statement; import java.util.Map; -import net.forwardfire.tpquery.statement.TPQStatementWriter; - /** * Allows for different language writers to define how the query is writen as statement text. * diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementParameter.java similarity index 95% rename from ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java rename to ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementParameter.java index 55cc251..5c6fc21 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/TPQStatementParameter.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/TPQStatementParameter.java @@ -20,10 +20,9 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.tpquery.statement.parameter; +package net.forwardfire.tpquery.statement; import net.forwardfire.tpquery.model.TPQueryParameter; -import net.forwardfire.tpquery.statement.TPQStatementWriter; /** * writes,validate and creates cacheKey for parameter type. diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java index 7732738..0abd037 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/language/AbstractTPQStatementLanguage.java @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.commons.lang3.Validate; import net.forwardfire.tpquery.statement.AbstractTPQStatementWriter; +import net.forwardfire.tpquery.statement.TPQStatementLanguage; import net.forwardfire.tpquery.statement.TPQStatementWriter; /** diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java index 7588f06..a5f6457 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/statement/parameter/AbstractTPQStatementParameter.java @@ -25,6 +25,7 @@ package net.forwardfire.tpquery.statement.parameter; import org.apache.commons.lang3.Validate; import net.forwardfire.tpquery.model.TPQueryParameter; +import net.forwardfire.tpquery.statement.TPQStatementParameter; /** * AbstractTQueryTemplateType holds the templateType key value. diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java index dcbf7a6..4af3c89 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerExecutorContext.java @@ -36,8 +36,8 @@ import net.forwardfire.tpquery.config.TPQConfigParameterValueHolder; import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQueryParameter; import net.forwardfire.tpquery.statement.TPQStatementContext; +import net.forwardfire.tpquery.statement.TPQStatementParameter; import net.forwardfire.tpquery.statement.TPQStatementWriter; -import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; import net.forwardfire.tpquery.store.TPQueryStoreScriptEngineException; import net.forwardfire.tpquery.store.TPQueryStoreStatement; import net.forwardfire.tpquery.store.executor.TPQExecutorContext; diff --git a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java index fe3d608..4781e62 100644 --- a/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java +++ b/ff-tpquery-store/src/main/java/net/forwardfire/tpquery/store/manager/TPQStoreManagerStatementContext.java @@ -30,8 +30,8 @@ import org.apache.commons.lang3.Validate; import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQueryParameter; import net.forwardfire.tpquery.statement.TPQStatementContext; -import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; -import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; +import net.forwardfire.tpquery.statement.TPQStatementLanguage; +import net.forwardfire.tpquery.statement.TPQStatementParameter; /** * Holds all data neede to write statements as query.