# sprint-2: Cleanup unused imports.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7deceb2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7deceb2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7deceb2a Branch: refs/heads/ignite-432 Commit: 7deceb2ab433b443a65837c7b0fcbdd762b3acec Parents: 7972da9 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Mar 18 08:54:14 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Mar 18 08:54:14 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/visor/cache/VisorCacheMetadataTask.java | 1 - .../internal/visor/cache/VisorCacheMetricsCollectorTask.java | 1 - .../ignite/internal/visor/cache/VisorCachePreloadTask.java | 1 - .../internal/visor/cache/VisorCacheQueryConfiguration.java | 8 +++++++- .../internal/visor/cache/VisorCacheResetMetricsTask.java | 1 - .../internal/visor/cache/VisorCacheSwapBackupsTask.java | 1 - 6 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java index 708a9d3..de67b83 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.visor.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.task.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java index 060d1e5..de232f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.visor.cache; -import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.task.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java index 85e3342..2632bb5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.visor.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.task.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java index d7fbce3..5b39182 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java @@ -39,6 +39,9 @@ public class VisorCacheQueryConfiguration implements Serializable { private static final long serialVersionUID = 0L; /** */ + private static final String[] EMPTY_STR_ARR = new String[0]; + + /** */ private String[] sqlFuncClss; /** */ @@ -57,6 +60,9 @@ public class VisorCacheQueryConfiguration implements Serializable { * @param clss Classes to compact. */ private static String[] compactClasses(Class<?>[] clss) { + if (clss == null) + return EMPTY_STR_ARR; + int len = clss.length; String[] res = new String[len]; @@ -72,7 +78,7 @@ public class VisorCacheQueryConfiguration implements Serializable { * @return Fill data transfer object with cache query configuration data. */ public static VisorCacheQueryConfiguration from(CacheConfiguration ccfg) { - VisorCacheQueryConfiguration cfg = null; + VisorCacheQueryConfiguration cfg = new VisorCacheQueryConfiguration(); cfg.sqlFuncClss = compactClasses(ccfg.getSqlFunctionClasses()); cfg.longQryWarnTimeout = ccfg.getLongQueryWarningTimeout(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java index b665855..9371119 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.visor.cache; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.task.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java index 2e8cea5..bb5e549 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.visor.cache; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*;