fix: use consistent CrowdControl/ log prefix

qixils · qixils · commit d70233471743 · 2023-07-26T02:02:22.000-04:00
diff --git a/pojos/src/main/java/dev/qixils/crowdcontrol/TimedEffect.java b/pojos/src/main/java/dev/qixils/crowdcontrol/TimedEffect.java
@@ -14,11 +14,7 @@
 import javax.annotation.ParametersAreNullableByDefault;
 import java.time.Duration;
 import java.time.temporal.TemporalUnit;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -46,7 +42,7 @@ public final class TimedEffect {
 	private static final Map<UUID, TimedEffect> ALL_ACTIVE_EFFECTS = new HashMap<>();
 	private static final Map<UUID, TimedEffect> ALL_PAUSED_EFFECTS = new HashMap<>();
 	private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-	private static final Logger logger = LoggerFactory.getLogger("CC-TimedEffect");
+	private static final Logger logger = LoggerFactory.getLogger("CrowdControl/TimedEffect");
 	private final @NotNull UUID id = UUID.randomUUID();
 	private final @NotNull Request request;
 	private final @NotNull MapKey globalKey;
diff --git a/pojos/src/main/java/dev/qixils/crowdcontrol/socket/Request.java b/pojos/src/main/java/dev/qixils/crowdcontrol/socket/Request.java
@@ -17,11 +17,7 @@
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.time.Duration;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static dev.qixils.crowdcontrol.util.StringUtils.repr;
 
@@ -33,7 +29,7 @@
  */
 @ApiStatus.AvailableSince("1.0.0")
 public class Request implements JsonObject, Respondable {
-	private static final Logger logger = LoggerFactory.getLogger(Request.class);
+	private static final Logger logger = LoggerFactory.getLogger("CrowdControl/Request");
 	private transient @Nullable SocketManager originatingSocket;
 	private transient @Nullable Source source;
 	private int id;
diff --git a/pojos/src/main/java/dev/qixils/crowdcontrol/socket/Response.java b/pojos/src/main/java/dev/qixils/crowdcontrol/socket/Response.java
@@ -3,11 +3,7 @@
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.SerializedName;
 import dev.qixils.crowdcontrol.exceptions.ExceptionUtil;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jetbrains.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,14 +14,7 @@
 import java.time.Instant;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static dev.qixils.crowdcontrol.util.StringUtils.repr;
@@ -39,7 +28,7 @@
  */
 @ApiStatus.AvailableSince("1.0.0")
 public class Response implements JsonObject {
-	private static final @NotNull Logger logger = LoggerFactory.getLogger("CC-Response");
+	private static final @NotNull Logger logger = LoggerFactory.getLogger("CrowdControl/Response");
 	@SerializedName("type")
 	private PacketType packetType;
 	@Nullable
diff --git a/receiver/src/main/java/dev/qixils/crowdcontrol/CrowdControl.java b/receiver/src/main/java/dev/qixils/crowdcontrol/CrowdControl.java
@@ -17,13 +17,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -79,7 +73,7 @@
 @ApiStatus.AvailableSince("1.0.0")
 public final class CrowdControl implements SocketManager, RequestManager {
 
-	private static final Logger logger = LoggerFactory.getLogger("CC-Core");
+	private static final Logger logger = LoggerFactory.getLogger("CrowdControl/Core");
 	private static final Map<Class<?>, Function<Object, Response>> RETURN_TYPE_PARSERS;
 	private final Map<String, Function<Request, Response>> effectHandlers = new HashMap<>();
 	private final Map<String, Consumer<Request>> asyncHandlers = new HashMap<>();
diff --git a/receiver/src/main/java/dev/qixils/crowdcontrol/socket/ClientSocketManager.java b/receiver/src/main/java/dev/qixils/crowdcontrol/socket/ClientSocketManager.java
@@ -26,7 +26,7 @@
  */
 @ApiStatus.AvailableSince("3.0.0")
 public final class ClientSocketManager implements SocketManager {
-	private static final @NotNull Logger logger = LoggerFactory.getLogger("CC-ClientSocket");
+	private static final @NotNull Logger logger = LoggerFactory.getLogger("CrowdControl/ClientSocket");
 	final @NotNull RequestManager crowdControl;
 	final @NotNull Executor effectPool = Executors.newCachedThreadPool();
 	private final @NotNull List<Consumer<SocketManager>> onConnectListeners = new ArrayList<>();
diff --git a/receiver/src/main/java/dev/qixils/crowdcontrol/socket/EffectExecutor.java b/receiver/src/main/java/dev/qixils/crowdcontrol/socket/EffectExecutor.java
@@ -24,7 +24,7 @@
  * Processes incoming requests from a Crowd Control socket and executes them.
  */
 final class EffectExecutor {
-	private static final Logger logger = LoggerFactory.getLogger("CC-EffectExecutor");
+	private static final Logger logger = LoggerFactory.getLogger("CrowdControl/EffectExecutor");
 	private final @Nullable SocketManager socketThread;
 	private final Socket socket;
 	private final Executor effectPool;
diff --git a/receiver/src/main/java/dev/qixils/crowdcontrol/socket/ServerSocketManager.java b/receiver/src/main/java/dev/qixils/crowdcontrol/socket/ServerSocketManager.java
@@ -12,11 +12,7 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
@@ -28,7 +24,7 @@
  */
 @ApiStatus.AvailableSince("3.0.0")
 public final class ServerSocketManager implements SocketManager {
-	private static final @NotNull Logger logger = LoggerFactory.getLogger("CC-ServerSocket");
+	private static final @NotNull Logger logger = LoggerFactory.getLogger("CrowdControl/ServerSocket");
 	final @NotNull RequestManager crowdControl;
 	final @NotNull Executor effectPool = Executors.newCachedThreadPool();
 	final @NotNull List<Consumer<SocketManager>> onConnectListeners = new ArrayList<>();
diff --git a/receiver/src/main/java/dev/qixils/crowdcontrol/socket/SocketThread.java b/receiver/src/main/java/dev/qixils/crowdcontrol/socket/SocketThread.java
@@ -9,11 +9,7 @@
 import java.io.OutputStream;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
@@ -22,7 +18,7 @@
 final class SocketThread extends Thread implements SocketManager {
 	private static final @NotNull String RAW_PASSWORD_REQUEST;
 	private static final byte @NotNull [] PASSWORD_REQUEST;
-	private static final @NotNull Logger logger = LoggerFactory.getLogger("CC-SocketThread");
+	private static final @NotNull Logger logger = LoggerFactory.getLogger("CrowdControl/SocketThread");
 
 	static {
 		Response resp = new Response.Builder().packetType(Response.PacketType.LOGIN).build();
diff --git a/receiver/src/test/java/dev/qixils/crowdcontrol/ExampleProject.java b/receiver/src/test/java/dev/qixils/crowdcontrol/ExampleProject.java
@@ -7,12 +7,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -234,6 +229,7 @@ Collection<Player> getPlayersFromTarget(Request.Target target) {
 	 * Gets a collection of players being targeted by an effect.
 	 */
 	Collection<Player> getPlayersFromRequest(Request request) {
+		// TODO: Use new Sources API
 		// Global requests apply to every player on the server
 		if (request.isGlobal()) {
 			return getLivingPlayers();
diff --git a/sender/src/main/java/dev/qixils/crowdcontrol/socket/RequestHandler.java b/sender/src/main/java/dev/qixils/crowdcontrol/socket/RequestHandler.java
@@ -22,16 +22,10 @@
 import java.time.Duration;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 
 final class RequestHandler implements SimulatedService<Response> {
-	private static final @NotNull Logger logger = LoggerFactory.getLogger("CC-RequestHandler");
+	private static final @NotNull Logger logger = LoggerFactory.getLogger("CrowdControl/RequestHandler");
 	private static final @NotNull Executor executor = Executors.newCachedThreadPool();
 	private static final @NotNull ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
 	private final @NotNull Map<Integer, EffectData> effectDataMap = new ConcurrentHashMap<>(1);
diff --git a/sender/src/main/java/dev/qixils/crowdcontrol/socket/SimulatedClient.java b/sender/src/main/java/dev/qixils/crowdcontrol/socket/SimulatedClient.java
@@ -4,12 +4,7 @@
 import dev.qixils.crowdcontrol.StartableService;
 import dev.qixils.crowdcontrol.TriState;
 import dev.qixils.crowdcontrol.exceptions.ExceptionUtil;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Blocking;
-import org.jetbrains.annotations.NonBlocking;
-import org.jetbrains.annotations.NonBlockingExecutor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
@@ -29,7 +24,7 @@
  */
 @ApiStatus.AvailableSince("3.3.0")
 public final class SimulatedClient implements StartableService<Response>, ServiceManager {
-	private static final Logger logger = LoggerFactory.getLogger("CC-Simul-Client");
+	private static final Logger logger = LoggerFactory.getLogger("CrowdControl/SimulatedClient");
 	private final @NonBlockingExecutor Executor executor = Executors.newSingleThreadExecutor();
 	private final String ip;
 	private final int port;
diff --git a/sender/src/main/java/dev/qixils/crowdcontrol/socket/SimulatedServer.java b/sender/src/main/java/dev/qixils/crowdcontrol/socket/SimulatedServer.java
@@ -29,7 +29,7 @@
  */
 @ApiStatus.AvailableSince("3.3.0")
 public final class SimulatedServer implements StartableService<@NotNull Flux<@NotNull Response>>, ServiceManager {
-	private static final Logger logger = LoggerFactory.getLogger("CC-Simul-Server");
+	private static final Logger logger = LoggerFactory.getLogger("CrowdControl/SimulatedServer");
 	private final int port;
 	private final List<RequestHandler> rawHandlers = Collections.synchronizedList(new ArrayList<>(1));
 	private @Nullable ServerSocket serverSocket;
