ignite-sql-tests - type name fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7b6409f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7b6409f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7b6409f3 Branch: refs/heads/ignite-sql-tests Commit: 7b6409f3579d382570723b1a324776c47a77e7e4 Parents: 8f3ee10 Author: S.Vladykin <[email protected]> Authored: Sun Feb 8 21:46:58 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Sun Feb 8 21:46:58 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/query/QuerySql.java | 18 ++---------------- .../org/apache/ignite/cache/query/QueryText.java | 5 ++--- .../processors/query/GridQueryProcessor.java | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b6409f3/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java index a8c8883..234a482 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySql.java @@ -17,6 +17,7 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -125,22 +126,7 @@ public final class QuerySql extends Query<QuerySql> { * @param type Type. */ public QuerySql setType(Class<?> type) { - return setType(name(type)); - } - - /** - * @param type Type class. - * @return Type name. - */ - static String name(Class<?> type) { - if (type == null) - return null; - - String name = type.getName(); - - int dot = name.lastIndexOf('.'); - - return dot == -1 ? name : name.substring(dot + 1); + return setType(GridQueryProcessor.typeName(type)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b6409f3/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java index 7c3aa13..b6eda82 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryText.java @@ -17,10 +17,9 @@ package org.apache.ignite.cache.query; +import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.internal.*; -import static org.apache.ignite.cache.query.QuerySql.*; - /** * Query for Lucene based fulltext search. */ @@ -68,7 +67,7 @@ public final class QueryText extends Query<QueryText> { * @return {@code this} For chaining. */ public QueryText setType(Class<?> type) { - return setType(name(type)); + return setType(GridQueryProcessor.typeName(type)); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b6409f3/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index a92abef..6c77798 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -600,7 +600,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param cls Class. * @return Type name. */ - public String typeName(Class<?> cls) { + public static String typeName(Class<?> cls) { String typeName = cls.getSimpleName(); // To protect from failure on anonymous classes.
