Move modules and drop faf-commons prefix (for better packaging)

faf-commons-api/build.gradle.kts → api/build.gradle.kts

@@ -1,12 +1,10 @@
-version = "1.0-SNAPSHOT"
-
 java {
   sourceCompatibility = JavaVersion.VERSION_21
   targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {
-  implementation(project(":faf-commons-data"))
+  implementation(project(":data"))
   annotationProcessor(libs.lombok)
   compileOnly(libs.lombok)
   compileOnly(libs.jetbrains.annotations)

faf-commons-api/src/main/java/com/faforever/commons/api/dto/Game.java → api/src/main/java/com/faforever/commons/api/dto/Game.java

@@ -4,12 +4,13 @@
 import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
-import java.time.OffsetDateTime;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.time.OffsetDateTime;
+import java.util.List;
+
 @Data
 @ToString(onlyExplicitlyIncluded = true)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)

faf-commons-api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java → api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java

@@ -8,7 +8,6 @@
 
 import static com.faforever.commons.api.elide.ElideNavigator.qBuilder;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

faf-commons-data/build.gradle.kts → data/build.gradle.kts

@@ -1,5 +1,3 @@
-version = "1.0-SNAPSHOT"
-
 java {
   sourceCompatibility = JavaVersion.VERSION_21
   targetCompatibility = JavaVersion.VERSION_21

faf-commons-data/src/main/java/com/faforever/commons/io/Unzipper.java → data/src/main/java/com/faforever/commons/io/Unzipper.java

@@ -17,9 +17,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static java.nio.file.StandardOpenOption.CREATE;
-import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
-import static java.nio.file.StandardOpenOption.WRITE;
+import static java.nio.file.StandardOpenOption.*;
 
 @Slf4j
 public final class Unzipper {

faf-commons-data/src/main/java/com/faforever/commons/map/PreviewGenerator.java → data/src/main/java/com/faforever/commons/map/PreviewGenerator.java

@@ -7,9 +7,7 @@
 import org.luaj.vm2.LuaValue;
 
 import javax.imageio.ImageIO;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.awt.image.Raster;

faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java → data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java

@@ -1,10 +1,10 @@
 package com.faforever.commons.replay;
 
 import com.faforever.commons.replay.body.Event;
-import com.faforever.commons.replay.shared.LuaData;
 import com.faforever.commons.replay.body.ReplayBodyParser;
 import com.faforever.commons.replay.body.ReplayBodyToken;
 import com.faforever.commons.replay.body.ReplayBodyTokenizer;
+import com.faforever.commons.replay.shared.LuaData;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.BaseEncoding;

faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayLoader.java → data/src/main/java/com/faforever/commons/replay/ReplayLoader.java

@@ -4,8 +4,11 @@
 import com.faforever.commons.replay.body.ReplayBodyParser;
 import com.faforever.commons.replay.body.ReplayBodyToken;
 import com.faforever.commons.replay.body.ReplayBodyTokenizer;
-import com.faforever.commons.replay.header.*;
+import com.faforever.commons.replay.header.ReplayHeader;
+import com.faforever.commons.replay.header.ReplayHeaderParser;
+import com.faforever.commons.replay.header.Source;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.LittleEndianDataInputStream;
 import org.apache.commons.compress.compressors.CompressorException;
@@ -15,8 +18,6 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;

faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java → data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java

@@ -1,14 +1,15 @@
 package com.faforever.commons.replay.body;
 
-import com.faforever.commons.replay.shared.LuaData;
 import com.faforever.commons.replay.shared.LoadUtils;
+import com.faforever.commons.replay.shared.LuaData;
 import com.google.common.io.LittleEndianDataInputStream;
 import org.jetbrains.annotations.Contract;
 
 import java.io.ByteArrayInputStream;
-import java.io.EOFException;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HexFormat;
+import java.util.List;
 
 public class ReplayBodyParser {
 

faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java → data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java

@@ -1,13 +1,13 @@
 package com.faforever.commons.replay.body;
 
 import com.google.common.io.LittleEndianDataInputStream;
-
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 public class ReplayBodyTokenizer {

faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameOptions.java → data/src/main/java/com/faforever/commons/replay/header/GameOptions.java

@@ -1,7 +1,5 @@
 package com.faforever.commons.replay.header;
 
-import java.util.Arrays;
-
 /**
  * Populated by the game options field of the table that is passed to `CLobby:LaunchGame`
  *

faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java → data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java

@@ -8,7 +8,9 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import static com.faforever.commons.replay.shared.LoadUtils.parseLua;
 

faf-commons-data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java → data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java

@@ -20,13 +20,7 @@
  */
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Stack;
+import java.util.*;
 
 /**
  * Generic implementation of version comparison.

faf-commons-data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java → data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java

@@ -10,14 +10,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 class ZipperAndUnzipperTest {
 

faf-commons-data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java → data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java

@@ -11,10 +11,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class LuaAccessorTest {
   private LuaAccessor instance;

faf-commons-data/src/test/java/com/faforever/commons/mod/ModReaderTest.java → data/src/test/java/com/faforever/commons/mod/ModReaderTest.java

@@ -14,7 +14,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.startsWith;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class ModReaderTest {
 

faf-commons-data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java → data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java

@@ -16,7 +16,6 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class LoadReplayLoaderTest {
 

faf-commons-lobby/build.gradle.kts → lobby/build.gradle.kts

@@ -9,8 +9,6 @@ plugins {
   alias(libs.plugins.kotlin.plugin.spring)
 }
 
-version = "1.0.0-SNAPSHOT"
-
 dependencies {
   api(libs.reactor.core)
   implementation(libs.reactor.netty)

faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt → lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt

@@ -3,7 +3,6 @@ package com.faforever.commons.lobby
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
@@ -14,7 +13,7 @@ class ClientMessageTest {
 
   companion object {
     val objectMapper: ObjectMapper = ObjectMapper()
-      .registerModule(KotlinModule())
+      .registerModule(KotlinModule.Builder().build())
       .registerModule(JavaTimeModule())
   }
 

settings.gradle

@@ -1,3 +1,3 @@
-include(":faf-commons-api")
-include(":faf-commons-data")
-include(":faf-commons-lobby")
+include(":api")
+include(":data")
+include(":lobby")