refactor CandyGame.java

Author: SalmaAzeem

serialized-lob/src/main/java/com/iluwatar/slob/lob/Forest.java

@@ -37,16 +37,17 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-
 /**
  * Creates an object Forest which contains animals and plants as its constituents. Animals may eat
  * plants or other animals in the forest.
  */
+
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public class Forest implements Serializable {
-
+  public static final String HORIZONTAL_DIVIDER = "\n--------------------------\n";
   private String name;
   private Set<Animal> animals = new HashSet<>();
   private Set<Plant> plants = new HashSet<>();
@@ -105,16 +106,16 @@ public String toString() {
     sb.append("Forest Name = ").append(name).append("\n");
     sb.append("Animals found in the ").append(name).append(" Forest: \n");
     for (Animal animal : animals) {
-      sb.append("\n--------------------------\n");
+      sb.append(HORIZONTAL_DIVIDER);
       sb.append(animal.toString());
-      sb.append("\n--------------------------\n");
+      sb.append(HORIZONTAL_DIVIDER);
     }
     sb.append("\n");
     sb.append("Plants in the ").append(name).append(" Forest: \n");
     for (Plant plant : plants) {
-      sb.append("\n--------------------------\n");
+      sb.append(HORIZONTAL_DIVIDER);
       sb.append(plant.toString());
-      sb.append("\n--------------------------\n");
+      sb.append(HORIZONTAL_DIVIDER);
     }
     return sb.toString();
   }

type-object/src/main/java/com/iluwatar/typeobject/CandyGame.java

@@ -27,6 +27,8 @@
 import com.iluwatar.typeobject.Candy.Type;
 import java.util.ArrayList;
 import java.util.List;
+import org.slf4j.LoggerFactory;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -37,7 +39,6 @@
 @Slf4j
 @SuppressWarnings("java:S3776") //"Cognitive Complexity of methods should not be too high"
 public class CandyGame {
-
   Cell[][] cells;
   CellPool pool;
   int totalPoints;
@@ -86,19 +87,28 @@ List<Cell> adjacentCells(int y, int x) {
       adjacent.add(this.cells[y][1]);
     }
     if (y == cells.length - 1) {
-      adjacent.add(this.cells[cells.length - 2][x]);
+      if (cells.length > 1) {
+          adjacent.add(this.cells[cells.length - 2][x]);
+      } else {
+          LOGGER.info("Warning: Attempted to access a row in an array with insufficient rows.");
+      }
     }
     if (x == cells.length - 1) {
-      adjacent.add(this.cells[y][cells.length - 2]);
+      if (cells.length > 1) {
+          adjacent.add(this.cells[y][cells.length - 2]);
+      } else {
+          LOGGER.info("Warning: Attempted to access an out-of-bounds index.");
+      }
     }
+  
     if (y > 0 && y < cells.length - 1) {
       adjacent.add(this.cells[y - 1][x]);
       adjacent.add(this.cells[y + 1][x]);
     }
-    if (x > 0 && x < cells.length - 1) {
+    if (y >= 0 && y < cells.length && x > 0 && x < cells[y].length - 1) {
       adjacent.add(this.cells[y][x - 1]);
       adjacent.add(this.cells[y][x + 1]);
-    }
+  }  
     return adjacent;
   }