Rebranding

README.md

@@ -6,8 +6,8 @@ A word guessing game based on the [game show](https://en.wikipedia.org/wiki/Ling
 
 #### Browser client
 
-- Practice: https://lingo.charego.com/practice.html
+- Practice: https://lingo.gould.dev/practice.html
-- Competitive: https://lingo.charego.com
+- Competitive: https://lingo.gould.dev
 
 #### JavaFX client
 

api/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.charego</groupId>
+		<groupId>dev.gould</groupId>
 		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>

api/src/main/java/dev/gould/lingo/api/Destinations.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.api;
+package dev.gould.lingo.api;
 
 public class Destinations {
 

api/src/main/java/module-info.java

@@ -1,3 +1,3 @@
-module com.charego.lingo.api {
+module dev.gould.lingo.api {
-    exports com.charego.lingo.api;
+    exports dev.gould.lingo.api;
 }

client/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.charego</groupId>
+		<groupId>dev.gould</groupId>
 		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>
@@ -13,7 +13,7 @@
 
 	<properties>
 		<javafx.version>15.0.1</javafx.version>
-		<lingo.url>https://lingo.charego.com</lingo.url>
+		<lingo.url>https://lingo.gould.dev</lingo.url>
 	</properties>
 
 	<dependencies>
@@ -54,7 +54,7 @@
 				<artifactId>javafx-maven-plugin</artifactId>
 				<version>0.0.5</version>
 				<configuration>
-					<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
+					<mainClass>dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
 					<options>
 						<option>-Dlingo.url=${lingo.url}</option>
 					</options>
@@ -65,7 +65,7 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>3.0.0</version>
 				<configuration>
-					<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
+					<mainClass>dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
 					<addResourcesToClasspath>true</addResourcesToClasspath>
 				</configuration>
 			</plugin>

client/src/main/java/dev/gould/lingo/client/bootstrap/LingoClient.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.bootstrap;
+package dev.gould.lingo.client.bootstrap;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

client/src/main/java/dev/gould/lingo/client/bootstrap/LingoPresenter.java

@@ -1,12 +1,12 @@
-package com.charego.lingo.client.bootstrap;
+package dev.gould.lingo.client.bootstrap;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
-import com.charego.lingo.client.multiplayer.MultiplayerConfig;
+import dev.gould.lingo.client.multiplayer.MultiplayerConfig;
-import com.charego.lingo.client.multiplayer.MultiplayerPresenter;
+import dev.gould.lingo.client.multiplayer.MultiplayerPresenter;
-import com.charego.lingo.client.singleplayer.SinglePlayerPresenter;
+import dev.gould.lingo.client.singleplayer.SinglePlayerPresenter;
-import com.charego.lingo.client.util.FxmlController;
+import dev.gould.lingo.client.util.FxmlController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

client/src/main/java/dev/gould/lingo/client/bootstrap/WordRepository.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.bootstrap;
+package dev.gould.lingo.client.bootstrap;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -10,7 +10,7 @@ import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
-import com.charego.lingo.common.WordReader;
+import dev.gould.lingo.common.WordReader;
 
 import javax.annotation.PostConstruct;
 

client/src/main/java/dev/gould/lingo/client/multiplayer/MultiplayerConfig.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.multiplayer;
+package dev.gould.lingo.client.multiplayer;
 
 import java.util.ArrayList;
 import java.util.List;

client/src/main/java/dev/gould/lingo/client/multiplayer/MultiplayerPresenter.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.multiplayer;
+package dev.gould.lingo.client.multiplayer;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
@@ -8,7 +8,7 @@ import java.util.function.Consumer;
 
 import javax.annotation.PostConstruct;
 
-import com.charego.lingo.common.LobbyData;
+import dev.gould.lingo.common.LobbyData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,14 +34,14 @@ import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
 import javafx.scene.web.WebView;
-import com.charego.lingo.api.Destinations;
+import dev.gould.lingo.api.Destinations;
-import com.charego.lingo.client.util.FxmlController;
+import dev.gould.lingo.client.util.FxmlController;
-import com.charego.lingo.client.view.Board;
+import dev.gould.lingo.client.view.Board;
-import com.charego.lingo.client.view.OpponentBoard;
+import dev.gould.lingo.client.view.OpponentBoard;
-import com.charego.lingo.client.view.PlayerBoard;
+import dev.gould.lingo.client.view.PlayerBoard;
-import com.charego.lingo.common.Game;
+import dev.gould.lingo.common.Game;
-import com.charego.lingo.common.GameLeftMessage;
+import dev.gould.lingo.common.GameLeftMessage;
-import com.charego.lingo.common.Report;
+import dev.gould.lingo.common.Report;
 
 @Component
 public class MultiplayerPresenter implements FxmlController {

client/src/main/java/dev/gould/lingo/client/multiplayer/StompTemplate.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.multiplayer;
+package dev.gould.lingo.client.multiplayer;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

client/src/main/java/dev/gould/lingo/client/singleplayer/SinglePlayerPresenter.java

@@ -1,8 +1,8 @@
-package com.charego.lingo.client.singleplayer;
+package dev.gould.lingo.client.singleplayer;
 
 import java.util.Arrays;
 
-import com.charego.lingo.client.bootstrap.WordRepository;
+import dev.gould.lingo.client.bootstrap.WordRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,10 +21,10 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
-import com.charego.lingo.client.view.PlayerBoard;
+import dev.gould.lingo.client.view.PlayerBoard;
-import com.charego.lingo.common.Game;
+import dev.gould.lingo.common.Game;
-import com.charego.lingo.common.Player;
+import dev.gould.lingo.common.Player;
-import com.charego.lingo.common.Report;
+import dev.gould.lingo.common.Report;
 
 public class SinglePlayerPresenter {
 

client/src/main/java/dev/gould/lingo/client/util/FxmlController.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.util;
+package dev.gould.lingo.client.util;
 
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;

client/src/main/java/dev/gould/lingo/client/view/Board.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.view;
+package dev.gould.lingo.client.view;
 
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;

client/src/main/java/dev/gould/lingo/client/view/GameBoard.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.view;
+package dev.gould.lingo.client.view;
 
 import java.util.ArrayList;
 import java.util.List;

client/src/main/java/dev/gould/lingo/client/view/OpponentBoard.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.view;
+package dev.gould.lingo.client.view;
 
 import javafx.scene.canvas.Canvas;
 

client/src/main/java/dev/gould/lingo/client/view/PlayerBoard.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.client.view;
+package dev.gould.lingo.client.view;
 
 import java.util.ArrayList;
 import java.util.HashMap;

client/src/main/java/module-info.java

@@ -1,6 +1,6 @@
-module com.charego.lingo.client {
+module dev.gould.lingo.client {
-    requires com.charego.lingo.common;
+    requires dev.gould.lingo.common;
-    requires com.charego.lingo.api;
+    requires dev.gould.lingo.api;
     requires java.annotation;
     requires javafx.controls;
     requires javafx.fxml;
@@ -15,8 +15,8 @@ module com.charego.lingo.client {
     requires spring.messaging;
     requires spring.web;
     requires spring.websocket;
-    exports com.charego.lingo.client.bootstrap;
+    exports dev.gould.lingo.client.bootstrap;
-    exports com.charego.lingo.client.multiplayer;
+    exports dev.gould.lingo.client.multiplayer;
-    opens com.charego.lingo.client.bootstrap to javafx.fxml, spring.core;
+    opens dev.gould.lingo.client.bootstrap to javafx.fxml, spring.core;
-    opens com.charego.lingo.client.multiplayer to javafx.fxml, spring.core;
+    opens dev.gould.lingo.client.multiplayer to javafx.fxml, spring.core;
 }

client/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 # https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-application-properties.html
-logging.level.com.charego.lingo = DEBUG
+logging.level.dev.gould.lingo = DEBUG

client/src/main/resources/fxml/Lingo.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 
 <BorderPane xmlns:fx="http://javafx.com/fxml"
-	fx:controller="com.charego.lingo.client.bootstrap.LingoPresenter"
+	fx:controller="dev.gould.lingo.client.bootstrap.LingoPresenter"
 	fx:id="content"
 	prefWidth="650"
 	prefHeight="420">

client/src/main/resources/fxml/LingoMultiplayer.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.web.WebView?>
 
 <StackPane xmlns:fx="http://javafx.com/fxml"
-	fx:controller="com.charego.lingo.client.multiplayer.MultiplayerPresenter"
+	fx:controller="dev.gould.lingo.client.multiplayer.MultiplayerPresenter"
 	fx:id="contentPane">
 
 	<children>

common/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.charego</groupId>
+		<groupId>dev.gould</groupId>
 		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>

common/src/main/java/dev/gould/lingo/common/ChatMessage.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 public class ChatMessage {
 

common/src/main/java/dev/gould/lingo/common/Game.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 import java.util.Arrays;
 import java.util.Collections;

common/src/main/java/dev/gould/lingo/common/GameLeftMessage.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 public class GameLeftMessage {
 

common/src/main/java/dev/gould/lingo/common/LobbyData.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 import java.util.Collection;
 

common/src/main/java/dev/gould/lingo/common/Player.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

common/src/main/java/dev/gould/lingo/common/Report.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 public class Report {
 

common/src/main/java/dev/gould/lingo/common/SetUsernameMessage.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 public class SetUsernameMessage {
 

common/src/main/java/dev/gould/lingo/common/WordReader.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.common;
+package dev.gould.lingo.common;
 
 import java.io.BufferedReader;
 import java.io.IOException;

common/src/main/java/module-info.java

@@ -1,4 +1,4 @@
-module com.charego.lingo.common {
+module dev.gould.lingo.common {
     requires com.fasterxml.jackson.annotation;
-    exports com.charego.lingo.common;
+    exports dev.gould.lingo.common;
 }

pom.xml

@@ -8,7 +8,7 @@
 		<version>2.4.1</version>
 	</parent>
 
-	<groupId>com.charego</groupId>
+	<groupId>dev.gould</groupId>
 	<artifactId>lingo-parent</artifactId>
 	<version>1.0</version>
 	<packaging>pom</packaging>

server/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.charego</groupId>
+		<groupId>dev.gould</groupId>
 		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>

server/src/main/java/dev/gould/lingo/server/LingoController.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.server;
+package dev.gould.lingo.server;
 
 import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER;
 
@@ -10,8 +10,9 @@ import java.util.TreeMap;
 
 import javax.annotation.PostConstruct;
 
-import com.charego.lingo.api.Destinations;
+import dev.gould.lingo.api.Destinations;
-import com.charego.lingo.common.*;
+import dev.gould.lingo.common.*;
+import dev.gould.lingo.common.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

server/src/main/java/dev/gould/lingo/server/LingoServer.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.server;
+package dev.gould.lingo.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

server/src/main/java/dev/gould/lingo/server/PracticeController.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.server;
+package dev.gould.lingo.server;
 
 import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER;
 
@@ -16,10 +16,10 @@ import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.charego.lingo.api.Destinations;
+import dev.gould.lingo.api.Destinations;
-import com.charego.lingo.common.Game;
+import dev.gould.lingo.common.Game;
-import com.charego.lingo.common.Player;
+import dev.gould.lingo.common.Player;
-import com.charego.lingo.common.Report;
+import dev.gould.lingo.common.Report;
 
 @RestController
 public class PracticeController {

server/src/main/java/dev/gould/lingo/server/SessionManager.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.server;
+package dev.gould.lingo.server;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -15,7 +15,7 @@ import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
 import org.springframework.web.socket.messaging.SessionConnectedEvent;
 import org.springframework.web.socket.messaging.SessionDisconnectEvent;
 
-import com.charego.lingo.common.Player;
+import dev.gould.lingo.common.Player;
 
 @Component
 public class SessionManager implements ApplicationListener<AbstractSubProtocolEvent> {

server/src/main/java/dev/gould/lingo/server/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.server;
+package dev.gould.lingo.server;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.ChannelRegistration;

server/src/main/java/dev/gould/lingo/server/WordRepository.java

@@ -1,4 +1,4 @@
-package com.charego.lingo.server;
+package dev.gould.lingo.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -10,7 +10,7 @@ import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
-import com.charego.lingo.common.WordReader;
+import dev.gould.lingo.common.WordReader;
 
 import javax.annotation.PostConstruct;
 

server/src/main/java/module-info.java

@@ -1,6 +1,6 @@
-module com.charego.lingo.server {
+module dev.gould.lingo.server {
-    requires com.charego.lingo.common;
+    requires dev.gould.lingo.common;
-    requires com.charego.lingo.api;
+    requires dev.gould.lingo.api;
     requires java.annotation;
     requires org.slf4j;
     requires spring.beans;

server/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 # https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-application-properties.html
-logging.level.com.charego.lingo = DEBUG
+logging.level.dev.gould.lingo = DEBUG