ignite-2358 toString() method for cache store implementations
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/391f4be4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/391f4be4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/391f4be4 Branch: refs/heads/master Commit: 391f4be4c687a7f325aeec8b727c9c85ca003454 Parents: 671a77a Author: agura <[email protected]> Authored: Wed Dec 7 20:11:50 2016 +0300 Committer: agura <[email protected]> Committed: Thu Dec 8 19:13:11 2016 +0300 ---------------------------------------------------------------------- .../cache/store/cassandra/CassandraCacheStore.java | 6 ++++++ .../cache/store/cassandra/datasource/DataSource.java | 9 +++++++++ .../org/apache/ignite/cache/store/CacheStoreAdapter.java | 6 ++++++ .../ignite/cache/store/jdbc/CacheJdbcPojoStore.java | 6 ++++++ .../processors/cache/CacheStoreBalancingWrapper.java | 6 ++++++ .../processors/cache/GridCacheLoaderWriterStore.java | 6 ++++++ .../platform/dotnet/PlatformDotNetCacheStore.java | 11 +++++++++++ 7 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java b/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java index f7e7917..e8da3a7 100644 --- a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java +++ b/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java @@ -41,6 +41,7 @@ import org.apache.ignite.cache.store.cassandra.session.CassandraSession; import org.apache.ignite.cache.store.cassandra.session.ExecutionAssistant; import org.apache.ignite.cache.store.cassandra.session.GenericBatchExecutionAssistant; import org.apache.ignite.cache.store.cassandra.session.LoadCacheCustomQueryWorker; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.logger.NullLogger; @@ -406,4 +407,9 @@ public class CassandraCacheStore<K, V> implements CacheStore<K, V> { if (ses != null && (storeSes == null || storeSes.transaction() == null)) U.closeQuiet(ses); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(CassandraCacheStore.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java b/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java index 1ecb28f..915eebd 100644 --- a/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java +++ b/modules/cassandra/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java @@ -39,6 +39,8 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.store.cassandra.session.CassandraSession; import org.apache.ignite.cache.store.cassandra.session.CassandraSessionImpl; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Data source abstraction to specify configuration of the Cassandra session to be used. @@ -54,9 +56,11 @@ public class DataSource { private ConsistencyLevel writeConsistency; /** Username to use for authentication. */ + @GridToStringExclude private String user; /** Password to use for authentication. */ + @GridToStringExclude private String pwd; /** Port to use for Cassandra connection. */ @@ -547,4 +551,9 @@ public class DataSource { private synchronized void invalidate() { ses = null; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(DataSource.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java index eaf5225..f3436f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; import javax.cache.Cache; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteBiPredicate; @@ -93,4 +94,9 @@ public abstract class CacheStoreAdapter<K, V> implements CacheStore<K, V> { @Override public void sessionEnd(boolean commit) { // No-op. } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(CacheStoreAdapter.class, this); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java index b348020..209dd11 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java @@ -35,6 +35,7 @@ import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.binary.BinaryObjectEx; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; @@ -335,6 +336,11 @@ public class CacheJdbcPojoStore<K, V> extends CacheAbstractJdbcStore<K, V> { } } + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(CacheJdbcPojoStore.class, this); + } + /** * Description of type property. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java index 8992326..ce2330c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java @@ -31,6 +31,7 @@ import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteBiInClosure; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; @@ -227,6 +228,11 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> { delegate.sessionEnd(commit); } + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(CacheStoreBalancingWrapper.class, this); + } + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java index c497ac0..03beaf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java @@ -25,6 +25,7 @@ import javax.cache.Cache; import javax.cache.integration.CacheLoader; import javax.cache.integration.CacheWriter; import org.apache.ignite.cache.store.CacheStore; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lifecycle.LifecycleAware; import org.jetbrains.annotations.Nullable; @@ -142,4 +143,9 @@ class GridCacheLoaderWriterStore<K, V> implements CacheStore<K, V>, LifecycleAwa @Override public void sessionEnd(boolean commit) { // No-op. } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(GridCacheLoaderWriterStore.class, this); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/391f4be4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java index 3563dd6..7505d48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java @@ -31,7 +31,10 @@ import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStrea import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.internal.util.lang.IgniteInClosureX; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lifecycle.LifecycleAware; @@ -98,12 +101,15 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor private Map<String, ?> props; /** Native factory. */ + @GridToStringInclude private final Object nativeFactory; /** Interop processor. */ + @GridToStringExclude protected PlatformContext platformCtx; /** Pointer to native store. */ + @GridToStringExclude protected long ptr; /** @@ -441,4 +447,9 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor return res; } } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(PlatformDotNetCacheStore.class, this); + } }
