Moved 2 interfaces to remove cycle dep

This commit is contained in:
Willem 2016-05-13 13:27:33 +02:00
parent e4e6455b73
commit 514a572efa
9 changed files with 11 additions and 14 deletions

View file

@ -29,8 +29,8 @@ import java.util.Map;
import net.forwardfire.tpquery.config.validate.TPQConfigValidator; import net.forwardfire.tpquery.config.validate.TPQConfigValidator;
import net.forwardfire.tpquery.model.TPQuerySet; import net.forwardfire.tpquery.model.TPQuerySet;
import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; import net.forwardfire.tpquery.statement.TPQStatementLanguage;
import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; import net.forwardfire.tpquery.statement.TPQStatementParameter;
import net.forwardfire.tpquery.store.TPQueryStoreScriptEngine; import net.forwardfire.tpquery.store.TPQueryStoreScriptEngine;
import net.forwardfire.tpquery.store.TPQueryStoreStatementCache; import net.forwardfire.tpquery.store.TPQueryStoreStatementCache;

View file

@ -32,8 +32,8 @@ import org.apache.commons.lang3.Validate;
import net.forwardfire.tpquery.config.validate.TPQConfigValidator; import net.forwardfire.tpquery.config.validate.TPQConfigValidator;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheck; import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheck;
import net.forwardfire.tpquery.model.TPQuerySet; import net.forwardfire.tpquery.model.TPQuerySet;
import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; import net.forwardfire.tpquery.statement.TPQStatementLanguage;
import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; import net.forwardfire.tpquery.statement.TPQStatementParameter;
import net.forwardfire.tpquery.store.TPQueryStoreScriptEngine; import net.forwardfire.tpquery.store.TPQueryStoreScriptEngine;
import net.forwardfire.tpquery.store.TPQueryStoreStatementCache; import net.forwardfire.tpquery.store.TPQueryStoreStatementCache;

View file

@ -28,8 +28,6 @@ import java.util.Map;
import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQuery;
import net.forwardfire.tpquery.model.TPQueryParameter; 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. * Gives statement parts the needed references to data.

View file

@ -20,12 +20,10 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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 java.util.Map;
import net.forwardfire.tpquery.statement.TPQStatementWriter;
/** /**
* Allows for different language writers to define how the query is writen as statement text. * Allows for different language writers to define how the query is writen as statement text.
* *

View file

@ -20,10 +20,9 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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.model.TPQueryParameter;
import net.forwardfire.tpquery.statement.TPQStatementWriter;
/** /**
* writes,validate and creates cacheKey for parameter type. * writes,validate and creates cacheKey for parameter type.

View file

@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import net.forwardfire.tpquery.statement.AbstractTPQStatementWriter; import net.forwardfire.tpquery.statement.AbstractTPQStatementWriter;
import net.forwardfire.tpquery.statement.TPQStatementLanguage;
import net.forwardfire.tpquery.statement.TPQStatementWriter; import net.forwardfire.tpquery.statement.TPQStatementWriter;
/** /**

View file

@ -25,6 +25,7 @@ package net.forwardfire.tpquery.statement.parameter;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import net.forwardfire.tpquery.model.TPQueryParameter; import net.forwardfire.tpquery.model.TPQueryParameter;
import net.forwardfire.tpquery.statement.TPQStatementParameter;
/** /**
* AbstractTQueryTemplateType holds the templateType key value. * AbstractTQueryTemplateType holds the templateType key value.

View file

@ -36,8 +36,8 @@ import net.forwardfire.tpquery.config.TPQConfigParameterValueHolder;
import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQuery;
import net.forwardfire.tpquery.model.TPQueryParameter; import net.forwardfire.tpquery.model.TPQueryParameter;
import net.forwardfire.tpquery.statement.TPQStatementContext; import net.forwardfire.tpquery.statement.TPQStatementContext;
import net.forwardfire.tpquery.statement.TPQStatementParameter;
import net.forwardfire.tpquery.statement.TPQStatementWriter; import net.forwardfire.tpquery.statement.TPQStatementWriter;
import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter;
import net.forwardfire.tpquery.store.TPQueryStoreScriptEngineException; import net.forwardfire.tpquery.store.TPQueryStoreScriptEngineException;
import net.forwardfire.tpquery.store.TPQueryStoreStatement; import net.forwardfire.tpquery.store.TPQueryStoreStatement;
import net.forwardfire.tpquery.store.executor.TPQExecutorContext; import net.forwardfire.tpquery.store.executor.TPQExecutorContext;

View file

@ -30,8 +30,8 @@ import org.apache.commons.lang3.Validate;
import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQuery;
import net.forwardfire.tpquery.model.TPQueryParameter; import net.forwardfire.tpquery.model.TPQueryParameter;
import net.forwardfire.tpquery.statement.TPQStatementContext; import net.forwardfire.tpquery.statement.TPQStatementContext;
import net.forwardfire.tpquery.statement.language.TPQStatementLanguage; import net.forwardfire.tpquery.statement.TPQStatementLanguage;
import net.forwardfire.tpquery.statement.parameter.TPQStatementParameter; import net.forwardfire.tpquery.statement.TPQStatementParameter;
/** /**
* Holds all data neede to write statements as query. * Holds all data neede to write statements as query.