http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java index e2fd5a6..67eb9e8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java @@ -9,10 +9,10 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.portables.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.dr.*; @@ -403,8 +403,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V try { cctx.deploy().registerClasses(keyType, valType); } - catch (GridException e) { - throw new GridRuntimeException(e); + catch (IgniteCheckedException e) { + throw new IgniteException(e); } } @@ -434,8 +434,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V try { cctx.deploy().registerClasses(p); } - catch (GridException e) { - throw new GridRuntimeException(e); + catch (IgniteCheckedException e) { + throw new IgniteException(e); } } @@ -458,8 +458,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V try { cctx.deploy().registerClasses(filter); } - catch (GridException e) { - throw new GridRuntimeException(e); + catch (IgniteCheckedException e) { + throw new IgniteException(e); } } @@ -533,12 +533,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public int globalSize() throws GridException { + @Override public int globalSize() throws IgniteCheckedException { return cache.globalSize(); } /** {@inheritDoc} */ - @Override public int globalPrimarySize() throws GridException { + @Override public int globalPrimarySize() throws IgniteCheckedException { return cache.globalPrimarySize(); } @@ -579,7 +579,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V reload(K key) throws GridException { + @Override public V reload(K key) throws IgniteCheckedException { return cache.reload(key, entryFilter(false)); } @@ -589,7 +589,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void reloadAll() throws GridException { + @Override public void reloadAll() throws IgniteCheckedException { cache.reloadAll(entryFilter(false)); } @@ -599,7 +599,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void reloadAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public void reloadAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { cache.reloadAll(keys, entryFilter(false)); } @@ -609,13 +609,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V get(K key) throws GridException { + @Override public V get(K key) throws IgniteCheckedException { return cache.get(key, deserializePortables(), entryFilter(false)); } /** {@inheritDoc} */ @Override public V get(K key, @Nullable GridCacheEntryEx<K, V> entry, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return cache.get(key, entry, deserializePortable, and(filter, false)); } @@ -625,7 +625,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V getForcePrimary(K key) throws GridException { + @Override public V getForcePrimary(K key) throws IgniteCheckedException { return cache.getForcePrimary(key); } @@ -635,7 +635,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Nullable @Override public Map<K, V> getAllOutTx(List<K> keys) throws GridException { + @Nullable @Override public Map<K, V> getAllOutTx(List<K> keys) throws IgniteCheckedException { return cache.getAllOutTx(keys); } @@ -670,7 +670,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { return cache.getAll(keys, deserializePortables(), entryFilter(false)); } @@ -681,13 +681,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { return putAsync(key, val, filter).get(); } /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return cache.put(key, val, entry, ttl, filter); } @@ -711,29 +711,29 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return cache.putx(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { return putxAsync(key, val, filter).get(); } /** {@inheritDoc} */ - @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws GridException { + @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException { cache.putAllDr(drMap); } /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) - throws GridException { + throws IgniteCheckedException { return cache.putAllDrAsync(drMap); } /** {@inheritDoc} */ - @Override public void transform(K key, IgniteClosure<V, V> transformer) throws GridException { + @Override public void transform(K key, IgniteClosure<V, V> transformer) throws IgniteCheckedException { A.notNull(key, "key", transformer, "valTransform"); cache.transform(key, transformer); @@ -741,7 +741,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public <R> R transformAndCompute(K key, IgniteClosure<V, IgniteBiTuple<V, R>> transformer) - throws GridException { + throws IgniteCheckedException { A.notNull(key, "key", transformer, "transformer"); return cache.transformAndCompute(key, transformer); @@ -773,7 +773,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V putIfAbsent(K key, V val) throws GridException { + @Override public V putIfAbsent(K key, V val) throws IgniteCheckedException { return putIfAbsentAsync(key, val).get(); } @@ -783,7 +783,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean putxIfAbsent(K key, V val) throws GridException { + @Override public boolean putxIfAbsent(K key, V val) throws IgniteCheckedException { return putxIfAbsentAsync(key, val).get(); } @@ -799,7 +799,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V replace(K key, V val) throws GridException { + @Override public V replace(K key, V val) throws IgniteCheckedException { return replaceAsync(key, val).get(); } @@ -809,7 +809,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean replacex(K key, V val) throws GridException { + @Override public boolean replacex(K key, V val) throws IgniteCheckedException { return replacexAsync(key, val).get(); } @@ -819,7 +819,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean replace(K key, V oldVal, V newVal) throws GridException { + @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException { return replaceAsync(key, oldVal, newVal).get(); } @@ -832,12 +832,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { putAllAsync(m, filter).get(); } /** {@inheritDoc} */ - @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws GridException { + @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws IgniteCheckedException { if (F.isEmpty(m)) return; @@ -846,7 +846,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public void transformAll(@Nullable Set<? extends K> keys, IgniteClosure<V, V> transformer) - throws GridException { + throws IgniteCheckedException { if (F.isEmpty(keys)) return; @@ -874,7 +874,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteFuture<?> transformAllAsync(@Nullable Set<? extends K> keys, IgniteClosure<V, V> transformer) - throws GridException { + throws IgniteCheckedException { if (F.isEmpty(keys)) return new GridFinishedFuture<>(cctx.kernalContext()); @@ -964,7 +964,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws GridException { + @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { V val = cache.peek(key, modes); return isAll(key, val, true) ? val : null; @@ -1001,12 +1001,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void globalClearAll() throws GridException { + @Override public void globalClearAll() throws IgniteCheckedException { cache.globalClearAll(); } /** {@inheritDoc} */ - @Override public void globalClearAll(long timeout) throws GridException { + @Override public void globalClearAll(long timeout) throws IgniteCheckedException { cache.globalClearAll(timeout); } @@ -1016,24 +1016,24 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean compact(K key) throws GridException { + @Override public boolean compact(K key) throws IgniteCheckedException { return cache.compact(key, entryFilter(false)); } /** {@inheritDoc} */ - @Override public void compactAll() throws GridException { + @Override public void compactAll() throws IgniteCheckedException { cache.compactAll(keySet()); } /** {@inheritDoc} */ @Override public V remove(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { return removeAsync(key, filter).get(); } /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return removeAsync(key, entry, filter).get(); } @@ -1050,23 +1050,23 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean removex(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { return removexAsync(key, filter).get(); } /** {@inheritDoc} */ - @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws GridException { + @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { cache.removeAllDr(drMap); } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws GridException { + @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { return cache.removeAllDrAsync(drMap); } /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return removexAsync(key, entry, filter).get(); } @@ -1094,12 +1094,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws GridException { + @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws IgniteCheckedException { return replacexAsync(key, oldVal, newVal).get(); } /** {@inheritDoc} */ - @Override public GridCacheReturn<V> removex(K key, V val) throws GridException { + @Override public GridCacheReturn<V> removex(K key, V val) throws IgniteCheckedException { return removexAsync(key, val).get(); } @@ -1110,7 +1110,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public boolean remove(K key, V val) throws GridException { + @Override public boolean remove(K key, V val) throws IgniteCheckedException { return removeAsync(key, val).get(); } @@ -1122,7 +1122,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { cache.removeAll(keys, and(filter, true)); } @@ -1134,7 +1134,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public void removeAll(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) - throws GridException { + throws IgniteCheckedException { cache.removeAll(and(filter, true)); } @@ -1145,7 +1145,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean lock(K key, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return cache.lock(key, timeout, and(filter, false)); } @@ -1157,7 +1157,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { return cache.lockAll(keys, timeout, and(filter, false)); } @@ -1168,13 +1168,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { cache.unlock(key, and(filter, false)); } /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { cache.unlockAll(keys, and(filter, false)); } @@ -1189,12 +1189,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V promote(K key) throws GridException { + @Override public V promote(K key) throws IgniteCheckedException { return cache.promote(key, deserializePortables()); } /** {@inheritDoc} */ - @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { cache.promoteAll(keys); } @@ -1216,13 +1216,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public GridCacheTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, GridException { + GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException { return cache.txStartAffinity(affinityKey, concurrency, isolation, timeout, txSize); } /** {@inheritDoc} */ @Override public GridCacheTx txStartPartition(int partId, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, GridException { + GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException { return cache.txStartPartition(partId, concurrency, isolation, timeout, txSize); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java index 6230167..8b6ade8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; @@ -196,7 +196,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public long overflowSize() throws GridException { + @Override public long overflowSize() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -208,7 +208,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void loadCache(IgniteBiPredicate<K, V> p, long ttl, @Nullable Object[] args) throws GridException { + @Override public void loadCache(IgniteBiPredicate<K, V> p, long ttl, @Nullable Object[] args) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -366,7 +366,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Nullable @Override public V reload(K key) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -390,7 +390,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void reloadAll() throws GridException { + @Override public void reloadAll() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -414,7 +414,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void reloadAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public void reloadAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -438,7 +438,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V get(K key) throws GridException { + @Nullable @Override public V get(K key) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -451,7 +451,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public V get(K key, @Nullable GridCacheEntryEx<K, V> entry, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -475,7 +475,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public V getForcePrimary(K key) throws GridException { + @Override public V getForcePrimary(K key) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -499,7 +499,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public Map<K, V> getAllOutTx(List<K> keys) throws GridException { + @Nullable @Override public Map<K, V> getAllOutTx(List<K> keys) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -583,7 +583,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -608,7 +608,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Nullable @Override public V put(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -621,7 +621,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -660,7 +660,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -673,7 +673,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -685,7 +685,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws GridException { + @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -698,7 +698,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -710,7 +710,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void transform(K key, IgniteClosure<V, V> transformer) throws GridException { + @Override public void transform(K key, IgniteClosure<V, V> transformer) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -723,7 +723,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public <R> R transformAndCompute(K key, IgniteClosure<V, IgniteBiTuple<V, R>> transformer) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -773,7 +773,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V putIfAbsent(K key, V val) throws GridException { + @Nullable @Override public V putIfAbsent(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -797,7 +797,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean putxIfAbsent(K key, V val) throws GridException { + @Override public boolean putxIfAbsent(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -834,7 +834,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V replace(K key, V val) throws GridException { + @Nullable @Override public V replace(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -858,7 +858,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean replacex(K key, V val) throws GridException { + @Override public boolean replacex(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -882,7 +882,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean replace(K key, V oldVal, V newVal) throws GridException { + @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -907,7 +907,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -919,7 +919,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws GridException { + @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -932,7 +932,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void transformAll(@Nullable Set<? extends K> keys, IgniteClosure<V, V> transformer) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -970,7 +970,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteFuture<?> transformAllAsync(@Nullable Set<? extends K> keys, IgniteClosure<V, V> transformer) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1129,7 +1129,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public GridCacheTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, GridException { + GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1142,7 +1142,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public GridCacheTx txStartPartition(int partId, GridCacheTxConcurrency concurrency, - GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, GridException { + GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1178,7 +1178,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws GridException { + @Nullable @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1250,7 +1250,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void globalClearAll() throws GridException { + @Override public void globalClearAll() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1262,7 +1262,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void globalClearAll(long timeout) throws GridException { + @Override public void globalClearAll(long timeout) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1287,7 +1287,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean compact(K key) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1299,7 +1299,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void compactAll() throws GridException { + @Override public void compactAll() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1312,7 +1312,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Nullable @Override public V remove(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1325,7 +1325,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1363,7 +1363,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1375,7 +1375,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws GridException { + @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1387,7 +1387,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws GridException { + @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1400,7 +1400,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1450,7 +1450,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws GridException { + @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1462,7 +1462,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public GridCacheReturn<V> removex(K key, V val) throws GridException { + @Override public GridCacheReturn<V> removex(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1486,7 +1486,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean remove(K key, V val) throws GridException { + @Override public boolean remove(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1511,7 +1511,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1537,7 +1537,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void removeAll(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1562,7 +1562,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean lock(K key, long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1588,7 +1588,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1613,7 +1613,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1626,7 +1626,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1674,7 +1674,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public int globalSize() throws GridException { + @Override public int globalSize() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1710,7 +1710,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public int globalPrimarySize() throws GridException { + @Override public int globalPrimarySize() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1722,7 +1722,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V promote(K key) throws GridException { + @Nullable @Override public V promote(K key) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1734,7 +1734,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1746,7 +1746,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Iterator<Map.Entry<K, V>> swapIterator() throws GridException { + @Override public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1758,7 +1758,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Iterator<Map.Entry<K, V>> offHeapIterator() throws GridException { + @Override public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1794,7 +1794,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public long swapSize() throws GridException { + @Override public long swapSize() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1806,7 +1806,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public long swapKeys() throws GridException { + @Override public long swapKeys() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java index 8a2653d..33ffea5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java @@ -109,11 +109,11 @@ public class GridCacheSharedContext<K, V> { * @param cacheCtx Cache context. */ @SuppressWarnings("unchecked") - public void addCacheContext(GridCacheContext cacheCtx) throws GridException { + public void addCacheContext(GridCacheContext cacheCtx) throws IgniteCheckedException { if (ctxMap.containsKey(cacheCtx.cacheId())) { GridCacheContext<K, V> existing = ctxMap.get(cacheCtx.cacheId()); - throw new GridException("Failed to start cache due to conflicting cache ID " + + throw new IgniteCheckedException("Failed to start cache due to conflicting cache ID " + "(change cache name and restart grid) [cacheName=" + cacheCtx.name() + ", conflictingCacheName=" + existing.name() + ']'); } @@ -408,9 +408,9 @@ public class GridCacheSharedContext<K, V> { /** * @param tx Transaction to close. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void endTx(GridCacheTxEx<K, V> tx) throws GridException { + public void endTx(GridCacheTxEx<K, V> tx) throws IgniteCheckedException { Collection<Integer> cacheIds = tx.activeCacheIds(); if (!cacheIds.isEmpty()) { @@ -445,9 +445,9 @@ public class GridCacheSharedContext<K, V> { /** * @param tx Transaction to rollback. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void rollbackTx(GridCacheTxEx<K, V> tx) throws GridException { + public void rollbackTx(GridCacheTxEx<K, V> tx) throws IgniteCheckedException { Collection<Integer> cacheIds = tx.activeCacheIds(); if (!cacheIds.isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManager.java index 3770eaf..1c74f23 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManager.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache; -import org.gridgain.grid.*; +import org.apache.ignite.*; /** * Cache manager shared across all caches. @@ -19,9 +19,9 @@ public interface GridCacheSharedManager <K, V> { * Starts manager. * * @param cctx Context. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void start(GridCacheSharedContext<K, V> cctx) throws GridException; + public void start(GridCacheSharedContext<K, V> cctx) throws IgniteCheckedException; /** * Stops manager. @@ -31,9 +31,9 @@ public interface GridCacheSharedManager <K, V> { public void stop(boolean cancel); /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void onKernalStart() throws GridException; + public void onKernalStart() throws IgniteCheckedException; /** * @param cancel Cancel flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java index 14ff2dd..55d82d6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java @@ -29,7 +29,7 @@ public class GridCacheSharedManagerAdapter<K, V> implements GridCacheSharedManag private final AtomicBoolean starting = new AtomicBoolean(false); /** {@inheritDoc} */ - @Override public final void start(GridCacheSharedContext<K, V> cctx) throws GridException { + @Override public final void start(GridCacheSharedContext<K, V> cctx) throws IgniteCheckedException { if (!starting.compareAndSet(false, true)) assert false : "Method start is called more than once for manager: " + this; @@ -60,9 +60,9 @@ public class GridCacheSharedManagerAdapter<K, V> implements GridCacheSharedManag } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - protected void start0() throws GridException { + protected void start0() throws IgniteCheckedException { // No-op. } @@ -86,7 +86,7 @@ public class GridCacheSharedManagerAdapter<K, V> implements GridCacheSharedManag } /** {@inheritDoc} */ - @Override public final void onKernalStart() throws GridException { + @Override public final void onKernalStart() throws IgniteCheckedException { onKernalStart0(); if (log != null && log.isDebugEnabled()) @@ -106,9 +106,9 @@ public class GridCacheSharedManagerAdapter<K, V> implements GridCacheSharedManag } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - protected void onKernalStart0() throws GridException { + protected void onKernalStart0() throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java index 3fdbb37..2d5aadf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; import org.gridgain.grid.util.lang.*; @@ -49,7 +49,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { } /** {@inheritDoc} */ - @Override protected void start0() throws GridException { + @Override protected void start0() throws IgniteCheckedException { if (store instanceof LifecycleAware) { // Avoid second start() call on store in case when near cache is enabled. if (cctx.config().isWriteBehindEnabled()) { @@ -77,7 +77,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { ((LifecycleAware)store).stop(); } } - catch (GridException e) { + catch (IgniteCheckedException e) { U.error(log(), "Failed to stop cache store.", e); } } @@ -103,9 +103,9 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param tx Cache transaction. * @param key Cache key. * @return Loaded value, possibly <tt>null</tt>. - * @throws GridException If data loading failed. + * @throws IgniteCheckedException If data loading failed. */ - @Nullable public V loadFromStore(@Nullable GridCacheTx tx, K key) throws GridException { + @Nullable public V loadFromStore(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException { if (store != null) { if (log.isDebugEnabled()) log.debug("Loading value from store for key: " + key); @@ -158,11 +158,11 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param keys Cache keys. * @param vis Closure. * @return {@code True} if there is a persistent storage. - * @throws GridException If data loading failed. + * @throws IgniteCheckedException If data loading failed. */ @SuppressWarnings({"unchecked"}) public boolean loadAllFromStore(@Nullable GridCacheTx tx, Collection<? extends K> keys, - final IgniteBiInClosure<K, V> vis) throws GridException { + final IgniteBiInClosure<K, V> vis) throws IgniteCheckedException { if (store != null) { if (log.isDebugEnabled()) log.debug("Loading values from store for keys: " + keys); @@ -186,7 +186,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { catch (ClassCastException e) { handleClassCastException(e); } - catch (GridRuntimeException e) { + catch (IgniteException e) { throw U.cast(e); } } @@ -206,10 +206,10 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param vis Closer to cache loaded elements. * @param args User arguments. * @return {@code True} if there is a persistent storage. - * @throws GridException If data loading failed. + * @throws IgniteCheckedException If data loading failed. */ @SuppressWarnings({"ErrorNotRethrown", "unchecked"}) - public boolean loadCache(final GridInClosure3<K, V, GridCacheVersion> vis, Object[] args) throws GridException { + public boolean loadCache(final GridInClosure3<K, V, GridCacheVersion> vis, Object[] args) throws IgniteCheckedException { if (store != null) { if (log.isDebugEnabled()) log.debug("Loading all values from store."); @@ -233,11 +233,11 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { } }, args); } - catch (GridRuntimeException e) { + catch (IgniteException e) { throw U.cast(e); } catch (AssertionError e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } if (log.isDebugEnabled()) @@ -260,10 +260,10 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param val Value. * @param ver Version. * @return {@code true} If there is a persistent storage. - * @throws GridException If storage failed. + * @throws IgniteCheckedException If storage failed. */ public boolean putToStore(@Nullable GridCacheTx tx, K key, V val, GridCacheVersion ver) - throws GridException { + throws IgniteCheckedException { if (store != null) { if (log.isDebugEnabled()) log.debug("Storing value in cache store [key=" + key + ", val=" + val + ']'); @@ -296,10 +296,10 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param tx Cache transaction. * @param map Map. * @return {@code True} if there is a persistent storage. - * @throws GridException If storage failed. + * @throws IgniteCheckedException If storage failed. */ public boolean putAllToStore(@Nullable GridCacheTx tx, - Map<K, IgniteBiTuple<V, GridCacheVersion>> map) throws GridException { + Map<K, IgniteBiTuple<V, GridCacheVersion>> map) throws IgniteCheckedException { if (F.isEmpty(map)) return true; @@ -339,9 +339,9 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param tx Cache transaction. * @param key Key. * @return {@code True} if there is a persistent storage. - * @throws GridException If storage failed. + * @throws IgniteCheckedException If storage failed. */ - public boolean removeFromStore(@Nullable GridCacheTx tx, K key) throws GridException { + public boolean removeFromStore(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException { if (store != null) { if (log.isDebugEnabled()) log.debug("Removing value from cache store [key=" + key + ']'); @@ -371,9 +371,9 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { * @param tx Cache transaction. * @param keys Key. * @return {@code True} if there is a persistent storage. - * @throws GridException If storage failed. + * @throws IgniteCheckedException If storage failed. */ - public boolean removeAllFromStore(@Nullable GridCacheTx tx, Collection<? extends K> keys) throws GridException { + public boolean removeAllFromStore(@Nullable GridCacheTx tx, Collection<? extends K> keys) throws IgniteCheckedException { if (F.isEmpty(keys)) return true; @@ -411,9 +411,9 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void forceFlush() throws GridException { + public void forceFlush() throws IgniteCheckedException { if (store instanceof GridCacheWriteBehindStore) ((GridCacheWriteBehindStore)store).forceFlush(); } @@ -421,22 +421,22 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { /** * @param tx Transaction. * @param commit Commit. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void txEnd(GridCacheTx tx, boolean commit) throws GridException { + public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException { store.txEnd(tx, commit); } /** * @param e Class cast exception. - * @throws GridException Thrown exception. + * @throws IgniteCheckedException Thrown exception. */ - private void handleClassCastException(ClassCastException e) throws GridException { + private void handleClassCastException(ClassCastException e) throws IgniteCheckedException { assert e != null; if (cctx.portableEnabled() && e.getMessage() != null && e.getMessage().startsWith("org.gridgain.grid.util.portable.GridPortableObjectImpl")) { - throw new GridException("Cache store must work with portable objects if portables are " + + throw new IgniteCheckedException("Cache store must work with portable objects if portables are " + "enabled for cache [cacheName=" + cctx.namex() + ']', e); } else
