IGNITE-49 Fixed tck tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/996cc086 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/996cc086 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/996cc086 Branch: refs/heads/ignite-49 Commit: 996cc086ac22b708a5b63cb9a9414e7fe58365fa Parents: 984a3de Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jan 16 14:13:00 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jan 16 14:26:00 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteCacheMXBean.java | 4 ++ .../ignite/cache/CacheConfigurationMXBean.java | 71 -------------------- .../apache/ignite/cache/CacheMetricsMXBean.java | 29 ++++---- 3 files changed, 21 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/996cc086/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java b/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java index 26cace6..1d91442 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java @@ -21,8 +21,12 @@ import javax.cache.*; import javax.cache.configuration.*; import javax.cache.management.*; + /** + * Implementation of {@link CacheMXBean}. * + * It's a simple wrapper around {@link CompleteConfiguration CompleteConfiguration} for readonly + * access to cache configuration. */ public class IgniteCacheMXBean implements CacheMXBean { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/996cc086/modules/core/src/main/java/org/apache/ignite/cache/CacheConfigurationMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfigurationMXBean.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfigurationMXBean.java deleted file mode 100644 index 070780a..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfigurationMXBean.java +++ /dev/null @@ -1,71 +0,0 @@ -// @java.file.header - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.cache; - -import org.gridgain.grid.cache.GridCacheConfiguration; - -import javax.cache.management.*; - -/** - * Implementation of {@link CacheMXBean}. - * - * It's a simple wrapper around {@link GridCacheConfiguration} for readonly - * access to cache configuration. - */ -public class CacheConfigurationMXBean implements CacheMXBean { - /** - * - */ - private final GridCacheConfiguration cacheCfg; - - /** - * Constructor. - * - * @param cacheCfg The cache configuration. - */ - public CacheConfigurationMXBean(GridCacheConfiguration cacheCfg) { - this.cacheCfg = cacheCfg; - } - - /** {@inheritDoc} */ - @Override public String getKeyType() { - return cacheCfg.getKeyType().getName(); - } - - /** {@inheritDoc} */ - @Override public String getValueType() { - return cacheCfg.getValueType().getName(); - } - - /** {@inheritDoc} */ - @Override public boolean isReadThrough() { - return cacheCfg.isReadThrough(); - } - - /** {@inheritDoc} */ - @Override public boolean isWriteThrough() { - return cacheCfg.isWriteThrough(); - } - - /** {@inheritDoc} */ - @Override public boolean isStoreByValue() { - return cacheCfg.isStoreByValue(); - } - - /** {@inheritDoc} */ - @Override public boolean isStatisticsEnabled() { - return cacheCfg.isStatisticsEnabled(); - } - - /** {@inheritDoc} */ - @Override public boolean isManagementEnabled() { - return cacheCfg.isManagementEnabled(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/996cc086/modules/core/src/main/java/org/apache/ignite/cache/CacheMetricsMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetricsMXBean.java index 92fa80e..85fc1f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetricsMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetricsMXBean.java @@ -1,15 +1,23 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.ignite.cache; -import org.gridgain.grid.cache.GridCache; +import org.gridgain.grid.cache.*; import javax.cache.management.*; @@ -17,10 +25,7 @@ import javax.cache.management.*; * Implementation of {@link CacheStatisticsMXBean}. */ public class CacheMetricsMXBean implements CacheStatisticsMXBean { - - /** - * Grid cache. - */ + /** Grid cache. */ private final GridCache cache; /**
