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

@@ -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")

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;
 

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")

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;

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")

lib/http-client-lib/src/main/java/org/triplea/http/client/lib/ClientIdentifiers.java → 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;

http-clients/maps-server/src/main/java/org/triplea/http/client/maps/admin/MapTagAdminClient.java → 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 {

http-clients/maps-server/src/main/java/org/triplea/http/client/maps/listing/MapsClient.java → 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.

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")
 }

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'