From 50a8490acab1b0608dffa78db66221dfcf549424 Mon Sep 17 00:00:00 2001 From: "(Jip) Willem Wijnia" Date: Sun, 5 May 2024 22:04:12 +0200 Subject: [PATCH] Introduce additional package to describe relation to the body of the replay --- .../com/faforever/commons/replay/ReplayDataParser.java | 10 +++++----- .../commons/replay/{ => body}/event/Event.java | 4 ++-- .../replay/{ => body}/event/EventCommandType.java | 2 +- .../commons/replay/{ => body}/event/LuaData.java | 2 +- .../commons/replay/{ => body}/event/Parser.java | 4 ++-- .../commons/replay/{ => body}/token/Token.java | 2 +- .../commons/replay/{ => body}/token/Tokenizer.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename faf-commons-data/src/main/java/com/faforever/commons/replay/{ => body}/event/Event.java (97%) rename faf-commons-data/src/main/java/com/faforever/commons/replay/{ => body}/event/EventCommandType.java (96%) rename faf-commons-data/src/main/java/com/faforever/commons/replay/{ => body}/event/LuaData.java (88%) rename faf-commons-data/src/main/java/com/faforever/commons/replay/{ => body}/event/Parser.java (99%) rename faf-commons-data/src/main/java/com/faforever/commons/replay/{ => body}/token/Token.java (93%) rename faf-commons-data/src/main/java/com/faforever/commons/replay/{ => body}/token/Tokenizer.java (93%) diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java index 7ab7809e..08de9ef6 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java @@ -1,10 +1,10 @@ package com.faforever.commons.replay; -import com.faforever.commons.replay.event.Event; -import com.faforever.commons.replay.event.LuaData; -import com.faforever.commons.replay.event.Parser; -import com.faforever.commons.replay.token.Token; -import com.faforever.commons.replay.token.Tokenizer; +import com.faforever.commons.replay.body.event.Event; +import com.faforever.commons.replay.body.event.LuaData; +import com.faforever.commons.replay.body.event.Parser; +import com.faforever.commons.replay.body.token.Token; +import com.faforever.commons.replay.body.token.Tokenizer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.BaseEncoding; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/Event.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/Event.java similarity index 97% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/event/Event.java rename to faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/Event.java index fbb9f528..70c6ffae 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/Event.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/Event.java @@ -1,6 +1,6 @@ -package com.faforever.commons.replay.event; +package com.faforever.commons.replay.body.event; -import com.faforever.commons.replay.token.Token; +import com.faforever.commons.replay.body.token.Token; import java.util.List; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/EventCommandType.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/EventCommandType.java similarity index 96% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/event/EventCommandType.java rename to faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/EventCommandType.java index e5ee5e6b..0d6482dc 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/EventCommandType.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/EventCommandType.java @@ -1,4 +1,4 @@ -package com.faforever.commons.replay.event; +package com.faforever.commons.replay.body.event; public enum EventCommandType { NONE("NONE"), diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/LuaData.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/LuaData.java similarity index 88% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/event/LuaData.java rename to faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/LuaData.java index 3e5e20fe..8d2a626b 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/LuaData.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/LuaData.java @@ -1,4 +1,4 @@ -package com.faforever.commons.replay.event; +package com.faforever.commons.replay.body.event; import java.util.Map; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/Parser.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/Parser.java similarity index 99% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/event/Parser.java rename to faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/Parser.java index 419aaa3b..70321e1f 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/event/Parser.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/event/Parser.java @@ -1,6 +1,6 @@ -package com.faforever.commons.replay.event; +package com.faforever.commons.replay.body.event; -import com.faforever.commons.replay.token.Token; +import com.faforever.commons.replay.body.token.Token; import com.google.common.io.LittleEndianDataInputStream; import java.io.ByteArrayInputStream; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/token/Token.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/token/Token.java similarity index 93% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/token/Token.java rename to faf-commons-data/src/main/java/com/faforever/commons/replay/body/token/Token.java index 844fd68e..4f1a28b1 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/token/Token.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/token/Token.java @@ -1,4 +1,4 @@ -package com.faforever.commons.replay.token; +package com.faforever.commons.replay.body.token; public record Token(TokenId tokenId, int tokenSize, byte[] tokenContent) { diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/token/Tokenizer.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/token/Tokenizer.java similarity index 93% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/token/Tokenizer.java rename to faf-commons-data/src/main/java/com/faforever/commons/replay/body/token/Tokenizer.java index ef80923d..e5c58e75 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/token/Tokenizer.java +++ b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/token/Tokenizer.java @@ -1,4 +1,4 @@ -package com.faforever.commons.replay.token; +package com.faforever.commons.replay.body.token; import com.google.common.io.LittleEndianDataInputStream;