Fixes after merge from master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e6f214e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e6f214e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e6f214e Branch: refs/heads/ignite-3477-master Commit: 7e6f214e8404e45c63585f96966136fb1112c382 Parents: 0b6b838 Author: devozerov <[email protected]> Authored: Tue Mar 21 11:10:58 2017 +0300 Committer: devozerov <[email protected]> Committed: Tue Mar 21 11:10:58 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProcessor.java | 1 - .../processors/query/GridQueryProcessor.java | 3 --- .../internal/processors/query/QueryUtils.java | 20 +++++++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7e6f214e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index d383ce8..a7d38a7 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -102,7 +102,6 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManag import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.apache.ignite.internal.processors.plugin.CachePluginManager; import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; -import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions; import org.apache.ignite.internal.util.F0; import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.future.GridFinishedFuture; http://git-wip-us.apache.org/repos/asf/ignite/blob/7e6f214e/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 47341da..a58ca53 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 @@ -31,9 +31,6 @@ import javax.cache.CacheException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteException; -import org.apache.ignite.binary.BinaryField; -import org.apache.ignite.binary.BinaryObject; -import org.apache.ignite.binary.BinaryType; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.cache.CacheTypeMetadata; import org.apache.ignite.cache.QueryEntity; http://git-wip-us.apache.org/repos/asf/ignite/blob/7e6f214e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java index c033801..20570ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java @@ -703,12 +703,26 @@ public class QueryUtils { res = buildClassProperty(false, valCls, pathStr, resType, aliases, coCtx); if (res == null) - throw new IgniteCheckedException("Failed to initialize property '" + pathStr + "' of type '" + - resType.getName() + "' for key class '" + keyCls + "' and value class '" + valCls + "'. " + - "Make sure that one of these classes contains respective getter method or field."); + throw new IgniteCheckedException(propertyInitializationExceptionMessage(keyCls, valCls, pathStr, resType)); return res; } + + /** + * Exception message to compare in tests. + * + * @param keyCls key class + * @param valCls value class + * @param pathStr property name + * @param resType property type + * @return Exception message. + */ + public static String propertyInitializationExceptionMessage(Class<?> keyCls, Class<?> valCls, String pathStr, + Class<?> resType) { + return "Failed to initialize property '" + pathStr + "' of type '" + + resType.getName() + "' for key class '" + keyCls + "' and value class '" + valCls + "'. " + + "Make sure that one of these classes contains respective getter method or field."; + } /** * @param key If this is a key property.
