From 51e221446d70f5da0dcdcf76b09257cfeacaec25 Mon Sep 17 00:00:00 2001 From: Brutus5000 Date: Fri, 22 Nov 2024 22:59:49 +0100 Subject: [PATCH] Move modules and drop faf-commons prefix (for better packaging) --- {faf-commons-api => api}/build.gradle.kts | 4 +--- .../faforever/commons/api/dto/AbstractEntity.java | 0 .../com/faforever/commons/api/dto/AccountLink.java | 0 .../commons/api/dto/AchievementDefinition.java | 0 .../faforever/commons/api/dto/AchievementState.java | 0 .../faforever/commons/api/dto/AchievementType.java | 0 .../com/faforever/commons/api/dto/ApiException.java | 0 .../java/com/faforever/commons/api/dto/Avatar.java | 0 .../faforever/commons/api/dto/AvatarAssignment.java | 0 .../faforever/commons/api/dto/BanDurationType.java | 0 .../java/com/faforever/commons/api/dto/BanInfo.java | 0 .../com/faforever/commons/api/dto/BanLevel.java | 0 .../com/faforever/commons/api/dto/BanStatus.java | 0 .../java/com/faforever/commons/api/dto/Clan.java | 0 .../faforever/commons/api/dto/ClanMembership.java | 0 .../com/faforever/commons/api/dto/CoopFaction.java | 0 .../com/faforever/commons/api/dto/CoopMission.java | 0 .../com/faforever/commons/api/dto/CoopResult.java | 0 .../com/faforever/commons/api/dto/CoopScenario.java | 0 .../com/faforever/commons/api/dto/CoopType.java | 0 .../com/faforever/commons/api/dto/CoturnServer.java | 0 .../faforever/commons/api/dto/DomainBlacklist.java | 0 .../java/com/faforever/commons/api/dto/Event.java | 0 .../java/com/faforever/commons/api/dto/Faction.java | 0 .../com/faforever/commons/api/dto/FeaturedMod.java | 0 .../faforever/commons/api/dto/FeaturedModFile.java | 0 .../java/com/faforever/commons/api/dto/Game.java | 5 +++-- .../com/faforever/commons/api/dto/GameOutcome.java | 0 .../faforever/commons/api/dto/GamePlayerStats.java | 0 .../com/faforever/commons/api/dto/GameReview.java | 0 .../commons/api/dto/GameReviewsSummary.java | 0 .../commons/api/dto/GlobalLeaderboardEntry.java | 0 .../com/faforever/commons/api/dto/GlobalRating.java | 0 .../faforever/commons/api/dto/GroupPermission.java | 0 .../commons/api/dto/Ladder1v1LeaderboardEntry.java | 0 .../com/faforever/commons/api/dto/Ladder1v1Map.java | 0 .../faforever/commons/api/dto/Ladder1v1Rating.java | 0 .../com/faforever/commons/api/dto/Leaderboard.java | 0 .../faforever/commons/api/dto/LeaderboardEntry.java | 0 .../commons/api/dto/LeaderboardRatingJournal.java | 0 .../java/com/faforever/commons/api/dto/League.java | 0 .../commons/api/dto/LeagueLeaderboard.java | 0 .../commons/api/dto/LeagueScoreJournal.java | 0 .../com/faforever/commons/api/dto/LeagueSeason.java | 0 .../commons/api/dto/LeagueSeasonDivision.java | 0 .../api/dto/LeagueSeasonDivisionSubdivision.java | 0 .../commons/api/dto/LeagueSeasonScore.java | 0 .../commons/api/dto/LegacyAccessLevel.java | 0 .../java/com/faforever/commons/api/dto/License.java | 0 .../commons/api/dto/LinkedServiceType.java | 0 .../com/faforever/commons/api/dto/LobbyGroup.java | 0 .../java/com/faforever/commons/api/dto/Map.java | 0 .../com/faforever/commons/api/dto/MapParams.java | 0 .../java/com/faforever/commons/api/dto/MapPool.java | 0 .../commons/api/dto/MapPoolAssignment.java | 0 .../commons/api/dto/MapReviewsSummary.java | 0 .../faforever/commons/api/dto/MapStatistics.java | 0 .../com/faforever/commons/api/dto/MapVersion.java | 0 .../faforever/commons/api/dto/MapVersionReview.java | 0 .../commons/api/dto/MapVersionReviewsSummary.java | 0 .../commons/api/dto/MapVersionStatistics.java | 0 .../faforever/commons/api/dto/MatchmakerQueue.java | 0 .../commons/api/dto/MatchmakerQueueMapPool.java | 0 .../com/faforever/commons/api/dto/MeResult.java | 0 .../java/com/faforever/commons/api/dto/Message.java | 0 .../java/com/faforever/commons/api/dto/Mod.java | 0 .../commons/api/dto/ModReviewsSummary.java | 0 .../java/com/faforever/commons/api/dto/ModType.java | 0 .../com/faforever/commons/api/dto/ModVersion.java | 0 .../faforever/commons/api/dto/ModVersionReview.java | 0 .../commons/api/dto/ModVersionReviewsSummary.java | 0 .../faforever/commons/api/dto/ModerationReport.java | 0 .../commons/api/dto/ModerationReportStatus.java | 0 .../com/faforever/commons/api/dto/NameRecord.java | 0 .../commons/api/dto/NeroxisGeneratorParams.java | 0 .../java/com/faforever/commons/api/dto/Player.java | 0 .../commons/api/dto/PlayerAchievement.java | 0 .../com/faforever/commons/api/dto/PlayerEvent.java | 0 .../java/com/faforever/commons/api/dto/Rating.java | 0 .../commons/api/dto/RestrictedVisibility.java | 0 .../java/com/faforever/commons/api/dto/Review.java | 0 .../faforever/commons/api/dto/ReviewsSummary.java | 0 .../com/faforever/commons/api/dto/Teamkill.java | 0 .../faforever/commons/api/dto/TeamkillReport.java | 0 .../com/faforever/commons/api/dto/Tournament.java | 0 .../com/faforever/commons/api/dto/Tutorial.java | 0 .../faforever/commons/api/dto/TutorialCategory.java | 0 .../com/faforever/commons/api/dto/UniqueId.java | 0 .../com/faforever/commons/api/dto/UserGroup.java | 0 .../com/faforever/commons/api/dto/UserNote.java | 0 .../com/faforever/commons/api/dto/Validity.java | 0 .../faforever/commons/api/dto/VictoryCondition.java | 0 .../java/com/faforever/commons/api/dto/Vote.java | 0 .../com/faforever/commons/api/dto/VotingAnswer.java | 0 .../com/faforever/commons/api/dto/VotingChoice.java | 0 .../faforever/commons/api/dto/VotingQuestion.java | 0 .../faforever/commons/api/dto/VotingSubject.java | 0 .../commons/api/elide/ElideEndpointBuilder.java | 0 .../faforever/commons/api/elide/ElideEntity.java | 0 .../faforever/commons/api/elide/ElideNavigator.java | 0 .../api/elide/ElideNavigatorOnCollection.java | 0 .../commons/api/elide/ElideNavigatorOnId.java | 0 .../commons/api/elide/ElideNavigatorSelector.java | 0 .../commons/api/update/AvatarAssignmentUpdate.java | 0 .../com/faforever/commons/api/update/UpdateDto.java | 0 .../java/com/faforever/commons/api/AllDtoTest.java | 0 .../com/faforever/commons/api/dto/TutorialTest.java | 0 .../commons/api/elide/ElideNavigatorTest.java | 1 - {faf-commons-data => data}/build.gradle.kts | 2 -- .../commons/fa/ForgedAllianceExePatcher.java | 0 .../java/com/faforever/commons/io/ByteCopier.java | 0 .../com/faforever/commons/io/ByteCountListener.java | 0 .../main/java/com/faforever/commons/io/Bytes.java | 0 .../java/com/faforever/commons/io/Unzipper.java | 4 +--- .../com/faforever/commons/io/ZipBombException.java | 0 .../com/faforever/commons/io/ZipSlipException.java | 0 .../main/java/com/faforever/commons/io/Zipper.java | 0 .../java/com/faforever/commons/lua/LuaAccessor.java | 0 .../java/com/faforever/commons/lua/LuaLoader.java | 0 .../java/com/faforever/commons/map/MapData.java | 0 .../com/faforever/commons/map/PreviewGenerator.java | 4 +--- .../main/java/com/faforever/commons/mod/Mod.java | 0 .../com/faforever/commons/mod/ModLoadException.java | 0 .../java/com/faforever/commons/mod/ModReader.java | 0 .../java/com/faforever/commons/mod/MountInfo.java | 0 .../com/faforever/commons/replay/ChatMessage.java | 0 .../faforever/commons/replay/CompressionType.java | 0 .../com/faforever/commons/replay/GameOption.java | 0 .../com/faforever/commons/replay/GameStatus.java | 0 .../faforever/commons/replay/ModeratorEvent.java | 0 .../com/faforever/commons/replay/QtCompress.java | 0 .../faforever/commons/replay/RegisteredEvent.java | 0 .../faforever/commons/replay/ReplayContainer.java | 0 .../faforever/commons/replay/ReplayDataParser.java | 2 +- .../com/faforever/commons/replay/ReplayLoader.java | 7 ++++--- .../faforever/commons/replay/ReplayMetadata.java | 0 .../faforever/commons/replay/ReplaySemantics.java | 0 .../faforever/commons/replay/VictoryCondition.java | 0 .../com/faforever/commons/replay/body/Event.java | 0 .../commons/replay/body/EventCommandType.java | 0 .../commons/replay/body/ReplayBodyParser.java | 7 ++++--- .../commons/replay/body/ReplayBodyToken.java | 0 .../commons/replay/body/ReplayBodyTokenizer.java | 4 ++-- .../faforever/commons/replay/header/GameMod.java | 0 .../commons/replay/header/GameOptions.java | 2 -- .../commons/replay/header/GameScenario.java | 0 .../commons/replay/header/PlayerOptions.java | 0 .../commons/replay/header/ReplayHeader.java | 0 .../commons/replay/header/ReplayHeaderParser.java | 4 +++- .../com/faforever/commons/replay/header/Source.java | 0 .../faforever/commons/replay/shared/LoadUtils.java | 0 .../faforever/commons/replay/shared/LuaData.java | 0 .../artifact/versioning/ComparableVersion.java | 8 +------- .../versioning/ComparableVersionDeserializer.java | 0 .../src/main/resources/lua/faf.lua | 0 .../commons/fa/ForgedAllianceExePatcherTest.java | 0 .../faforever/commons/io/ZipperAndUnzipperTest.java | 10 ++-------- .../com/faforever/commons/lua/LuaAccessorTest.java | 5 +---- .../com/faforever/commons/mod/ModReaderTest.java | 3 ++- .../commons/replay/LoadReplayLoaderTest.java | 1 - .../faforever/commons/replay/QtCompressTest.java | 0 .../commons/replay/ReplayLoaderTableParserTest.java | 0 .../commons/test/IsUtilityClassMatcher.java | 0 .../artifact/versioning/ComparableVersionTest.java | 0 .../src/test/resources/lua/empty.txt | 0 .../src/test/resources/lua/map_scenario.lua | 0 .../src/test/resources/lua/wrong_version.lua | 0 .../src/test/resources/mod/mod-with-url.lua | 0 .../test/resources/replay/TestCommands01.fafreplay | Bin .../resources/replay/TestModeratorEvents.fafreplay | 0 .../src/test/resources/replay/bad_base64.fafreplay | 0 .../resources/replay/bad_compression_type.fafreplay | 0 .../src/test/resources/replay/bad_json.fafreplay | 0 .../test/resources/replay/bad_nonewline.fafreplay | 0 .../replay/bad_unknown_compression.fafreplay | 0 .../test/resources/replay/load/22338092.fafreplay | Bin .../test/resources/replay/load/22338092.scfareplay | Bin .../test/resources/replay/load/22373098.fafreplay | Bin .../test/resources/replay/load/22373098.scfareplay | Bin .../test/resources/replay/load/22425616.fafreplay | Bin .../test/resources/replay/load/22425616.scfareplay | Bin .../test/resources/replay/load/22451957.fafreplay | 0 .../test/resources/replay/load/22453414.fafreplay | 0 .../test/resources/replay/load/22453511.fafreplay | 0 .../src/test/resources/replay/mods.fafreplay | 0 .../src/test/resources/replay/test.fafreplay | 0 .../src/test/resources/replay/test.raw | Bin .../test/resources/replay/zstd_reference.fafreplay | Bin .../src/test/resources/replay/zstd_reference.raw | Bin .../src/test/resources/zip/normal_zip.zip | Bin .../src/test/resources/zip/slip_zip.zip | Bin .../src/test/resources/zip/zip_bomb.zip | Bin {faf-commons-lobby => lobby}/build.gradle.kts | 2 -- .../kotlin/com/faforever/commons/lobby/AdminApi.kt | 0 .../com/faforever/commons/lobby/ConnectionApi.kt | 0 .../com/faforever/commons/lobby/FafLobbyApi.kt | 0 .../com/faforever/commons/lobby/FafLobbyClient.kt | 0 .../kotlin/com/faforever/commons/lobby/GameApi.kt | 0 .../com/faforever/commons/lobby/MatchmakerApi.kt | 0 .../kotlin/com/faforever/commons/lobby/SocialApi.kt | 0 .../faforever/commons/lobby/ClientMessageTest.kt | 3 +-- .../com/faforever/commons/lobby/LobbyClientTest.kt | 0 .../faforever/commons/lobby/ServerMessageTest.kt | 0 settings.gradle | 6 +++--- 204 files changed, 30 insertions(+), 54 deletions(-) rename {faf-commons-api => api}/build.gradle.kts (90%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/AbstractEntity.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/AccountLink.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/AchievementDefinition.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/AchievementState.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/AchievementType.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ApiException.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Avatar.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/AvatarAssignment.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/BanDurationType.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/BanInfo.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/BanLevel.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/BanStatus.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Clan.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ClanMembership.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/CoopFaction.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/CoopMission.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/CoopResult.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/CoopScenario.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/CoopType.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/CoturnServer.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/DomainBlacklist.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Event.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Faction.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/FeaturedMod.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/FeaturedModFile.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Game.java (99%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GameOutcome.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GamePlayerStats.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GameReview.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GameReviewsSummary.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GlobalLeaderboardEntry.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GlobalRating.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/GroupPermission.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Ladder1v1LeaderboardEntry.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Ladder1v1Map.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Ladder1v1Rating.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Leaderboard.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeaderboardEntry.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeaderboardRatingJournal.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/League.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeagueLeaderboard.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeagueScoreJournal.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeagueSeason.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivision.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivisionSubdivision.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LeagueSeasonScore.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LegacyAccessLevel.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/License.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LinkedServiceType.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/LobbyGroup.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Map.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapParams.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapPool.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapPoolAssignment.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapReviewsSummary.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapStatistics.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapVersion.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapVersionReview.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapVersionReviewsSummary.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MapVersionStatistics.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MatchmakerQueue.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/MeResult.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Message.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Mod.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModReviewsSummary.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModType.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModVersion.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModVersionReview.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModVersionReviewsSummary.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModerationReport.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ModerationReportStatus.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/NameRecord.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/NeroxisGeneratorParams.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Player.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/PlayerAchievement.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/PlayerEvent.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Rating.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/RestrictedVisibility.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Review.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/ReviewsSummary.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Teamkill.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/TeamkillReport.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Tournament.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Tutorial.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/TutorialCategory.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/UniqueId.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/UserGroup.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/UserNote.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Validity.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/VictoryCondition.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/Vote.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/VotingAnswer.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/VotingChoice.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/VotingQuestion.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/dto/VotingSubject.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/elide/ElideEndpointBuilder.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/elide/ElideEntity.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/elide/ElideNavigator.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnCollection.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnId.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/elide/ElideNavigatorSelector.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/update/AvatarAssignmentUpdate.java (100%) rename {faf-commons-api => api}/src/main/java/com/faforever/commons/api/update/UpdateDto.java (100%) rename {faf-commons-api => api}/src/test/java/com/faforever/commons/api/AllDtoTest.java (100%) rename {faf-commons-api => api}/src/test/java/com/faforever/commons/api/dto/TutorialTest.java (100%) rename {faf-commons-api => api}/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java (99%) rename {faf-commons-data => data}/build.gradle.kts (96%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/fa/ForgedAllianceExePatcher.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/ByteCopier.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/ByteCountListener.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/Bytes.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/Unzipper.java (96%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/ZipBombException.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/ZipSlipException.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/io/Zipper.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/lua/LuaAccessor.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/lua/LuaLoader.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/map/MapData.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/map/PreviewGenerator.java (98%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/mod/Mod.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/mod/ModLoadException.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/mod/ModReader.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/mod/MountInfo.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ChatMessage.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/CompressionType.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/GameOption.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/GameStatus.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ModeratorEvent.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/QtCompress.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/RegisteredEvent.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ReplayContainer.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ReplayDataParser.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ReplayLoader.java (96%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ReplayMetadata.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/ReplaySemantics.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/VictoryCondition.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/body/Event.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/body/EventCommandType.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java (99%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/body/ReplayBodyToken.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java (94%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/GameMod.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/GameOptions.java (99%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/GameScenario.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/PlayerOptions.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/ReplayHeader.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java (99%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/header/Source.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/shared/LoadUtils.java (100%) rename {faf-commons-data => data}/src/main/java/com/faforever/commons/replay/shared/LuaData.java (100%) rename {faf-commons-data => data}/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java (98%) rename {faf-commons-data => data}/src/main/java/org/apache/maven/artifact/versioning/ComparableVersionDeserializer.java (100%) rename {faf-commons-data => data}/src/main/resources/lua/faf.lua (100%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/fa/ForgedAllianceExePatcherTest.java (100%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java (91%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java (94%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/mod/ModReaderTest.java (96%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java (99%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/replay/QtCompressTest.java (100%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/replay/ReplayLoaderTableParserTest.java (100%) rename {faf-commons-data => data}/src/test/java/com/faforever/commons/test/IsUtilityClassMatcher.java (100%) rename {faf-commons-data => data}/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java (100%) rename {faf-commons-data => data}/src/test/resources/lua/empty.txt (100%) rename {faf-commons-data => data}/src/test/resources/lua/map_scenario.lua (100%) rename {faf-commons-data => data}/src/test/resources/lua/wrong_version.lua (100%) rename {faf-commons-data => data}/src/test/resources/mod/mod-with-url.lua (100%) rename {faf-commons-data => data}/src/test/resources/replay/TestCommands01.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/TestModeratorEvents.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/bad_base64.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/bad_compression_type.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/bad_json.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/bad_nonewline.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/bad_unknown_compression.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22338092.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22338092.scfareplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22373098.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22373098.scfareplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22425616.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22425616.scfareplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22451957.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22453414.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/load/22453511.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/mods.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/test.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/test.raw (100%) rename {faf-commons-data => data}/src/test/resources/replay/zstd_reference.fafreplay (100%) rename {faf-commons-data => data}/src/test/resources/replay/zstd_reference.raw (100%) rename {faf-commons-data => data}/src/test/resources/zip/normal_zip.zip (100%) rename {faf-commons-data => data}/src/test/resources/zip/slip_zip.zip (100%) rename {faf-commons-data => data}/src/test/resources/zip/zip_bomb.zip (100%) rename {faf-commons-lobby => lobby}/build.gradle.kts (98%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/AdminApi.kt (100%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/ConnectionApi.kt (100%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt (100%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt (100%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/GameApi.kt (100%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt (100%) rename {faf-commons-lobby => lobby}/src/main/kotlin/com/faforever/commons/lobby/SocialApi.kt (100%) rename {faf-commons-lobby => lobby}/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt (98%) rename {faf-commons-lobby => lobby}/src/test/kotlin/com/faforever/commons/lobby/LobbyClientTest.kt (100%) rename {faf-commons-lobby => lobby}/src/test/kotlin/com/faforever/commons/lobby/ServerMessageTest.kt (100%) diff --git a/faf-commons-api/build.gradle.kts b/api/build.gradle.kts similarity index 90% rename from faf-commons-api/build.gradle.kts rename to api/build.gradle.kts index 704771ff..e2764017 100644 --- a/faf-commons-api/build.gradle.kts +++ b/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) diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/AbstractEntity.java b/api/src/main/java/com/faforever/commons/api/dto/AbstractEntity.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/AbstractEntity.java rename to api/src/main/java/com/faforever/commons/api/dto/AbstractEntity.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/AccountLink.java b/api/src/main/java/com/faforever/commons/api/dto/AccountLink.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/AccountLink.java rename to api/src/main/java/com/faforever/commons/api/dto/AccountLink.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/AchievementDefinition.java b/api/src/main/java/com/faforever/commons/api/dto/AchievementDefinition.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/AchievementDefinition.java rename to api/src/main/java/com/faforever/commons/api/dto/AchievementDefinition.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/AchievementState.java b/api/src/main/java/com/faforever/commons/api/dto/AchievementState.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/AchievementState.java rename to api/src/main/java/com/faforever/commons/api/dto/AchievementState.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/AchievementType.java b/api/src/main/java/com/faforever/commons/api/dto/AchievementType.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/AchievementType.java rename to api/src/main/java/com/faforever/commons/api/dto/AchievementType.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ApiException.java b/api/src/main/java/com/faforever/commons/api/dto/ApiException.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ApiException.java rename to api/src/main/java/com/faforever/commons/api/dto/ApiException.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Avatar.java b/api/src/main/java/com/faforever/commons/api/dto/Avatar.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Avatar.java rename to api/src/main/java/com/faforever/commons/api/dto/Avatar.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/AvatarAssignment.java b/api/src/main/java/com/faforever/commons/api/dto/AvatarAssignment.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/AvatarAssignment.java rename to api/src/main/java/com/faforever/commons/api/dto/AvatarAssignment.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanDurationType.java b/api/src/main/java/com/faforever/commons/api/dto/BanDurationType.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanDurationType.java rename to api/src/main/java/com/faforever/commons/api/dto/BanDurationType.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanInfo.java b/api/src/main/java/com/faforever/commons/api/dto/BanInfo.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanInfo.java rename to api/src/main/java/com/faforever/commons/api/dto/BanInfo.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanLevel.java b/api/src/main/java/com/faforever/commons/api/dto/BanLevel.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanLevel.java rename to api/src/main/java/com/faforever/commons/api/dto/BanLevel.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanStatus.java b/api/src/main/java/com/faforever/commons/api/dto/BanStatus.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/BanStatus.java rename to api/src/main/java/com/faforever/commons/api/dto/BanStatus.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Clan.java b/api/src/main/java/com/faforever/commons/api/dto/Clan.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Clan.java rename to api/src/main/java/com/faforever/commons/api/dto/Clan.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ClanMembership.java b/api/src/main/java/com/faforever/commons/api/dto/ClanMembership.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ClanMembership.java rename to api/src/main/java/com/faforever/commons/api/dto/ClanMembership.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopFaction.java b/api/src/main/java/com/faforever/commons/api/dto/CoopFaction.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopFaction.java rename to api/src/main/java/com/faforever/commons/api/dto/CoopFaction.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopMission.java b/api/src/main/java/com/faforever/commons/api/dto/CoopMission.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopMission.java rename to api/src/main/java/com/faforever/commons/api/dto/CoopMission.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopResult.java b/api/src/main/java/com/faforever/commons/api/dto/CoopResult.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopResult.java rename to api/src/main/java/com/faforever/commons/api/dto/CoopResult.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopScenario.java b/api/src/main/java/com/faforever/commons/api/dto/CoopScenario.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopScenario.java rename to api/src/main/java/com/faforever/commons/api/dto/CoopScenario.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopType.java b/api/src/main/java/com/faforever/commons/api/dto/CoopType.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoopType.java rename to api/src/main/java/com/faforever/commons/api/dto/CoopType.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoturnServer.java b/api/src/main/java/com/faforever/commons/api/dto/CoturnServer.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoturnServer.java rename to api/src/main/java/com/faforever/commons/api/dto/CoturnServer.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/DomainBlacklist.java b/api/src/main/java/com/faforever/commons/api/dto/DomainBlacklist.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/DomainBlacklist.java rename to api/src/main/java/com/faforever/commons/api/dto/DomainBlacklist.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Event.java b/api/src/main/java/com/faforever/commons/api/dto/Event.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Event.java rename to api/src/main/java/com/faforever/commons/api/dto/Event.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Faction.java b/api/src/main/java/com/faforever/commons/api/dto/Faction.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Faction.java rename to api/src/main/java/com/faforever/commons/api/dto/Faction.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/FeaturedMod.java b/api/src/main/java/com/faforever/commons/api/dto/FeaturedMod.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/FeaturedMod.java rename to api/src/main/java/com/faforever/commons/api/dto/FeaturedMod.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/FeaturedModFile.java b/api/src/main/java/com/faforever/commons/api/dto/FeaturedModFile.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/FeaturedModFile.java rename to api/src/main/java/com/faforever/commons/api/dto/FeaturedModFile.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Game.java b/api/src/main/java/com/faforever/commons/api/dto/Game.java similarity index 99% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Game.java rename to api/src/main/java/com/faforever/commons/api/dto/Game.java index dd8d2563..28e45d5c 100644 --- a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Game.java +++ b/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) diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GameOutcome.java b/api/src/main/java/com/faforever/commons/api/dto/GameOutcome.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GameOutcome.java rename to api/src/main/java/com/faforever/commons/api/dto/GameOutcome.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GamePlayerStats.java b/api/src/main/java/com/faforever/commons/api/dto/GamePlayerStats.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GamePlayerStats.java rename to api/src/main/java/com/faforever/commons/api/dto/GamePlayerStats.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GameReview.java b/api/src/main/java/com/faforever/commons/api/dto/GameReview.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GameReview.java rename to api/src/main/java/com/faforever/commons/api/dto/GameReview.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GameReviewsSummary.java b/api/src/main/java/com/faforever/commons/api/dto/GameReviewsSummary.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GameReviewsSummary.java rename to api/src/main/java/com/faforever/commons/api/dto/GameReviewsSummary.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GlobalLeaderboardEntry.java b/api/src/main/java/com/faforever/commons/api/dto/GlobalLeaderboardEntry.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GlobalLeaderboardEntry.java rename to api/src/main/java/com/faforever/commons/api/dto/GlobalLeaderboardEntry.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GlobalRating.java b/api/src/main/java/com/faforever/commons/api/dto/GlobalRating.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GlobalRating.java rename to api/src/main/java/com/faforever/commons/api/dto/GlobalRating.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/GroupPermission.java b/api/src/main/java/com/faforever/commons/api/dto/GroupPermission.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/GroupPermission.java rename to api/src/main/java/com/faforever/commons/api/dto/GroupPermission.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Ladder1v1LeaderboardEntry.java b/api/src/main/java/com/faforever/commons/api/dto/Ladder1v1LeaderboardEntry.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Ladder1v1LeaderboardEntry.java rename to api/src/main/java/com/faforever/commons/api/dto/Ladder1v1LeaderboardEntry.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Map.java b/api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Map.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Map.java rename to api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Map.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Rating.java b/api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Rating.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Rating.java rename to api/src/main/java/com/faforever/commons/api/dto/Ladder1v1Rating.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Leaderboard.java b/api/src/main/java/com/faforever/commons/api/dto/Leaderboard.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Leaderboard.java rename to api/src/main/java/com/faforever/commons/api/dto/Leaderboard.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeaderboardEntry.java b/api/src/main/java/com/faforever/commons/api/dto/LeaderboardEntry.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeaderboardEntry.java rename to api/src/main/java/com/faforever/commons/api/dto/LeaderboardEntry.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeaderboardRatingJournal.java b/api/src/main/java/com/faforever/commons/api/dto/LeaderboardRatingJournal.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeaderboardRatingJournal.java rename to api/src/main/java/com/faforever/commons/api/dto/LeaderboardRatingJournal.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/League.java b/api/src/main/java/com/faforever/commons/api/dto/League.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/League.java rename to api/src/main/java/com/faforever/commons/api/dto/League.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueLeaderboard.java b/api/src/main/java/com/faforever/commons/api/dto/LeagueLeaderboard.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueLeaderboard.java rename to api/src/main/java/com/faforever/commons/api/dto/LeagueLeaderboard.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueScoreJournal.java b/api/src/main/java/com/faforever/commons/api/dto/LeagueScoreJournal.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueScoreJournal.java rename to api/src/main/java/com/faforever/commons/api/dto/LeagueScoreJournal.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeason.java b/api/src/main/java/com/faforever/commons/api/dto/LeagueSeason.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeason.java rename to api/src/main/java/com/faforever/commons/api/dto/LeagueSeason.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivision.java b/api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivision.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivision.java rename to api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivision.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivisionSubdivision.java b/api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivisionSubdivision.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivisionSubdivision.java rename to api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonDivisionSubdivision.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonScore.java b/api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonScore.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonScore.java rename to api/src/main/java/com/faforever/commons/api/dto/LeagueSeasonScore.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LegacyAccessLevel.java b/api/src/main/java/com/faforever/commons/api/dto/LegacyAccessLevel.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LegacyAccessLevel.java rename to api/src/main/java/com/faforever/commons/api/dto/LegacyAccessLevel.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/License.java b/api/src/main/java/com/faforever/commons/api/dto/License.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/License.java rename to api/src/main/java/com/faforever/commons/api/dto/License.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LinkedServiceType.java b/api/src/main/java/com/faforever/commons/api/dto/LinkedServiceType.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LinkedServiceType.java rename to api/src/main/java/com/faforever/commons/api/dto/LinkedServiceType.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/LobbyGroup.java b/api/src/main/java/com/faforever/commons/api/dto/LobbyGroup.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/LobbyGroup.java rename to api/src/main/java/com/faforever/commons/api/dto/LobbyGroup.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Map.java b/api/src/main/java/com/faforever/commons/api/dto/Map.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Map.java rename to api/src/main/java/com/faforever/commons/api/dto/Map.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapParams.java b/api/src/main/java/com/faforever/commons/api/dto/MapParams.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapParams.java rename to api/src/main/java/com/faforever/commons/api/dto/MapParams.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapPool.java b/api/src/main/java/com/faforever/commons/api/dto/MapPool.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapPool.java rename to api/src/main/java/com/faforever/commons/api/dto/MapPool.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapPoolAssignment.java b/api/src/main/java/com/faforever/commons/api/dto/MapPoolAssignment.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapPoolAssignment.java rename to api/src/main/java/com/faforever/commons/api/dto/MapPoolAssignment.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapReviewsSummary.java b/api/src/main/java/com/faforever/commons/api/dto/MapReviewsSummary.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapReviewsSummary.java rename to api/src/main/java/com/faforever/commons/api/dto/MapReviewsSummary.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapStatistics.java b/api/src/main/java/com/faforever/commons/api/dto/MapStatistics.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapStatistics.java rename to api/src/main/java/com/faforever/commons/api/dto/MapStatistics.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersion.java b/api/src/main/java/com/faforever/commons/api/dto/MapVersion.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersion.java rename to api/src/main/java/com/faforever/commons/api/dto/MapVersion.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersionReview.java b/api/src/main/java/com/faforever/commons/api/dto/MapVersionReview.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersionReview.java rename to api/src/main/java/com/faforever/commons/api/dto/MapVersionReview.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersionReviewsSummary.java b/api/src/main/java/com/faforever/commons/api/dto/MapVersionReviewsSummary.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersionReviewsSummary.java rename to api/src/main/java/com/faforever/commons/api/dto/MapVersionReviewsSummary.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersionStatistics.java b/api/src/main/java/com/faforever/commons/api/dto/MapVersionStatistics.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MapVersionStatistics.java rename to api/src/main/java/com/faforever/commons/api/dto/MapVersionStatistics.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueue.java b/api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueue.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueue.java rename to api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueue.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java b/api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java rename to api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/MeResult.java b/api/src/main/java/com/faforever/commons/api/dto/MeResult.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/MeResult.java rename to api/src/main/java/com/faforever/commons/api/dto/MeResult.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Message.java b/api/src/main/java/com/faforever/commons/api/dto/Message.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Message.java rename to api/src/main/java/com/faforever/commons/api/dto/Message.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Mod.java b/api/src/main/java/com/faforever/commons/api/dto/Mod.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Mod.java rename to api/src/main/java/com/faforever/commons/api/dto/Mod.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModReviewsSummary.java b/api/src/main/java/com/faforever/commons/api/dto/ModReviewsSummary.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModReviewsSummary.java rename to api/src/main/java/com/faforever/commons/api/dto/ModReviewsSummary.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModType.java b/api/src/main/java/com/faforever/commons/api/dto/ModType.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModType.java rename to api/src/main/java/com/faforever/commons/api/dto/ModType.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModVersion.java b/api/src/main/java/com/faforever/commons/api/dto/ModVersion.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModVersion.java rename to api/src/main/java/com/faforever/commons/api/dto/ModVersion.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModVersionReview.java b/api/src/main/java/com/faforever/commons/api/dto/ModVersionReview.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModVersionReview.java rename to api/src/main/java/com/faforever/commons/api/dto/ModVersionReview.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModVersionReviewsSummary.java b/api/src/main/java/com/faforever/commons/api/dto/ModVersionReviewsSummary.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModVersionReviewsSummary.java rename to api/src/main/java/com/faforever/commons/api/dto/ModVersionReviewsSummary.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModerationReport.java b/api/src/main/java/com/faforever/commons/api/dto/ModerationReport.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModerationReport.java rename to api/src/main/java/com/faforever/commons/api/dto/ModerationReport.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModerationReportStatus.java b/api/src/main/java/com/faforever/commons/api/dto/ModerationReportStatus.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ModerationReportStatus.java rename to api/src/main/java/com/faforever/commons/api/dto/ModerationReportStatus.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/NameRecord.java b/api/src/main/java/com/faforever/commons/api/dto/NameRecord.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/NameRecord.java rename to api/src/main/java/com/faforever/commons/api/dto/NameRecord.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/NeroxisGeneratorParams.java b/api/src/main/java/com/faforever/commons/api/dto/NeroxisGeneratorParams.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/NeroxisGeneratorParams.java rename to api/src/main/java/com/faforever/commons/api/dto/NeroxisGeneratorParams.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Player.java b/api/src/main/java/com/faforever/commons/api/dto/Player.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Player.java rename to api/src/main/java/com/faforever/commons/api/dto/Player.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/PlayerAchievement.java b/api/src/main/java/com/faforever/commons/api/dto/PlayerAchievement.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/PlayerAchievement.java rename to api/src/main/java/com/faforever/commons/api/dto/PlayerAchievement.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/PlayerEvent.java b/api/src/main/java/com/faforever/commons/api/dto/PlayerEvent.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/PlayerEvent.java rename to api/src/main/java/com/faforever/commons/api/dto/PlayerEvent.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Rating.java b/api/src/main/java/com/faforever/commons/api/dto/Rating.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Rating.java rename to api/src/main/java/com/faforever/commons/api/dto/Rating.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/RestrictedVisibility.java b/api/src/main/java/com/faforever/commons/api/dto/RestrictedVisibility.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/RestrictedVisibility.java rename to api/src/main/java/com/faforever/commons/api/dto/RestrictedVisibility.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Review.java b/api/src/main/java/com/faforever/commons/api/dto/Review.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Review.java rename to api/src/main/java/com/faforever/commons/api/dto/Review.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/ReviewsSummary.java b/api/src/main/java/com/faforever/commons/api/dto/ReviewsSummary.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/ReviewsSummary.java rename to api/src/main/java/com/faforever/commons/api/dto/ReviewsSummary.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Teamkill.java b/api/src/main/java/com/faforever/commons/api/dto/Teamkill.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Teamkill.java rename to api/src/main/java/com/faforever/commons/api/dto/Teamkill.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/TeamkillReport.java b/api/src/main/java/com/faforever/commons/api/dto/TeamkillReport.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/TeamkillReport.java rename to api/src/main/java/com/faforever/commons/api/dto/TeamkillReport.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Tournament.java b/api/src/main/java/com/faforever/commons/api/dto/Tournament.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Tournament.java rename to api/src/main/java/com/faforever/commons/api/dto/Tournament.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Tutorial.java b/api/src/main/java/com/faforever/commons/api/dto/Tutorial.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Tutorial.java rename to api/src/main/java/com/faforever/commons/api/dto/Tutorial.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/TutorialCategory.java b/api/src/main/java/com/faforever/commons/api/dto/TutorialCategory.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/TutorialCategory.java rename to api/src/main/java/com/faforever/commons/api/dto/TutorialCategory.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/UniqueId.java b/api/src/main/java/com/faforever/commons/api/dto/UniqueId.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/UniqueId.java rename to api/src/main/java/com/faforever/commons/api/dto/UniqueId.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/UserGroup.java b/api/src/main/java/com/faforever/commons/api/dto/UserGroup.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/UserGroup.java rename to api/src/main/java/com/faforever/commons/api/dto/UserGroup.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/UserNote.java b/api/src/main/java/com/faforever/commons/api/dto/UserNote.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/UserNote.java rename to api/src/main/java/com/faforever/commons/api/dto/UserNote.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Validity.java b/api/src/main/java/com/faforever/commons/api/dto/Validity.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Validity.java rename to api/src/main/java/com/faforever/commons/api/dto/Validity.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/VictoryCondition.java b/api/src/main/java/com/faforever/commons/api/dto/VictoryCondition.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/VictoryCondition.java rename to api/src/main/java/com/faforever/commons/api/dto/VictoryCondition.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/Vote.java b/api/src/main/java/com/faforever/commons/api/dto/Vote.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/Vote.java rename to api/src/main/java/com/faforever/commons/api/dto/Vote.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingAnswer.java b/api/src/main/java/com/faforever/commons/api/dto/VotingAnswer.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingAnswer.java rename to api/src/main/java/com/faforever/commons/api/dto/VotingAnswer.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingChoice.java b/api/src/main/java/com/faforever/commons/api/dto/VotingChoice.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingChoice.java rename to api/src/main/java/com/faforever/commons/api/dto/VotingChoice.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingQuestion.java b/api/src/main/java/com/faforever/commons/api/dto/VotingQuestion.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingQuestion.java rename to api/src/main/java/com/faforever/commons/api/dto/VotingQuestion.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingSubject.java b/api/src/main/java/com/faforever/commons/api/dto/VotingSubject.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/dto/VotingSubject.java rename to api/src/main/java/com/faforever/commons/api/dto/VotingSubject.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideEndpointBuilder.java b/api/src/main/java/com/faforever/commons/api/elide/ElideEndpointBuilder.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideEndpointBuilder.java rename to api/src/main/java/com/faforever/commons/api/elide/ElideEndpointBuilder.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideEntity.java b/api/src/main/java/com/faforever/commons/api/elide/ElideEntity.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideEntity.java rename to api/src/main/java/com/faforever/commons/api/elide/ElideEntity.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigator.java b/api/src/main/java/com/faforever/commons/api/elide/ElideNavigator.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigator.java rename to api/src/main/java/com/faforever/commons/api/elide/ElideNavigator.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnCollection.java b/api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnCollection.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnCollection.java rename to api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnCollection.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnId.java b/api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnId.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnId.java rename to api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorOnId.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorSelector.java b/api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorSelector.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorSelector.java rename to api/src/main/java/com/faforever/commons/api/elide/ElideNavigatorSelector.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/update/AvatarAssignmentUpdate.java b/api/src/main/java/com/faforever/commons/api/update/AvatarAssignmentUpdate.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/update/AvatarAssignmentUpdate.java rename to api/src/main/java/com/faforever/commons/api/update/AvatarAssignmentUpdate.java diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/update/UpdateDto.java b/api/src/main/java/com/faforever/commons/api/update/UpdateDto.java similarity index 100% rename from faf-commons-api/src/main/java/com/faforever/commons/api/update/UpdateDto.java rename to api/src/main/java/com/faforever/commons/api/update/UpdateDto.java diff --git a/faf-commons-api/src/test/java/com/faforever/commons/api/AllDtoTest.java b/api/src/test/java/com/faforever/commons/api/AllDtoTest.java similarity index 100% rename from faf-commons-api/src/test/java/com/faforever/commons/api/AllDtoTest.java rename to api/src/test/java/com/faforever/commons/api/AllDtoTest.java diff --git a/faf-commons-api/src/test/java/com/faforever/commons/api/dto/TutorialTest.java b/api/src/test/java/com/faforever/commons/api/dto/TutorialTest.java similarity index 100% rename from faf-commons-api/src/test/java/com/faforever/commons/api/dto/TutorialTest.java rename to api/src/test/java/com/faforever/commons/api/dto/TutorialTest.java diff --git a/faf-commons-api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java b/api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java similarity index 99% rename from faf-commons-api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java rename to api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java index 870d0e47..d13dac44 100644 --- a/faf-commons-api/src/test/java/com/faforever/commons/api/elide/ElideNavigatorTest.java +++ b/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; diff --git a/faf-commons-data/build.gradle.kts b/data/build.gradle.kts similarity index 96% rename from faf-commons-data/build.gradle.kts rename to data/build.gradle.kts index 258ee48e..219fc406 100644 --- a/faf-commons-data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,5 +1,3 @@ -version = "1.0-SNAPSHOT" - java { sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 diff --git a/faf-commons-data/src/main/java/com/faforever/commons/fa/ForgedAllianceExePatcher.java b/data/src/main/java/com/faforever/commons/fa/ForgedAllianceExePatcher.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/fa/ForgedAllianceExePatcher.java rename to data/src/main/java/com/faforever/commons/fa/ForgedAllianceExePatcher.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/ByteCopier.java b/data/src/main/java/com/faforever/commons/io/ByteCopier.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/io/ByteCopier.java rename to data/src/main/java/com/faforever/commons/io/ByteCopier.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/ByteCountListener.java b/data/src/main/java/com/faforever/commons/io/ByteCountListener.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/io/ByteCountListener.java rename to data/src/main/java/com/faforever/commons/io/ByteCountListener.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/Bytes.java b/data/src/main/java/com/faforever/commons/io/Bytes.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/io/Bytes.java rename to data/src/main/java/com/faforever/commons/io/Bytes.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/Unzipper.java b/data/src/main/java/com/faforever/commons/io/Unzipper.java similarity index 96% rename from faf-commons-data/src/main/java/com/faforever/commons/io/Unzipper.java rename to data/src/main/java/com/faforever/commons/io/Unzipper.java index 3013c2ee..56c9f6a8 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/io/Unzipper.java +++ b/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 { diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/ZipBombException.java b/data/src/main/java/com/faforever/commons/io/ZipBombException.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/io/ZipBombException.java rename to data/src/main/java/com/faforever/commons/io/ZipBombException.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/ZipSlipException.java b/data/src/main/java/com/faforever/commons/io/ZipSlipException.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/io/ZipSlipException.java rename to data/src/main/java/com/faforever/commons/io/ZipSlipException.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/io/Zipper.java b/data/src/main/java/com/faforever/commons/io/Zipper.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/io/Zipper.java rename to data/src/main/java/com/faforever/commons/io/Zipper.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/lua/LuaAccessor.java b/data/src/main/java/com/faforever/commons/lua/LuaAccessor.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/lua/LuaAccessor.java rename to data/src/main/java/com/faforever/commons/lua/LuaAccessor.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/lua/LuaLoader.java b/data/src/main/java/com/faforever/commons/lua/LuaLoader.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/lua/LuaLoader.java rename to data/src/main/java/com/faforever/commons/lua/LuaLoader.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/map/MapData.java b/data/src/main/java/com/faforever/commons/map/MapData.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/map/MapData.java rename to data/src/main/java/com/faforever/commons/map/MapData.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/map/PreviewGenerator.java b/data/src/main/java/com/faforever/commons/map/PreviewGenerator.java similarity index 98% rename from faf-commons-data/src/main/java/com/faforever/commons/map/PreviewGenerator.java rename to data/src/main/java/com/faforever/commons/map/PreviewGenerator.java index b1a02951..428c8b0b 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/map/PreviewGenerator.java +++ b/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; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/mod/Mod.java b/data/src/main/java/com/faforever/commons/mod/Mod.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/mod/Mod.java rename to data/src/main/java/com/faforever/commons/mod/Mod.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/mod/ModLoadException.java b/data/src/main/java/com/faforever/commons/mod/ModLoadException.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/mod/ModLoadException.java rename to data/src/main/java/com/faforever/commons/mod/ModLoadException.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/mod/ModReader.java b/data/src/main/java/com/faforever/commons/mod/ModReader.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/mod/ModReader.java rename to data/src/main/java/com/faforever/commons/mod/ModReader.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/mod/MountInfo.java b/data/src/main/java/com/faforever/commons/mod/MountInfo.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/mod/MountInfo.java rename to data/src/main/java/com/faforever/commons/mod/MountInfo.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ChatMessage.java b/data/src/main/java/com/faforever/commons/replay/ChatMessage.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ChatMessage.java rename to data/src/main/java/com/faforever/commons/replay/ChatMessage.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/CompressionType.java b/data/src/main/java/com/faforever/commons/replay/CompressionType.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/CompressionType.java rename to data/src/main/java/com/faforever/commons/replay/CompressionType.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/GameOption.java b/data/src/main/java/com/faforever/commons/replay/GameOption.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/GameOption.java rename to data/src/main/java/com/faforever/commons/replay/GameOption.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/GameStatus.java b/data/src/main/java/com/faforever/commons/replay/GameStatus.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/GameStatus.java rename to data/src/main/java/com/faforever/commons/replay/GameStatus.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ModeratorEvent.java b/data/src/main/java/com/faforever/commons/replay/ModeratorEvent.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ModeratorEvent.java rename to data/src/main/java/com/faforever/commons/replay/ModeratorEvent.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/QtCompress.java b/data/src/main/java/com/faforever/commons/replay/QtCompress.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/QtCompress.java rename to data/src/main/java/com/faforever/commons/replay/QtCompress.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/RegisteredEvent.java b/data/src/main/java/com/faforever/commons/replay/RegisteredEvent.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/RegisteredEvent.java rename to data/src/main/java/com/faforever/commons/replay/RegisteredEvent.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayContainer.java b/data/src/main/java/com/faforever/commons/replay/ReplayContainer.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayContainer.java rename to data/src/main/java/com/faforever/commons/replay/ReplayContainer.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java b/data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java rename to data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java index f0074296..7e0fb3f2 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java +++ b/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; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayLoader.java b/data/src/main/java/com/faforever/commons/replay/ReplayLoader.java similarity index 96% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayLoader.java rename to data/src/main/java/com/faforever/commons/replay/ReplayLoader.java index 7cfba9ef..28b9358f 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayLoader.java +++ b/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; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayMetadata.java b/data/src/main/java/com/faforever/commons/replay/ReplayMetadata.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayMetadata.java rename to data/src/main/java/com/faforever/commons/replay/ReplayMetadata.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/ReplaySemantics.java b/data/src/main/java/com/faforever/commons/replay/ReplaySemantics.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/ReplaySemantics.java rename to data/src/main/java/com/faforever/commons/replay/ReplaySemantics.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/VictoryCondition.java b/data/src/main/java/com/faforever/commons/replay/VictoryCondition.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/VictoryCondition.java rename to data/src/main/java/com/faforever/commons/replay/VictoryCondition.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/Event.java b/data/src/main/java/com/faforever/commons/replay/body/Event.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/body/Event.java rename to data/src/main/java/com/faforever/commons/replay/body/Event.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/EventCommandType.java b/data/src/main/java/com/faforever/commons/replay/body/EventCommandType.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/body/EventCommandType.java rename to data/src/main/java/com/faforever/commons/replay/body/EventCommandType.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java b/data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java similarity index 99% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java rename to data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java index 3ffb38af..6f84e98d 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java +++ b/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 { diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyToken.java b/data/src/main/java/com/faforever/commons/replay/body/ReplayBodyToken.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyToken.java rename to data/src/main/java/com/faforever/commons/replay/body/ReplayBodyToken.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java b/data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java similarity index 94% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java rename to data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java index 026eefe8..59578d82 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyTokenizer.java +++ b/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 { diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameMod.java b/data/src/main/java/com/faforever/commons/replay/header/GameMod.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameMod.java rename to data/src/main/java/com/faforever/commons/replay/header/GameMod.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameOptions.java b/data/src/main/java/com/faforever/commons/replay/header/GameOptions.java similarity index 99% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameOptions.java rename to data/src/main/java/com/faforever/commons/replay/header/GameOptions.java index 6907d697..7fb21e40 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameOptions.java +++ b/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` * diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameScenario.java b/data/src/main/java/com/faforever/commons/replay/header/GameScenario.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameScenario.java rename to data/src/main/java/com/faforever/commons/replay/header/GameScenario.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/PlayerOptions.java b/data/src/main/java/com/faforever/commons/replay/header/PlayerOptions.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/PlayerOptions.java rename to data/src/main/java/com/faforever/commons/replay/header/PlayerOptions.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeader.java b/data/src/main/java/com/faforever/commons/replay/header/ReplayHeader.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeader.java rename to data/src/main/java/com/faforever/commons/replay/header/ReplayHeader.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java b/data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java similarity index 99% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java rename to data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java index 24f5fa45..c9e37c57 100644 --- a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java +++ b/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; diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/Source.java b/data/src/main/java/com/faforever/commons/replay/header/Source.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/header/Source.java rename to data/src/main/java/com/faforever/commons/replay/header/Source.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/shared/LoadUtils.java b/data/src/main/java/com/faforever/commons/replay/shared/LoadUtils.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/shared/LoadUtils.java rename to data/src/main/java/com/faforever/commons/replay/shared/LoadUtils.java diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/shared/LuaData.java b/data/src/main/java/com/faforever/commons/replay/shared/LuaData.java similarity index 100% rename from faf-commons-data/src/main/java/com/faforever/commons/replay/shared/LuaData.java rename to data/src/main/java/com/faforever/commons/replay/shared/LuaData.java diff --git a/faf-commons-data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java similarity index 98% rename from faf-commons-data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java rename to data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 4c02489d..1baa8fca 100644 --- a/faf-commons-data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/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. diff --git a/faf-commons-data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersionDeserializer.java b/data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersionDeserializer.java similarity index 100% rename from faf-commons-data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersionDeserializer.java rename to data/src/main/java/org/apache/maven/artifact/versioning/ComparableVersionDeserializer.java diff --git a/faf-commons-data/src/main/resources/lua/faf.lua b/data/src/main/resources/lua/faf.lua similarity index 100% rename from faf-commons-data/src/main/resources/lua/faf.lua rename to data/src/main/resources/lua/faf.lua diff --git a/faf-commons-data/src/test/java/com/faforever/commons/fa/ForgedAllianceExePatcherTest.java b/data/src/test/java/com/faforever/commons/fa/ForgedAllianceExePatcherTest.java similarity index 100% rename from faf-commons-data/src/test/java/com/faforever/commons/fa/ForgedAllianceExePatcherTest.java rename to data/src/test/java/com/faforever/commons/fa/ForgedAllianceExePatcherTest.java diff --git a/faf-commons-data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java b/data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java similarity index 91% rename from faf-commons-data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java rename to data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java index 05424e70..6d9170ab 100644 --- a/faf-commons-data/src/test/java/com/faforever/commons/io/ZipperAndUnzipperTest.java +++ b/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 { diff --git a/faf-commons-data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java b/data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java similarity index 94% rename from faf-commons-data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java rename to data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java index d87ab0a5..aca57e5d 100644 --- a/faf-commons-data/src/test/java/com/faforever/commons/lua/LuaAccessorTest.java +++ b/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; diff --git a/faf-commons-data/src/test/java/com/faforever/commons/mod/ModReaderTest.java b/data/src/test/java/com/faforever/commons/mod/ModReaderTest.java similarity index 96% rename from faf-commons-data/src/test/java/com/faforever/commons/mod/ModReaderTest.java rename to data/src/test/java/com/faforever/commons/mod/ModReaderTest.java index 60c73ff9..6f01ce3d 100644 --- a/faf-commons-data/src/test/java/com/faforever/commons/mod/ModReaderTest.java +++ b/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 { diff --git a/faf-commons-data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java b/data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java similarity index 99% rename from faf-commons-data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java rename to data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java index d2ee5e77..4b52cc09 100644 --- a/faf-commons-data/src/test/java/com/faforever/commons/replay/LoadReplayLoaderTest.java +++ b/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 { diff --git a/faf-commons-data/src/test/java/com/faforever/commons/replay/QtCompressTest.java b/data/src/test/java/com/faforever/commons/replay/QtCompressTest.java similarity index 100% rename from faf-commons-data/src/test/java/com/faforever/commons/replay/QtCompressTest.java rename to data/src/test/java/com/faforever/commons/replay/QtCompressTest.java diff --git a/faf-commons-data/src/test/java/com/faforever/commons/replay/ReplayLoaderTableParserTest.java b/data/src/test/java/com/faforever/commons/replay/ReplayLoaderTableParserTest.java similarity index 100% rename from faf-commons-data/src/test/java/com/faforever/commons/replay/ReplayLoaderTableParserTest.java rename to data/src/test/java/com/faforever/commons/replay/ReplayLoaderTableParserTest.java diff --git a/faf-commons-data/src/test/java/com/faforever/commons/test/IsUtilityClassMatcher.java b/data/src/test/java/com/faforever/commons/test/IsUtilityClassMatcher.java similarity index 100% rename from faf-commons-data/src/test/java/com/faforever/commons/test/IsUtilityClassMatcher.java rename to data/src/test/java/com/faforever/commons/test/IsUtilityClassMatcher.java diff --git a/faf-commons-data/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/data/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java similarity index 100% rename from faf-commons-data/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java rename to data/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java diff --git a/faf-commons-data/src/test/resources/lua/empty.txt b/data/src/test/resources/lua/empty.txt similarity index 100% rename from faf-commons-data/src/test/resources/lua/empty.txt rename to data/src/test/resources/lua/empty.txt diff --git a/faf-commons-data/src/test/resources/lua/map_scenario.lua b/data/src/test/resources/lua/map_scenario.lua similarity index 100% rename from faf-commons-data/src/test/resources/lua/map_scenario.lua rename to data/src/test/resources/lua/map_scenario.lua diff --git a/faf-commons-data/src/test/resources/lua/wrong_version.lua b/data/src/test/resources/lua/wrong_version.lua similarity index 100% rename from faf-commons-data/src/test/resources/lua/wrong_version.lua rename to data/src/test/resources/lua/wrong_version.lua diff --git a/faf-commons-data/src/test/resources/mod/mod-with-url.lua b/data/src/test/resources/mod/mod-with-url.lua similarity index 100% rename from faf-commons-data/src/test/resources/mod/mod-with-url.lua rename to data/src/test/resources/mod/mod-with-url.lua diff --git a/faf-commons-data/src/test/resources/replay/TestCommands01.fafreplay b/data/src/test/resources/replay/TestCommands01.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/TestCommands01.fafreplay rename to data/src/test/resources/replay/TestCommands01.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/TestModeratorEvents.fafreplay b/data/src/test/resources/replay/TestModeratorEvents.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/TestModeratorEvents.fafreplay rename to data/src/test/resources/replay/TestModeratorEvents.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/bad_base64.fafreplay b/data/src/test/resources/replay/bad_base64.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/bad_base64.fafreplay rename to data/src/test/resources/replay/bad_base64.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/bad_compression_type.fafreplay b/data/src/test/resources/replay/bad_compression_type.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/bad_compression_type.fafreplay rename to data/src/test/resources/replay/bad_compression_type.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/bad_json.fafreplay b/data/src/test/resources/replay/bad_json.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/bad_json.fafreplay rename to data/src/test/resources/replay/bad_json.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/bad_nonewline.fafreplay b/data/src/test/resources/replay/bad_nonewline.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/bad_nonewline.fafreplay rename to data/src/test/resources/replay/bad_nonewline.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/bad_unknown_compression.fafreplay b/data/src/test/resources/replay/bad_unknown_compression.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/bad_unknown_compression.fafreplay rename to data/src/test/resources/replay/bad_unknown_compression.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/load/22338092.fafreplay b/data/src/test/resources/replay/load/22338092.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22338092.fafreplay rename to data/src/test/resources/replay/load/22338092.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/load/22338092.scfareplay b/data/src/test/resources/replay/load/22338092.scfareplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22338092.scfareplay rename to data/src/test/resources/replay/load/22338092.scfareplay diff --git a/faf-commons-data/src/test/resources/replay/load/22373098.fafreplay b/data/src/test/resources/replay/load/22373098.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22373098.fafreplay rename to data/src/test/resources/replay/load/22373098.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/load/22373098.scfareplay b/data/src/test/resources/replay/load/22373098.scfareplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22373098.scfareplay rename to data/src/test/resources/replay/load/22373098.scfareplay diff --git a/faf-commons-data/src/test/resources/replay/load/22425616.fafreplay b/data/src/test/resources/replay/load/22425616.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22425616.fafreplay rename to data/src/test/resources/replay/load/22425616.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/load/22425616.scfareplay b/data/src/test/resources/replay/load/22425616.scfareplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22425616.scfareplay rename to data/src/test/resources/replay/load/22425616.scfareplay diff --git a/faf-commons-data/src/test/resources/replay/load/22451957.fafreplay b/data/src/test/resources/replay/load/22451957.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22451957.fafreplay rename to data/src/test/resources/replay/load/22451957.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/load/22453414.fafreplay b/data/src/test/resources/replay/load/22453414.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22453414.fafreplay rename to data/src/test/resources/replay/load/22453414.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/load/22453511.fafreplay b/data/src/test/resources/replay/load/22453511.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/load/22453511.fafreplay rename to data/src/test/resources/replay/load/22453511.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/mods.fafreplay b/data/src/test/resources/replay/mods.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/mods.fafreplay rename to data/src/test/resources/replay/mods.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/test.fafreplay b/data/src/test/resources/replay/test.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/test.fafreplay rename to data/src/test/resources/replay/test.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/test.raw b/data/src/test/resources/replay/test.raw similarity index 100% rename from faf-commons-data/src/test/resources/replay/test.raw rename to data/src/test/resources/replay/test.raw diff --git a/faf-commons-data/src/test/resources/replay/zstd_reference.fafreplay b/data/src/test/resources/replay/zstd_reference.fafreplay similarity index 100% rename from faf-commons-data/src/test/resources/replay/zstd_reference.fafreplay rename to data/src/test/resources/replay/zstd_reference.fafreplay diff --git a/faf-commons-data/src/test/resources/replay/zstd_reference.raw b/data/src/test/resources/replay/zstd_reference.raw similarity index 100% rename from faf-commons-data/src/test/resources/replay/zstd_reference.raw rename to data/src/test/resources/replay/zstd_reference.raw diff --git a/faf-commons-data/src/test/resources/zip/normal_zip.zip b/data/src/test/resources/zip/normal_zip.zip similarity index 100% rename from faf-commons-data/src/test/resources/zip/normal_zip.zip rename to data/src/test/resources/zip/normal_zip.zip diff --git a/faf-commons-data/src/test/resources/zip/slip_zip.zip b/data/src/test/resources/zip/slip_zip.zip similarity index 100% rename from faf-commons-data/src/test/resources/zip/slip_zip.zip rename to data/src/test/resources/zip/slip_zip.zip diff --git a/faf-commons-data/src/test/resources/zip/zip_bomb.zip b/data/src/test/resources/zip/zip_bomb.zip similarity index 100% rename from faf-commons-data/src/test/resources/zip/zip_bomb.zip rename to data/src/test/resources/zip/zip_bomb.zip diff --git a/faf-commons-lobby/build.gradle.kts b/lobby/build.gradle.kts similarity index 98% rename from faf-commons-lobby/build.gradle.kts rename to lobby/build.gradle.kts index 1c01982d..0ce62e6c 100644 --- a/faf-commons-lobby/build.gradle.kts +++ b/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) diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/AdminApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/AdminApi.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/AdminApi.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/AdminApi.kt diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/ConnectionApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/ConnectionApi.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/ConnectionApi.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/ConnectionApi.kt diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/GameApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/GameApi.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/GameApi.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/GameApi.kt diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt diff --git a/faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/SocialApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/SocialApi.kt similarity index 100% rename from faf-commons-lobby/src/main/kotlin/com/faforever/commons/lobby/SocialApi.kt rename to lobby/src/main/kotlin/com/faforever/commons/lobby/SocialApi.kt diff --git a/faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt b/lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt similarity index 98% rename from faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt rename to lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt index 970085eb..09ca7c4d 100644 --- a/faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/ClientMessageTest.kt +++ b/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()) } diff --git a/faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/LobbyClientTest.kt b/lobby/src/test/kotlin/com/faforever/commons/lobby/LobbyClientTest.kt similarity index 100% rename from faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/LobbyClientTest.kt rename to lobby/src/test/kotlin/com/faforever/commons/lobby/LobbyClientTest.kt diff --git a/faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/ServerMessageTest.kt b/lobby/src/test/kotlin/com/faforever/commons/lobby/ServerMessageTest.kt similarity index 100% rename from faf-commons-lobby/src/test/kotlin/com/faforever/commons/lobby/ServerMessageTest.kt rename to lobby/src/test/kotlin/com/faforever/commons/lobby/ServerMessageTest.kt diff --git a/settings.gradle b/settings.gradle index 11cbbb00..2d9f0120 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -include(":faf-commons-api") -include(":faf-commons-data") -include(":faf-commons-lobby") +include(":api") +include(":data") +include(":lobby")