Pull Request - Desenvolvedor Pleno

jogo-oito/pom.xml

@@ -1,55 +1,70 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.bempaggo.jogo</groupId>
-	<artifactId>jogo-do-oito-do-estagiario-gpt</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<build>
-		<finalName>rest-unity-test</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
-				<configuration>
-					<source>18</source>
-					<target>18</target>
-				</configuration>
-			</plugin>
-		 <plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-surefire-plugin</artifactId>
-		  <version>2.22.0</version>
-		 </plugin>
-		</plugins>
-	</build>
-        <dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.bempaggo.jogo</groupId>
+    <artifactId>jogo-do-oito-do-estagiario-gpt</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit-jupiter-api.version>5.9.2</junit-jupiter-api.version>
+        <junit.version>4.13.2</junit.version>
+        <assertj-core.version>3.24.2</assertj-core.version>
+        <jtattoo.version>1.6.13</jtattoo.version>
+    </properties>
+    <build>
+        <finalName>rest-unity-test</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>18</source>
+                    <target>18</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.6.0</version>
+            <version>${junit-jupiter-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.6.0</version>
+            <version>${junit-jupiter-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.0</version>
+            <version>${junit-jupiter-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jtattoo</groupId>
+            <artifactId>JTattoo</artifactId>
+            <version>${jtattoo.version}</version>
+        </dependency>
     </dependencies>
 </project>

jogo-oito/src/main/java/Application.java

@@ -0,0 +1,22 @@
+import builder.JogoDosOitoBuilder;
+import view.JogoDosOito;
+
+import javax.swing.*;
+
+public class Application {
+
+    public static void main(String[] args) {
+        new JogoDosOitoBuilder()
+                .createButtons()
+                .configureMenu()
+                .configureInterface()
+                .build();
+        try {
+            UIManager.setLookAndFeel("com.jtattoo.plaf.aluminium.AluminiumLookAndFeel");
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | javax.swing.UnsupportedLookAndFeelException ex) {
+            java.util.logging.Logger.getLogger(JogoDosOito.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+        }
+        java.awt.EventQueue.invokeLater(() -> new JogoDosOito().setVisible(true));
+    }
+
+}

jogo-oito/src/main/java/builder/JogoDosOitoBuilder.java

@@ -0,0 +1,31 @@
+package builder;
+
+import view.JogoDosOito;
+
+public class JogoDosOitoBuilder {
+
+    private JogoDosOito jogoDosOito;
+
+    public JogoDosOitoBuilder() {
+        this.jogoDosOito = new JogoDosOito();
+    }
+
+    public JogoDosOitoBuilder createButtons() {
+        this.jogoDosOito.createButtons();
+        return this;
+    }
+
+    public JogoDosOitoBuilder configureMenu() {
+        this.jogoDosOito.configureMenu();
+        return this;
+    }
+
+    public JogoDosOitoBuilder configureInterface() {
+        this.jogoDosOito.configureInterface();
+        return this;
+    }
+
+    public JogoDosOito build() {
+        return this.jogoDosOito;
+    }
+}

jogo-oito/src/main/java/command/Command.java

@@ -0,0 +1,7 @@
+package command;
+
+public interface Command {
+
+    void execute();
+
+}

jogo-oito/src/main/java/model/Keyboard.java → jogo-oito/src/main/java/enums/Keyboard.java

@@ -2,13 +2,9 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package model;
+package enums;
 
 import java.awt.event.KeyEvent;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 public enum Keyboard {
 
@@ -19,20 +15,8 @@ public enum Keyboard {
 
     private final Integer value;
 
-    private static final Map<Integer, Keyboard> map = Arrays.stream(Keyboard.values())
-        .collect(Collectors.toMap(Keyboard::getValue, Function.identity()));
-
-
     Keyboard(Integer value) {
         this.value = value;
     }
 
-    public Integer getValue() {
-        return value;
-    }
-
-    public static Keyboard fromValue(Integer value) {
-        return map.get(value);
-    }
-
 }

jogo-oito/src/main/java/facade/Controller.java

@@ -1,16 +1,25 @@
 package facade;
 
+import command.Command;
 import interfaces.Graph;
+import interfaces.Status;
 import interfaces.Vertex;
-import java.util.List;
 import util.Board;
+import util.Click;
+import util.GameStatus;
+
+import java.util.List;
 
 public class Controller {
 
     private final Graph board;
+    private final Status gameStatus;
+    private final Command click;
 
     public Controller() {
         this.board = new Board();
+        this.gameStatus = GameStatus.of(this.board);
+        this.click = Click.of(this.board);
     }
 
     public void feedback() {
@@ -25,17 +34,13 @@ public List<Vertex> getCells() {
         return this.board.getCells();
     }
 
-    public void swap(Integer keyCode) {
-        this.board.swap(keyCode);
-    }
-
     public Boolean checkGameOver() {
-        return this.board.checkGameOver();
-
+        return this.gameStatus.isOver();
     }
 
-    public void click(Integer cellValue) {
-        this.board.click(cellValue);
+    public void click(Integer currentCellValue) {
+        this.board.setCurrentCellValue(currentCellValue);
+        this.click.execute();
     }
 
 }

jogo-oito/src/main/java/interfaces/Action.java

@@ -0,0 +1,7 @@
+package interfaces;
+
+public interface Action {
+
+    Vertex swapCells(Integer currentCellValue);
+
+}

jogo-oito/src/main/java/interfaces/Edge.java

@@ -4,7 +4,7 @@
  */
 package interfaces;
 
-import model.Keyboard;
+import enums.Keyboard;
 
 /**
  *
@@ -15,5 +15,6 @@ public interface Edge {
     Keyboard getKey();
 
     Vertex getCell();
-
+
+    Boolean cellValueIsEqual(Integer value);
 }

jogo-oito/src/main/java/interfaces/Graph.java

@@ -16,13 +16,14 @@ public interface Graph {
 
     void setting();
 
-    void swap(Integer keyCode);
-
     List<Vertex> getCells();
 
     Vertex getEmptyCell();
 
-    void click(Integer cellValue);
+    void setEmptyCell(Vertex cell);
+
+    void setCurrentCellValue(Integer cellValue);
+
+    Integer getCurrentCellValue();
 
-    Boolean checkGameOver();
 }

jogo-oito/src/main/java/interfaces/Status.java

@@ -0,0 +1,6 @@
+package interfaces;
+
+public interface Status {
+
+    Boolean isOver();
+}

jogo-oito/src/main/java/interfaces/Vertex.java

@@ -4,8 +4,9 @@
  */
 package interfaces;
 
+import enums.Keyboard;
+
 import java.util.List;
-import model.Keyboard;
 
 /**
  *
@@ -17,20 +18,16 @@ public interface Vertex {
 
     Integer getValue();
 
-    void creatingHorizontalAdjacent(Vertex cell);
+    void createHorizontalAdjacent(Vertex cell);
 
-    void creatingVerticalAdjacent(Vertex cell);
+    void createVerticalAdjacent(Vertex cell);
 
     String valueToText();
 
     Edge getAdjacentByKeyCode(Keyboard key);
 
-    Vertex click(Keyboard key);
-
     List<Edge> getAdjacents();
 
     void addAdjacents(Edge edge);
-
-    Vertex swapCells(Integer value);
 
 }

jogo-oito/src/main/java/model/Adjacent.java

@@ -4,8 +4,10 @@
  */
 package model;
 
+import enums.Keyboard;
 import interfaces.Edge;
 import interfaces.Vertex;
+
 import java.util.Objects;
 
 /**
@@ -17,11 +19,15 @@ public class Adjacent implements Edge{
     private final Keyboard key;
     private final Vertex cell;
 
-    public Adjacent(Keyboard key, Vertex cell) {
+    private Adjacent(Keyboard key, Vertex cell) {
         this.key = key;
         this.cell = cell;
     }
 
+    public static Adjacent of(Keyboard key, Vertex cell) {
+        return new Adjacent(key, cell);
+    }
+
     @Override
     public Keyboard getKey() {
         return this.key;
@@ -32,9 +38,19 @@ public Vertex getCell() {
         return this.cell;
     }
 
+    @Override
+    public Boolean cellValueIsEqual(Integer value) {
+        return this.getCell().getValue().equals(value);
+    }
+
     @Override
     public boolean equals(Object obj) {
         return Objects.equals(((Adjacent) obj).getKey(), this.getKey());
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(key);
+    }
+
 }