refactor: rename api to minimize the need for refactoring

Author: ugur-vaadin

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/main/java/com/vaadin/flow/component/spreadsheet/tests/fixtures/PopupButtonFixture.java

@@ -30,7 +30,7 @@ public class PopupButtonFixture implements SpreadsheetFixture {
     @Override
     public void loadFixture(final Spreadsheet spreadsheet) {
         spreadsheet.addSelectionChangeListener(event -> {
-            if (event.getAllSelectedCells().getCellCount() != 1) {
+            if (event.getAllSelectedCells().size() != 1) {
                 return;
             }
             List<String> values = new ArrayList<>(VALUES);

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/CellSet.java

@@ -54,7 +54,7 @@ public Set<CellReference> getCells() {
      *
      * @return number of cells
      */
-    public int getCellCount() {
+    public int size() {
         return cells.size();
     }
 
@@ -68,7 +68,7 @@ public int getCellCount() {
      * @return {@code true} if set contains the specified cell, {@code false}
      *         otherwise
      */
-    public boolean containsCell(CellReference cellReference) {
+    public boolean contains(CellReference cellReference) {
         if (cells.isEmpty()) {
             return false;
         }
@@ -94,8 +94,8 @@ public boolean containsCell(CellReference cellReference) {
      * @return {@code true} if set contains the specified cell, {@code false}
      *         otherwise
      */
-    public boolean containsCell(int row, int col) {
-        return containsCell(new CellReference(row, col));
+    public boolean contains(int row, int col) {
+        return contains(new CellReference(row, col));
     }
 
     /**
@@ -110,9 +110,8 @@ public boolean containsCell(int row, int col) {
      * @return {@code true} if set contains the specified cell, {@code false}
      *         otherwise
      */
-    public boolean containsCell(int row, int col, String sheetName) {
+    public boolean contains(int row, int col, String sheetName) {
         Objects.requireNonNull(sheetName, "The sheet name cannot be null");
-        return containsCell(
-                new CellReference(sheetName, row, col, false, false));
+        return contains(new CellReference(sheetName, row, col, false, false));
     }
 }

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/test/java/com/vaadin/flow/component/spreadsheet/tests/CellValueChangeEventOnFormulaChangeTest.java

@@ -62,25 +62,23 @@ public void formulaChangeResultingInSameValue() {
         spreadsheet.getCellValueManager().onCellValueChange(3, 1, "=A1+2*B1");
 
         assertEquals("There should be one changed cell", 1,
-                changedCells.get().getCellCount());
+                changedCells.get().size());
         assertTrue("The changed cells should include C1 with sheet name",
-                changedCells.get()
-                        .containsCell(new CellReference("Sheet0!C1")));
+                changedCells.get().contains(new CellReference("Sheet0!C1")));
         assertFalse(
                 "The changed cells should not include C1 with a wrong sheet name",
-                changedCells.get()
-                        .containsCell(new CellReference("Sheet1!C1")));
+                changedCells.get().contains(new CellReference("Sheet1!C1")));
         assertTrue("The changed cells should include C1 without sheet name",
-                changedCells.get().containsCell(new CellReference("C1")));
+                changedCells.get().contains(new CellReference("C1")));
         assertTrue(
                 "The changed cells should include a cell with correct indexes without a sheet name",
-                changedCells.get().containsCell(0, 2));
+                changedCells.get().contains(0, 2));
         assertTrue(
                 "The changed cells should include a cell with correct indexes and sheet name",
-                changedCells.get().containsCell(0, 2, "Sheet0"));
+                changedCells.get().contains(0, 2, "Sheet0"));
         assertFalse(
                 "The changed cells should not include a cell with correct indexes and a wrong sheet name",
-                changedCells.get().containsCell(0, 2, "Sheet1"));
+                changedCells.get().contains(0, 2, "Sheet1"));
 
     }
 

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/test/java/com/vaadin/flow/component/spreadsheet/tests/FormulasTest.java

@@ -83,7 +83,7 @@ public void formulaValueChangeListener_invokedOnFormulaValueChange() {
         spreadsheet.refreshCells(A1, A2);
 
         // Check that the event was fired with the correct values
-        Assert.assertEquals(event.get().getChangedCells().getCellCount(), 1);
+        Assert.assertEquals(event.get().getChangedCells().size(), 1);
         Assert.assertEquals(event.get().getChangedCells().getCells().iterator()
                 .next().formatAsString(), "Sheet1!A1");
         // Sanity check for the forumula cell effective value