ignite-201 - Removed DataStructureRemovedException in favor of Illega…

…lStateException.
apache · Feb 8, 2015 · 0a2125e · 0a2125e
1 parent db5e5d3
commit 0a2125e
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 103 deletions.
diff --git a/...es/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java b/...es/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
diff --git a/...in/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/...in/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -333,11 +332,11 @@ public GridCacheAtomicLongImpl(String name, GridCacheInternalKey key,
     /**
      * Check removed flag.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Atomic long was removed from cache: " + name);
+            throw new IllegalStateException("Atomic long was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

diff --git a/...va/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/...va/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -291,11 +290,11 @@ private Callable<Boolean> internalCompareAndSet(final IgnitePredicate<T> expValP
     /**
      * Check removed status.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Atomic reference was removed from cache: " + name);
+            throw new IllegalStateException("Atomic reference was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

diff --git a/...ava/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/...ava/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -388,11 +387,11 @@ private IgniteInternalFuture<Long> internalUpdateAsync(long l, @Nullable Callabl
     /**
      * Check removed status.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Sequence was removed from cache: " + name);
+            throw new IllegalStateException("Sequence was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

diff --git a/...java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/...java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -366,11 +365,11 @@ private Object readResolve() throws ObjectStreamException {
     /**
      * Check removed status.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Atomic stamped was removed from cache: " + name);
+            throw new IllegalStateException("Atomic stamped was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

diff --git a/...main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java b/...main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
@@ -419,7 +418,7 @@ static void removeKeys(
     }
 
     /**
-     * Checks result of closure modifying queue header, throws {@link DataStructureRemovedException}
+     * Checks result of closure modifying queue header, throws {@link IllegalStateException}
      * if queue was removed.
      *
      * @param idx Result of closure execution.
@@ -430,7 +429,7 @@ protected final void checkRemoved(Long idx) {
     }
 
     /**
-     * Checks queue state, throws {@link DataStructureRemovedException} if queue was removed.
+     * Checks queue state, throws {@link IllegalStateException} if queue was removed.
      *
      * @param hdr Queue hdr.
      */
@@ -442,15 +441,15 @@ protected final void checkRemoved(@Nullable GridCacheQueueHeader hdr) {
     /**
      * Marks queue as removed.
      *
-     * @param throw0 If {@code true} then throws {@link DataStructureRemovedException}.
+     * @param throw0 If {@code true} then throws {@link IllegalStateException}.
      */
     public void onRemoved(boolean throw0) {
         rmvd = true;
 
         releaseSemaphores();
 
         if (throw0)
-            throw new DataStructureRemovedException("Queue has been removed from cache: " + this);
+            throw new IllegalStateException("Queue has been removed from cache: " + this);
     }
 
     /**

diff --git a/.../src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java b/.../src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -22,7 +22,6 @@
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.util.*;
@@ -459,11 +458,11 @@ void removed(boolean rmvd) {
     }
 
     /**
-     * Throws {@link DataStructureRemovedException} if set was removed.
+     * Throws {@link IllegalStateException} if set was removed.
      */
     private void checkRemoved() {
         if (rmvd)
-            throw new DataStructureRemovedException("Set has been removed from cache: " + this);
+            throw new IllegalStateException("Set has been removed from cache: " + this);
     }
 
     /**

diff --git a/...src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java b/...src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.*;
@@ -512,7 +511,7 @@ public void blockOnRemove() {
      */
     private void enterBusy() {
         if (!busyLock.enterBusy())
-            throw new DataStructureRemovedException("Set has been removed from cache: " + delegate);
+            throw new IllegalStateException("Set has been removed from cache: " + delegate);
     }
 
     /**

diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
@@ -73,7 +73,7 @@ public IgniteBiTuple<V2, V1> swap() {
      *
      * @return First value.
      */
-    @Nullable public V1 get1() {
+    public V1 get1() {
         return val1;
     }
 
@@ -82,7 +82,7 @@ public IgniteBiTuple<V2, V1> swap() {
      *
      * @return Second value.
      */
-    @Nullable public V2 get2() {
+    public V2 get2() {
         return val2;
     }
 

diff --git a/...internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/...internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.datastructures.*;
 
 import java.util.*;
 
@@ -64,7 +63,7 @@ public void testPrepareAtomicReference() throws Exception {
 
             fail();
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e.getMessage());
         }
     }

diff --git a/...e/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/...e/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.datastructures.*;
 
 import java.util.*;
 
@@ -64,7 +63,7 @@ public void testPrepareAtomicStamped() throws Exception {
 
             fail();
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e.getMessage());
         }
     }

diff --git a/...internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/...internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -177,7 +176,7 @@ public void testTakeRemoveRotativeNodes() throws Exception {
 
                 return null;
             }
-        }, DataStructureRemovedException.class, null);
+        }, IllegalStateException.class, null);
 
         info("Queue was removed: " + queue);
 

diff --git a/...ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/...ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.datastructures.*;
@@ -342,7 +341,7 @@ public void testRemove() throws Exception {
 
             fail("Exception expected.");
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e);
         }
     }

diff --git a/.../apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/.../apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -21,11 +21,10 @@
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
@@ -770,7 +769,7 @@ private void testCleanup(boolean collocated) throws Exception {
                                 set.add(val.incrementAndGet());
                         }
                     }
-                    catch (DataStructureRemovedException e) {
+                    catch (IllegalStateException e) {
                         log.info("Set removed: " + e);
                     }
 
@@ -814,7 +813,7 @@ private void testCleanup(boolean collocated) throws Exception {
 
                     return null;
                 }
-            }, DataStructureRemovedException.class, null);
+            }, IllegalStateException.class, null);
         }
     }
 

diff --git a/.../ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java b/.../ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.transactions.*;
 
 import java.util.*;
@@ -91,7 +90,7 @@ public void testCreateRemove() throws Exception {
 
             fail();
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e.getMessage());
         }
     }