refactor

app/pom.xml

@@ -6,7 +6,7 @@
 	<version>1.0-SNAPSHOT</version>
 
 	<properties>
-		<main-class>org.toop.Main</main-class>
+		<main-class>org.toop.app.Main</main-class>
 	</properties>
 
 	<build>

app/src/main/java/org/toop/app/gui/LocalGameSelector.java

@@ -4,8 +4,8 @@ import java.awt.*;
 import javax.swing.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.app.tictactoe.LocalTicTacToe;
+import org.toop.tictactoe.LocalTicTacToe;
-import org.toop.app.tictactoe.gui.UIGameBoard;
+import org.toop.tictactoe.gui.UIGameBoard;
 
 public class LocalGameSelector extends JFrame {
     private static final Logger logger = LogManager.getLogger(LocalGameSelector.class);

app/src/main/java/org/toop/app/gui/RemoteGameSelector.java

@@ -10,9 +10,9 @@ import org.apache.logging.log4j.Logger;
 import org.toop.framework.eventbus.events.Events;
 import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.eventbus.events.NetworkEvents;
-import org.toop.app.tictactoe.LocalTicTacToe;
+import org.toop.tictactoe.LocalTicTacToe;
 import org.toop.framework.networking.NetworkingGameClientHandler;
-import org.toop.app.tictactoe.gui.UIGameBoard;
+import org.toop.tictactoe.gui.UIGameBoard;
 
 public class RemoteGameSelector {
     private static final Logger logger = LogManager.getLogger(RemoteGameSelector.class);

app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java

@@ -1,17 +1,16 @@
-package org.toop.app.tictactoe;
+package org.toop.tictactoe;
 
 import java.util.concurrent.*;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.eventbus.EventPublisher;
+import org.toop.framework.eventbus.EventPublisher;
 import org.toop.framework.eventbus.events.Events;
 import org.toop.framework.eventbus.events.NetworkEvents;
-import org.toop.app.tictactoe.gui.UIGameBoard;
+import org.toop.tictactoe.gui.UIGameBoard;
 import org.toop.framework.networking.NetworkingGameClientHandler;
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
 import org.toop.game.tictactoe.ai.MinMaxTicTacToe;
-import org.toop.games.tictactoe.TicTacToe;
 
 import java.util.function.Supplier;
 

app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.toop.app.tictactoe.gui.UIGameBoard">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.toop.tictactoe.gui.UIGameBoard">
   <grid id="27dc6" binding="tttPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>

app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java

@@ -1,4 +1,4 @@
-package org.toop.app.tictactoe.gui;
+package org.toop.tictactoe.gui;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -7,8 +7,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.toop.app.gui.LocalGameSelector;
 import org.toop.app.gui.RemoteGameSelector;
-import org.toop.app.tictactoe.LocalTicTacToe;
+import org.toop.tictactoe.LocalTicTacToe;
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
 
 public class UIGameBoard {
     private static final int TICTACTOE_SIZE = 3;

framework/src/main/java/org/toop/framework/eventbus/events/Events.java

@@ -16,7 +16,7 @@ public class Events implements IEvent {
      * @throws Exception
      */
     public static Object get(String eventName, Object... args) throws Exception {
-        Class<?> clazz = Class.forName("org.toop.eventbus.events.Events$ServerEvents$" + eventName);
+        Class<?> clazz = Class.forName("org.toop.framework.eventbus.events.Events$ServerEvents$" + eventName);
         Class<?>[] paramTypes = Arrays.stream(args).map(Object::getClass).toArray(Class<?>[]::new);
         Constructor<?> constructor = clazz.getConstructor(paramTypes);
         return constructor.newInstance(args);
@@ -34,7 +34,7 @@ public class Events implements IEvent {
     public static Object get(String eventCategory, String eventName, Object... args)
             throws Exception {
         Class<?> clazz =
-                Class.forName("org.toop.eventbus.events.Events$" + eventCategory + "$" + eventName);
+                Class.forName("org.toop.framework.eventbus.events.Events$" + eventCategory + "$" + eventName);
         Class<?>[] paramTypes = Arrays.stream(args).map(Object::getClass).toArray(Class<?>[]::new);
         Constructor<?> constructor = clazz.getConstructor(paramTypes);
         return constructor.newInstance(args);

framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java

@@ -50,7 +50,7 @@ public class NetworkEvents extends Events {
      * @param ip             The IP address of the server to connect to.
      * @param port           The port number of the server to connect to.
      * @param eventId        A unique identifier for this event, typically injected
-     *                       automatically by the {@link org.toop.eventbus.EventPublisher}.
+     *                       automatically by the {@link org.toop.framework.eventbus.EventPublisher}.
      */
     public record StartClient(
             Supplier<? extends NetworkingGameClientHandler> handlerFactory,

framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java

@@ -6,7 +6,7 @@ import java.util.function.Supplier;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.eventbus.EventPublisher;
+import org.toop.framework.eventbus.EventPublisher;
 import org.toop.framework.eventbus.events.NetworkEvents;
 
 public class NetworkingClientManager {

framework/src/test/eventbus/EventPublisherSpeedTest.java

@@ -1,7 +1,6 @@
-package org.toop.eventbus;
+package org.toop.framework.eventbus;
 
 import org.junit.jupiter.api.Test;
-import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.eventbus.events.EventWithUuid;
 
 import java.util.concurrent.atomic.AtomicInteger;

framework/src/test/eventbus/EventPublisherStressTest.java

@@ -1,4 +1,4 @@
-package org.toop.eventbus;
+package org.toop.framework.eventbus;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;

framework/src/test/eventbus/EventPublisherTest.java

@@ -1,4 +1,4 @@
-package org.toop.eventbus;
+package org.toop.framework.eventbus;
 
 import org.junit.jupiter.api.Test;
 import org.toop.framework.eventbus.events.EventWithUuid;

framework/src/test/eventbus/GlobalEventBusTest.java

@@ -1,9 +1,9 @@
-//package org.toop.eventbus;
+//package org.toop.framework.eventbus;
 //
 //import net.engio.mbassy.bus.publication.SyncAsyncPostCommand;
 //import org.junit.jupiter.api.AfterEach;
 //import org.junit.jupiter.api.Test;
-//import org.toop.eventbus.events.IEvent;
+//import org.toop.framework.eventbus.events.IEvent;
 //
 //import java.util.concurrent.atomic.AtomicBoolean;
 //import java.util.concurrent.atomic.AtomicReference;

game/src/main/java/org/toop/game/GameBase.java

@@ -1,4 +1,4 @@
-package org.toop.games;
+package org.toop.game;
 
 // Todo: refactor
 public abstract class GameBase {

game/src/main/java/org/toop/game/Player.java

@@ -1,4 +1,4 @@
-package org.toop.games;
+package org.toop.game;
 
 // Todo: refactor
 public class Player {

game/src/main/java/org/toop/tictactoe/TicTacToe.java

@@ -1,11 +1,11 @@
-package org.toop.games.tictactoe;
+package org.toop.tictactoe;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
-import org.toop.games.Player;
+import org.toop.game.Player;
 import org.toop.backend.tictactoe.ParsedCommand;
 import org.toop.backend.tictactoe.TicTacToeServerCommand;
 

game/src/main/java/org/toop/tictactoe/TicTacToeAI.java

@@ -1,6 +1,6 @@
-package org.toop.games.tictactoe;
+package org.toop.tictactoe;
 
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
 
 // Todo: refactor
 public class TicTacToeAI {

game/src/test/tictactoe/GameBaseTest.java

@@ -2,8 +2,8 @@ package org.toop.game.tictactoe;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
-import org.toop.games.Player;
+import org.toop.game.Player;
 
 class GameBaseTest {
 

game/src/test/tictactoe/PlayerTest.java

@@ -2,7 +2,7 @@ package org.toop.game.tictactoe;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.games.Player;
+import org.toop.game.Player;
 
 class PlayerTest {
 

game/src/test/tictactoe/ai/MinMaxTicTacToeTest.java

@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.*;
 import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
-import org.toop.games.tictactoe.TicTacToe;
+import org.toop.tictactoe.TicTacToe;
 
 /** Unit tests for MinMaxTicTacToe AI. */
 public class MinMaxTicTacToeTest {

pom.xml

@@ -98,7 +98,7 @@
 
 	<modules>
 		<module>framework</module>
-		<module>games</module>
+		<module>game</module>
 		<module>app</module>
 	</modules>
 </project>