From 375f381f358cbab3a3099a9c6fa8c72af15cdf7b Mon Sep 17 00:00:00 2001 From: DanVanAtta Date: Sat, 25 Nov 2023 14:49:23 -0800 Subject: [PATCH] Move sub-projects 'feign-common' & 'http-client-lib' to folder: 'lib/' --- game-app/game-headed/build.gradle | 2 +- http-clients/error-reporting-client/build.gradle | 4 ++-- http-clients/github-client/build.gradle | 2 +- http-clients/lobby-client/build.gradle | 2 +- {http-clients => lib}/feign-common/README.md | 0 {http-clients => lib}/feign-common/build.gradle | 0 .../java/org/triplea/http/client/GenericServerResponse.java | 0 .../src/main/java/org/triplea/http/client/HttpClient.java | 0 .../java/org/triplea/http/client/HttpClientConstants.java | 0 .../src/main/java/org/triplea/http/client/HttpConstants.java | 0 .../src/main/java/org/triplea/http/client/JsonDecoder.java | 0 .../src/main/java/org/triplea/http/client/JsonEncoder.java | 0 .../org/triplea/http/client/GenericServerResponseTest.java | 0 .../test/java/org/triplea/http/client/JsonDecoderTest.java | 0 .../test/java/org/triplea/http/client/JsonEncoderTest.java | 0 .../src/test/java/org/triplea/http/client/README.md | 0 .../feign-common/src/test/resources/logback-test.xml | 0 {http-clients => lib}/http-client-lib/build.gradle | 0 .../java/org/triplea/http/client/lib/HttpClientHeaders.java | 0 lib/websocket-server/build.gradle | 2 +- servers/error-reporting/build.gradle | 2 +- settings.gradle | 4 ++-- spitfire-server/dropwizard-server/build.gradle | 2 +- spitfire-server/latest-version-module/build.gradle | 2 +- spitfire-server/lobby-module/build.gradle | 4 ++-- 25 files changed, 13 insertions(+), 13 deletions(-) rename {http-clients => lib}/feign-common/README.md (100%) rename {http-clients => lib}/feign-common/build.gradle (100%) rename {http-clients => lib}/feign-common/src/main/java/org/triplea/http/client/GenericServerResponse.java (100%) rename {http-clients => lib}/feign-common/src/main/java/org/triplea/http/client/HttpClient.java (100%) rename {http-clients => lib}/feign-common/src/main/java/org/triplea/http/client/HttpClientConstants.java (100%) rename {http-clients => lib}/feign-common/src/main/java/org/triplea/http/client/HttpConstants.java (100%) rename {http-clients => lib}/feign-common/src/main/java/org/triplea/http/client/JsonDecoder.java (100%) rename {http-clients => lib}/feign-common/src/main/java/org/triplea/http/client/JsonEncoder.java (100%) rename {http-clients => lib}/feign-common/src/test/java/org/triplea/http/client/GenericServerResponseTest.java (100%) rename {http-clients => lib}/feign-common/src/test/java/org/triplea/http/client/JsonDecoderTest.java (100%) rename {http-clients => lib}/feign-common/src/test/java/org/triplea/http/client/JsonEncoderTest.java (100%) rename {http-clients => lib}/feign-common/src/test/java/org/triplea/http/client/README.md (100%) rename {http-clients => lib}/feign-common/src/test/resources/logback-test.xml (100%) rename {http-clients => lib}/http-client-lib/build.gradle (100%) rename {http-clients => lib}/http-client-lib/src/main/java/org/triplea/http/client/lib/HttpClientHeaders.java (100%) diff --git a/game-app/game-headed/build.gradle b/game-app/game-headed/build.gradle index 416bbdac1ab..f818b82b733 100644 --- a/game-app/game-headed/build.gradle +++ b/game-app/game-headed/build.gradle @@ -20,8 +20,8 @@ dependencies { implementation project(":game-app:domain-data") implementation project(":game-app:game-core") implementation project(":game-app:map-data") - implementation project(":http-clients:feign-common") implementation project(":http-clients:lobby-client") + implementation project(":lib:feign-common") implementation project(":lib:java-extras") implementation project(":lib:swing-lib") implementation project(":lib:websocket-client") diff --git a/http-clients/error-reporting-client/build.gradle b/http-clients/error-reporting-client/build.gradle index 69ad250a4d6..97b4b065090 100644 --- a/http-clients/error-reporting-client/build.gradle +++ b/http-clients/error-reporting-client/build.gradle @@ -1,8 +1,8 @@ dependencies { implementation "io.github.openfeign:feign-core:$feignCoreVersion" implementation "io.github.openfeign:feign-gson:$feignGsonVersion" - implementation project(":http-clients:feign-common") - implementation project(":http-clients:http-client-lib") + implementation project(":lib:feign-common") + implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") testImplementation "ru.lanwen.wiremock:wiremock-junit5:$wireMockJunit5Version" testImplementation "com.github.tomakehurst:wiremock:$wireMockVersion" diff --git a/http-clients/github-client/build.gradle b/http-clients/github-client/build.gradle index f0834fd00fd..15f8179e91e 100644 --- a/http-clients/github-client/build.gradle +++ b/http-clients/github-client/build.gradle @@ -1,7 +1,7 @@ dependencies { implementation "io.github.openfeign:feign-core:$feignCoreVersion" implementation "io.github.openfeign:feign-gson:$feignGsonVersion" - implementation project(":http-clients:feign-common") + implementation project(":lib:feign-common") implementation project(":lib:java-extras") testImplementation "ru.lanwen.wiremock:wiremock-junit5:$wireMockJunit5Version" testImplementation "com.github.tomakehurst:wiremock:$wireMockVersion" diff --git a/http-clients/lobby-client/build.gradle b/http-clients/lobby-client/build.gradle index 09bf341053a..0a8c770c387 100644 --- a/http-clients/lobby-client/build.gradle +++ b/http-clients/lobby-client/build.gradle @@ -1,7 +1,7 @@ dependencies { implementation "io.github.openfeign:feign-core:$feignCoreVersion" implementation project(":game-app:domain-data") - implementation project(":http-clients:feign-common") + implementation project(":lib:feign-common") implementation project(":lib:java-extras") implementation project(":lib:websocket-client") testImplementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" diff --git a/http-clients/feign-common/README.md b/lib/feign-common/README.md similarity index 100% rename from http-clients/feign-common/README.md rename to lib/feign-common/README.md diff --git a/http-clients/feign-common/build.gradle b/lib/feign-common/build.gradle similarity index 100% rename from http-clients/feign-common/build.gradle rename to lib/feign-common/build.gradle diff --git a/http-clients/feign-common/src/main/java/org/triplea/http/client/GenericServerResponse.java b/lib/feign-common/src/main/java/org/triplea/http/client/GenericServerResponse.java similarity index 100% rename from http-clients/feign-common/src/main/java/org/triplea/http/client/GenericServerResponse.java rename to lib/feign-common/src/main/java/org/triplea/http/client/GenericServerResponse.java diff --git a/http-clients/feign-common/src/main/java/org/triplea/http/client/HttpClient.java b/lib/feign-common/src/main/java/org/triplea/http/client/HttpClient.java similarity index 100% rename from http-clients/feign-common/src/main/java/org/triplea/http/client/HttpClient.java rename to lib/feign-common/src/main/java/org/triplea/http/client/HttpClient.java diff --git a/http-clients/feign-common/src/main/java/org/triplea/http/client/HttpClientConstants.java b/lib/feign-common/src/main/java/org/triplea/http/client/HttpClientConstants.java similarity index 100% rename from http-clients/feign-common/src/main/java/org/triplea/http/client/HttpClientConstants.java rename to lib/feign-common/src/main/java/org/triplea/http/client/HttpClientConstants.java diff --git a/http-clients/feign-common/src/main/java/org/triplea/http/client/HttpConstants.java b/lib/feign-common/src/main/java/org/triplea/http/client/HttpConstants.java similarity index 100% rename from http-clients/feign-common/src/main/java/org/triplea/http/client/HttpConstants.java rename to lib/feign-common/src/main/java/org/triplea/http/client/HttpConstants.java diff --git a/http-clients/feign-common/src/main/java/org/triplea/http/client/JsonDecoder.java b/lib/feign-common/src/main/java/org/triplea/http/client/JsonDecoder.java similarity index 100% rename from http-clients/feign-common/src/main/java/org/triplea/http/client/JsonDecoder.java rename to lib/feign-common/src/main/java/org/triplea/http/client/JsonDecoder.java diff --git a/http-clients/feign-common/src/main/java/org/triplea/http/client/JsonEncoder.java b/lib/feign-common/src/main/java/org/triplea/http/client/JsonEncoder.java similarity index 100% rename from http-clients/feign-common/src/main/java/org/triplea/http/client/JsonEncoder.java rename to lib/feign-common/src/main/java/org/triplea/http/client/JsonEncoder.java diff --git a/http-clients/feign-common/src/test/java/org/triplea/http/client/GenericServerResponseTest.java b/lib/feign-common/src/test/java/org/triplea/http/client/GenericServerResponseTest.java similarity index 100% rename from http-clients/feign-common/src/test/java/org/triplea/http/client/GenericServerResponseTest.java rename to lib/feign-common/src/test/java/org/triplea/http/client/GenericServerResponseTest.java diff --git a/http-clients/feign-common/src/test/java/org/triplea/http/client/JsonDecoderTest.java b/lib/feign-common/src/test/java/org/triplea/http/client/JsonDecoderTest.java similarity index 100% rename from http-clients/feign-common/src/test/java/org/triplea/http/client/JsonDecoderTest.java rename to lib/feign-common/src/test/java/org/triplea/http/client/JsonDecoderTest.java diff --git a/http-clients/feign-common/src/test/java/org/triplea/http/client/JsonEncoderTest.java b/lib/feign-common/src/test/java/org/triplea/http/client/JsonEncoderTest.java similarity index 100% rename from http-clients/feign-common/src/test/java/org/triplea/http/client/JsonEncoderTest.java rename to lib/feign-common/src/test/java/org/triplea/http/client/JsonEncoderTest.java diff --git a/http-clients/feign-common/src/test/java/org/triplea/http/client/README.md b/lib/feign-common/src/test/java/org/triplea/http/client/README.md similarity index 100% rename from http-clients/feign-common/src/test/java/org/triplea/http/client/README.md rename to lib/feign-common/src/test/java/org/triplea/http/client/README.md diff --git a/http-clients/feign-common/src/test/resources/logback-test.xml b/lib/feign-common/src/test/resources/logback-test.xml similarity index 100% rename from http-clients/feign-common/src/test/resources/logback-test.xml rename to lib/feign-common/src/test/resources/logback-test.xml diff --git a/http-clients/http-client-lib/build.gradle b/lib/http-client-lib/build.gradle similarity index 100% rename from http-clients/http-client-lib/build.gradle rename to lib/http-client-lib/build.gradle diff --git a/http-clients/http-client-lib/src/main/java/org/triplea/http/client/lib/HttpClientHeaders.java b/lib/http-client-lib/src/main/java/org/triplea/http/client/lib/HttpClientHeaders.java similarity index 100% rename from http-clients/http-client-lib/src/main/java/org/triplea/http/client/lib/HttpClientHeaders.java rename to lib/http-client-lib/src/main/java/org/triplea/http/client/lib/HttpClientHeaders.java diff --git a/lib/websocket-server/build.gradle b/lib/websocket-server/build.gradle index be381386966..79b1b305326 100644 --- a/lib/websocket-server/build.gradle +++ b/lib/websocket-server/build.gradle @@ -3,7 +3,7 @@ dependencies { implementation "com.google.code.gson:gson:$gsonVersion" implementation "com.liveperson:dropwizard-websockets:$dropwizardWebsocketsVersion" implementation "org.java-websocket:Java-WebSocket:$javaWebSocketVersion" - implementation project(':http-clients:feign-common') + implementation project(':lib:feign-common') implementation project(':lib:java-extras') implementation project(':lib:websocket-client') testImplementation project(":lib:test-common") diff --git a/servers/error-reporting/build.gradle b/servers/error-reporting/build.gradle index 2ce510e2d5a..d9e7e8f4e74 100644 --- a/servers/error-reporting/build.gradle +++ b/servers/error-reporting/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation "io.dropwizard:dropwizard-jdbi3:$dropwizardVersion" implementation project(':http-clients:error-reporting-client') implementation project(':http-clients:github-client') - implementation project(':http-clients:http-client-lib') + implementation project(':lib:http-client-lib') implementation project(':servers:server-lib') runtimeOnly "org.postgresql:postgresql:$postgresqlVersion" diff --git a/settings.gradle b/settings.gradle index 530ba8f7e9e..b2084f5c0fd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,10 +8,10 @@ include 'game-app:game-relay-server' include 'game-app:map-data' include 'game-app:smoke-testing' include 'http-clients:error-reporting-client' -include 'http-clients:feign-common' include 'http-clients:github-client' -include 'http-clients:http-client-lib' include 'http-clients:lobby-client' +include 'lib:feign-common' +include 'lib:http-client-lib' include 'lib:java-extras' include 'lib:swing-lib' include 'lib:swing-lib-test-support' diff --git a/spitfire-server/dropwizard-server/build.gradle b/spitfire-server/dropwizard-server/build.gradle index 76ffee02e96..5a76ea69de9 100644 --- a/spitfire-server/dropwizard-server/build.gradle +++ b/spitfire-server/dropwizard-server/build.gradle @@ -53,9 +53,9 @@ dependencies { implementation "io.dropwizard:dropwizard-core:$dropwizardVersion" implementation "io.dropwizard:dropwizard-jdbi3:$dropwizardVersion" implementation project(':game-app:domain-data') - implementation project(':http-clients:feign-common') implementation project(':http-clients:github-client') implementation project(':http-clients:lobby-client') + implementation project(':lib:feign-common') implementation project(':lib:java-extras') implementation project(':lib:websocket-client') implementation project(':lib:websocket-server') diff --git a/spitfire-server/latest-version-module/build.gradle b/spitfire-server/latest-version-module/build.gradle index fe086f268de..4f55407e5bc 100644 --- a/spitfire-server/latest-version-module/build.gradle +++ b/spitfire-server/latest-version-module/build.gradle @@ -1,7 +1,7 @@ dependencies { implementation project(':http-clients:github-client') + implementation project(':lib:feign-common') implementation project(':lib:java-extras') - implementation project(":http-clients:feign-common") implementation project(':spitfire-server:lib:scheduled-tasks') implementation "io.dropwizard:dropwizard-core:$dropwizardVersion" testImplementation project(":lib:test-common") diff --git a/spitfire-server/lobby-module/build.gradle b/spitfire-server/lobby-module/build.gradle index e5c11aff940..9810df5fe5c 100644 --- a/spitfire-server/lobby-module/build.gradle +++ b/spitfire-server/lobby-module/build.gradle @@ -11,9 +11,9 @@ dependencies { implementation "org.jdbi:jdbi3-core:$jdbiVersion" implementation "org.jdbi:jdbi3-sqlobject:$jdbiVersion" implementation project(':game-app:domain-data') - implementation project(':http-clients:feign-common') - implementation project(':http-clients:lobby-client') implementation project(':http-clients:github-client') + implementation project(':http-clients:lobby-client') + implementation project(':lib:feign-common') implementation project(':lib:java-extras') implementation project(':lib:websocket-client') implementation project(':lib:websocket-server')