From b1151b6ca0e51966a4ec24974a3ed82adf66f567 Mon Sep 17 00:00:00 2001 From: Dan Van Atta Date: Mon, 29 Jul 2024 11:54:53 -0700 Subject: [PATCH] Move ClientIdentifiers.java to 'lobby-client' so shared code can read it (#12793) This update consolidates http-client-lib stuff. This is so we can then read that shared code from the lobby-server, which will allow us to re-enable the error reporting endpoints --- game-app/game-core/build.gradle | 2 -- .../engine/framework/map/listing/MapListingFetcher.java | 2 +- game-app/game-headed/build.gradle | 2 -- .../main/java/games/strategy/triplea/ui/menubar/LobbyMenu.java | 2 +- http-clients/game-support-server/build.gradle | 1 - .../main/java/org/triplea/http/client}/ClientIdentifiers.java | 2 +- .../org/triplea/http/client/maps/admin/MapTagAdminClient.java | 2 +- .../java/org/triplea/http/client/maps/admin/MapTagMetaData.java | 0 .../org/triplea/http/client/maps/admin/UpdateMapTagRequest.java | 0 .../org/triplea/http/client/maps/listing/MapDownloadItem.java | 0 .../main/java/org/triplea/http/client/maps/listing/MapTag.java | 0 .../java/org/triplea/http/client/maps/listing/MapsClient.java | 2 +- http-clients/maps-server/build.gradle | 1 - settings.gradle | 2 -- 14 files changed, 5 insertions(+), 13 deletions(-) rename {lib/http-client-lib/src/main/java/org/triplea/http/client/lib => http-clients/lobby-client/src/main/java/org/triplea/http/client}/ClientIdentifiers.java (95%) rename http-clients/{maps-server => lobby-client}/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java (94%) rename http-clients/{maps-server => lobby-client}/src/main/java/org/triplea/http/client/maps/admin/MapTagMetaData.java (100%) rename http-clients/{maps-server => lobby-client}/src/main/java/org/triplea/http/client/maps/admin/UpdateMapTagRequest.java (100%) rename http-clients/{maps-server => lobby-client}/src/main/java/org/triplea/http/client/maps/listing/MapDownloadItem.java (100%) rename http-clients/{maps-server => lobby-client}/src/main/java/org/triplea/http/client/maps/listing/MapTag.java (100%) rename http-clients/{maps-server => lobby-client}/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java (93%) diff --git a/game-app/game-core/build.gradle b/game-app/game-core/build.gradle index bf8f2c2cf7..5f967bef42 100644 --- a/game-app/game-core/build.gradle +++ b/game-app/game-core/build.gradle @@ -3,8 +3,6 @@ dependencies { implementation project(":game-app:map-data") implementation project(":game-app:game-relay-server") implementation project(":http-clients:lobby-client") - implementation project(":http-clients:maps-server") - implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") implementation project(":lib:swing-lib") implementation project(":lib:websocket-client") diff --git a/game-app/game-core/src/main/java/games/strategy/engine/framework/map/listing/MapListingFetcher.java b/game-app/game-core/src/main/java/games/strategy/engine/framework/map/listing/MapListingFetcher.java index 693cb8dfdb..fef2d8522e 100644 --- a/game-app/game-core/src/main/java/games/strategy/engine/framework/map/listing/MapListingFetcher.java +++ b/game-app/game-core/src/main/java/games/strategy/engine/framework/map/listing/MapListingFetcher.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.triplea.config.product.ProductVersionReader; import org.triplea.domain.data.SystemIdLoader; -import org.triplea.http.client.lib.ClientIdentifiers; +import org.triplea.http.client.ClientIdentifiers; import org.triplea.http.client.maps.listing.MapDownloadItem; import org.triplea.http.client.maps.listing.MapsClient; diff --git a/game-app/game-headed/build.gradle b/game-app/game-headed/build.gradle index 785d379827..8f9f8f96f9 100644 --- a/game-app/game-headed/build.gradle +++ b/game-app/game-headed/build.gradle @@ -19,9 +19,7 @@ dependencies { implementation project(":game-app:game-core") implementation project(":game-app:map-data") implementation project(":http-clients:lobby-client") - implementation project(":http-clients:maps-server") implementation project(":lib:feign-common") - implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") implementation project(":lib:swing-lib") implementation project(":lib:websocket-client") diff --git a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/LobbyMenu.java b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/LobbyMenu.java index 5c5ac7d682..0a765fe926 100644 --- a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/LobbyMenu.java +++ b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/LobbyMenu.java @@ -12,7 +12,7 @@ import javax.swing.JMenuBar; import org.triplea.config.product.ProductVersionReader; import org.triplea.domain.data.SystemIdLoader; -import org.triplea.http.client.lib.ClientIdentifiers; +import org.triplea.http.client.ClientIdentifiers; import org.triplea.http.client.maps.admin.MapTagAdminClient; import org.triplea.http.client.maps.listing.MapsClient; import org.triplea.http.client.web.socket.client.connections.PlayerToLobbyConnection; diff --git a/http-clients/game-support-server/build.gradle b/http-clients/game-support-server/build.gradle index 4be1abf70c..a855d6c0e4 100644 --- a/http-clients/game-support-server/build.gradle +++ b/http-clients/game-support-server/build.gradle @@ -2,7 +2,6 @@ dependencies { implementation "io.github.openfeign:feign-core:$feignVersion" implementation "io.github.openfeign:feign-gson:$feignVersion" implementation project(":lib:feign-common") - implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") testImplementation "ru.lanwen.wiremock:wiremock-junit5:$wireMockJunit5Version" testImplementation project(":lib:test-common") diff --git a/lib/http-client-lib/src/main/java/org/triplea/http/client/lib/ClientIdentifiers.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/ClientIdentifiers.java similarity index 95% rename from lib/http-client-lib/src/main/java/org/triplea/http/client/lib/ClientIdentifiers.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/ClientIdentifiers.java index 2a9a12b990..aa6638ad1e 100644 --- a/lib/http-client-lib/src/main/java/org/triplea/http/client/lib/ClientIdentifiers.java +++ b/http-clients/lobby-client/src/main/java/org/triplea/http/client/ClientIdentifiers.java @@ -1,4 +1,4 @@ -package org.triplea.http.client.lib; +package org.triplea.http.client; import java.util.HashMap; import java.util.Map; diff --git a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java similarity index 94% rename from http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java index 1a65fa41ca..10c512c866 100644 --- a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java +++ b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java @@ -3,9 +3,9 @@ import feign.RequestLine; import java.net.URI; import java.util.List; +import org.triplea.http.client.ClientIdentifiers; import org.triplea.http.client.GenericServerResponse; import org.triplea.http.client.HttpClient; -import org.triplea.http.client.lib.ClientIdentifiers; /** Http client for 'map tag' administrative functionality. EG: updating a maps tag value. */ public interface MapTagAdminClient { diff --git a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/MapTagMetaData.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/MapTagMetaData.java similarity index 100% rename from http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/MapTagMetaData.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/MapTagMetaData.java diff --git a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/UpdateMapTagRequest.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/UpdateMapTagRequest.java similarity index 100% rename from http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/UpdateMapTagRequest.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/admin/UpdateMapTagRequest.java diff --git a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapDownloadItem.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapDownloadItem.java similarity index 100% rename from http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapDownloadItem.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapDownloadItem.java diff --git a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapTag.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapTag.java similarity index 100% rename from http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapTag.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapTag.java diff --git a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java similarity index 93% rename from http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java rename to http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java index 93150be758..cd75e413b0 100644 --- a/http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java +++ b/http-clients/lobby-client/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java @@ -4,8 +4,8 @@ import feign.RequestLine; import java.net.URI; import java.util.List; +import org.triplea.http.client.ClientIdentifiers; import org.triplea.http.client.HttpClient; -import org.triplea.http.client.lib.ClientIdentifiers; /** * Http client to communicate with the maps server and get a listing of maps available for download. diff --git a/http-clients/maps-server/build.gradle b/http-clients/maps-server/build.gradle index fbeefc2643..1ab3df7f47 100644 --- a/http-clients/maps-server/build.gradle +++ b/http-clients/maps-server/build.gradle @@ -1,5 +1,4 @@ dependencies { implementation project(":lib:feign-common") - implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") } diff --git a/settings.gradle b/settings.gradle index 9932933019..03fad07d94 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,9 +9,7 @@ include 'game-app:map-data' include 'game-app:smoke-testing' //include 'http-clients:game-support-server' include 'http-clients:lobby-client' -include 'http-clients:maps-server' include 'lib:feign-common' -include 'lib:http-client-lib' include 'lib:java-extras' include 'lib:swing-lib' include 'lib:swing-lib-test-support'