Exclude unnecessary restrictions

vaadin · Sep 29, 2020 · ec18d31 · ec18d31
1 parent 4627d82
commit ec18d31
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 44 deletions.
diff --git a/flow-data/src/main/java/com/vaadin/flow/data/provider/DataCommunicator.java b/flow-data/src/main/java/com/vaadin/flow/data/provider/DataCommunicator.java
@@ -387,8 +387,6 @@ public boolean isItemActive(T item) {
      * @throws IndexOutOfBoundsException
      *             requested index is outside of the filtered and sorted data
      *             set
-     * @throws IllegalStateException
-     *             if the calls to data provider are disabled.
      */
     @SuppressWarnings("unchecked")
     public T getItem(int index) {
@@ -420,14 +418,6 @@ public T getItem(int index) {
                 }
             }
 
-            if (fetchDisabled) {
-                throw new IllegalStateException(
-                        "Data Communicator cannot fetch the item from Data "
-                                + "Provider when the fetch is disabled. Please "
-                                + "enable it by calling "
-                                + "'dataCommunicator.setFetchDisabled(false)'");
-            }
-
             /*
              * In case of undefined size we don't check the empty data or the
              * item count, because item count = 0 may mean the flush (fetch)
@@ -559,8 +549,8 @@ public void setItemCountEstimateIncrease(int itemCountEstimateIncrease) {
                     "itemCountEstimateIncrease cannot be less than 1");
         }
         this.itemCountEstimateIncrease = itemCountEstimateIncrease;
-        this.countCallback = null;
-        this.definedSize = false;
+        countCallback = null;
+        definedSize = false;
     }
 
     /**
@@ -594,8 +584,8 @@ public int getItemCountEstimateIncrease() {
     public void setDefinedSize(boolean definedSize) {
         if (this.definedSize != definedSize) {
             this.definedSize = definedSize;
-            this.countCallback = null;
-            this.skipCountIncreaseUntilReset = false;
+            countCallback = null;
+            skipCountIncreaseUntilReset = false;
             if (definedSize) {
                 // Always fetch explicit count from data provider
                 requestFlush();
@@ -747,21 +737,10 @@ public void setFetchDisabled(boolean fetchDisabled) {
      * overridden by a subclass that uses a specific type of DataProvider and/or
      * query.
      *
-     * @throws IllegalStateException
-     *             if the calls to data provider are disabled.
-     *
      * @return the size of data provider with current filter
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     protected int getDataProviderSize() {
-        if (fetchDisabled) {
-            throw new IllegalStateException(
-                    "Data Communicator cannot get the items count from Data "
-                            + "Provider when the fetch is disabled. Please "
-                            + "enable it by calling "
-                            + "'dataCommunicator.setFetchDisabled(false)'");
-        }
-
         assert definedSize : "This method should never be called when using undefined size";
         if (countCallback != null) {
             return countCallback.count(new Query(getFilter()));

diff --git a/flow-data/src/test/java/com/vaadin/flow/data/provider/DataCommunicatorTest.java b/flow-data/src/test/java/com/vaadin/flow/data/provider/DataCommunicatorTest.java
@@ -1278,30 +1278,22 @@ public void fetchFromProvider_backendRunsOutOfItems_secondPageRequestSkipped() {
     }
 
     @Test
-    public void fetchDisabled_getItemCount_throws() {
-        expectedException.expect(IllegalStateException.class);
-        expectedException.expectMessage(
-                "Data Communicator cannot get the items count from Data "
-                        + "Provider when the fetch is disabled. Please "
-                        + "enable it by calling "
-                        + "'dataCommunicator.setFetchDisabled(false)'");
-
+    public void fetchDisabled_getItemCount_stillReturnsItemsCount() {
         dataCommunicator.setFetchDisabled(true);
-        dataCommunicator.getItemCount();
+        Assert.assertEquals(0, dataCommunicator.getItemCount());
+
+        // data provider stores 100 items
+        dataCommunicator.setDataProvider(createDataProvider(), null);
+        Assert.assertEquals(100, dataCommunicator.getItemCount());
     }
 
     @Test
-    public void fetchDisabled_getItem_throws() {
-        expectedException.expect(IllegalStateException.class);
-        expectedException.expectMessage(
-                "Data Communicator cannot fetch the item from Data "
-                        + "Provider when the fetch is disabled. Please "
-                        + "enable it by calling "
-                        + "'dataCommunicator.setFetchDisabled(false)'");
-
+    public void fetchDisabled_getItem_stillReturnsItem() {
         dataCommunicator.setFetchDisabled(true);
-        dataCommunicator.setItemCountEstimate(42);
-        dataCommunicator.getItem(10);
+
+        // data provider stores 100 items
+        dataCommunicator.setDataProvider(createDataProvider(), null);
+        Assert.assertNotNull(dataCommunicator.getItem(42));
     }
 
     @Test