triplea-game · DanVanAtta · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023
diff --git a/servers/maps/README.md b/servers/maps/README.md
@@ -15,6 +15,3 @@ Eventually this was evolved to be a YML file. The maps-index server
 is a further step on this evolution to where maps are dynamically
 read from the triplea-maps github organization and then the list
 fo maps is maintained in a database.
-
-
-
diff --git a/servers/maps/server/build.gradle b/servers/maps/server/build.gradle
@@ -0,0 +1,17 @@
+dependencies {
+    implementation "io.dropwizard:dropwizard-core:$dropwizardVersion"
+    implementation "io.dropwizard:dropwizard-jdbi3:$dropwizardVersion"
+    implementation "org.jdbi:jdbi3-core:$jdbiVersion"
+    implementation "org.jdbi:jdbi3-sqlobject:$jdbiVersion"
+    implementation project(':http-clients:github-client')
+    implementation project(':http-clients:lobby-client')
+    implementation project(':lib:java-extras')
+    implementation project(':spitfire-server:database')
+    implementation project(':spitfire-server:lib:scheduled-tasks')
+    runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"
+    testImplementation "com.github.database-rider:rider-junit5:$databaseRiderVersion"
+    testImplementation "io.dropwizard:dropwizard-testing:$dropwizardVersion"
+    testImplementation "uk.co.datumedge:hamcrest-json:$hamcrestJsonVersion"
+    testImplementation project(':lib:test-common')
+    testImplementation project(':spitfire-server:database-test-support')
+}
diff --git a/...va/org/triplea/maps/MapsModuleConfig.java → ...va/org/triplea/maps/MapsModuleConfig.java b/...va/org/triplea/maps/MapsModuleConfig.java → ...va/org/triplea/maps/MapsModuleConfig.java
diff --git a/...rg/triplea/maps/MapsModuleRowMappers.java → ...rg/triplea/maps/MapsModuleRowMappers.java b/...rg/triplea/maps/MapsModuleRowMappers.java → ...rg/triplea/maps/MapsModuleRowMappers.java
diff --git a/...rg/triplea/maps/indexing/MapIndexDao.java → ...rg/triplea/maps/indexing/MapIndexDao.java b/...rg/triplea/maps/indexing/MapIndexDao.java → ...rg/triplea/maps/indexing/MapIndexDao.java
diff --git a/...plea/maps/indexing/MapIndexingResult.java → ...plea/maps/indexing/MapIndexingResult.java b/...plea/maps/indexing/MapIndexingResult.java → ...plea/maps/indexing/MapIndexingResult.java
diff --git a/...riplea/maps/indexing/MapIndexingTask.java → ...riplea/maps/indexing/MapIndexingTask.java b/...riplea/maps/indexing/MapIndexingTask.java → ...riplea/maps/indexing/MapIndexingTask.java
diff --git a/.../maps/indexing/MapIndexingTaskRunner.java → .../maps/indexing/MapIndexingTaskRunner.java b/.../maps/indexing/MapIndexingTaskRunner.java → .../maps/indexing/MapIndexingTaskRunner.java
diff --git a/...s/indexing/MapsIndexingObjectFactory.java → ...s/indexing/MapsIndexingObjectFactory.java b/...s/indexing/MapsIndexingObjectFactory.java → ...s/indexing/MapsIndexingObjectFactory.java
diff --git a/.../java/org/triplea/maps/indexing/README.md → .../java/org/triplea/maps/indexing/README.md b/.../java/org/triplea/maps/indexing/README.md → .../java/org/triplea/maps/indexing/README.md
diff --git a/...aps/indexing/tasks/CommitDateFetcher.java → ...aps/indexing/tasks/CommitDateFetcher.java b/...aps/indexing/tasks/CommitDateFetcher.java → ...aps/indexing/tasks/CommitDateFetcher.java
diff --git a/...s/indexing/tasks/DownloadSizeFetcher.java → ...s/indexing/tasks/DownloadSizeFetcher.java b/...s/indexing/tasks/DownloadSizeFetcher.java → ...s/indexing/tasks/DownloadSizeFetcher.java
diff --git a/...indexing/tasks/DownloadUriCalculator.java → ...indexing/tasks/DownloadUriCalculator.java b/...indexing/tasks/DownloadUriCalculator.java → ...indexing/tasks/DownloadUriCalculator.java
diff --git a/.../indexing/tasks/MapDescriptionReader.java → .../indexing/tasks/MapDescriptionReader.java b/.../indexing/tasks/MapDescriptionReader.java → .../indexing/tasks/MapDescriptionReader.java
diff --git a/...ea/maps/indexing/tasks/MapNameReader.java → ...ea/maps/indexing/tasks/MapNameReader.java b/...ea/maps/indexing/tasks/MapNameReader.java → ...ea/maps/indexing/tasks/MapNameReader.java
diff --git a/.../indexing/tasks/PreviewUriCalculator.java → .../indexing/tasks/PreviewUriCalculator.java b/.../indexing/tasks/PreviewUriCalculator.java → .../indexing/tasks/PreviewUriCalculator.java
diff --git a/.../indexing/tasks/SkipMapIndexingCheck.java → .../indexing/tasks/SkipMapIndexingCheck.java b/.../indexing/tasks/SkipMapIndexingCheck.java → .../indexing/tasks/SkipMapIndexingCheck.java
diff --git a/...g/triplea/maps/listing/MapListingDao.java → ...g/triplea/maps/listing/MapListingDao.java b/...g/triplea/maps/listing/MapListingDao.java → ...g/triplea/maps/listing/MapListingDao.java
diff --git a/...riplea/maps/listing/MapListingRecord.java → ...riplea/maps/listing/MapListingRecord.java b/...riplea/maps/listing/MapListingRecord.java → ...riplea/maps/listing/MapListingRecord.java
diff --git a/...rg/triplea/maps/listing/MapTagRecord.java → ...rg/triplea/maps/listing/MapTagRecord.java b/...rg/triplea/maps/listing/MapTagRecord.java → ...rg/triplea/maps/listing/MapTagRecord.java
diff --git a/...iplea/maps/listing/MapsListingModule.java → ...iplea/maps/listing/MapsListingModule.java b/...iplea/maps/listing/MapsListingModule.java → ...iplea/maps/listing/MapsListingModule.java
diff --git a/.../triplea/maps/tags/MapTagAdminModule.java → .../triplea/maps/tags/MapTagAdminModule.java b/.../triplea/maps/tags/MapTagAdminModule.java → .../triplea/maps/tags/MapTagAdminModule.java
diff --git a/...a/maps/tags/MapTagAllowedValueRecord.java → ...a/maps/tags/MapTagAllowedValueRecord.java b/...a/maps/tags/MapTagAllowedValueRecord.java → ...a/maps/tags/MapTagAllowedValueRecord.java
diff --git a/...iplea/maps/tags/MapTagMetaDataRecord.java → ...iplea/maps/tags/MapTagMetaDataRecord.java b/...iplea/maps/tags/MapTagMetaDataRecord.java → ...iplea/maps/tags/MapTagMetaDataRecord.java
diff --git a/...ava/org/triplea/maps/tags/MapTagsDao.java → ...ava/org/triplea/maps/tags/MapTagsDao.java b/...ava/org/triplea/maps/tags/MapTagsDao.java → ...ava/org/triplea/maps/tags/MapTagsDao.java
diff --git a/...triplea/maps/tags/UpdateMapTagResult.java → ...triplea/maps/tags/UpdateMapTagResult.java b/...triplea/maps/tags/UpdateMapTagResult.java → ...triplea/maps/tags/UpdateMapTagResult.java
diff --git a/...a/maps/MapsModuleDatabaseTestSupport.java → ...a/maps/MapsModuleDatabaseTestSupport.java b/...a/maps/MapsModuleDatabaseTestSupport.java → ...a/maps/MapsModuleDatabaseTestSupport.java
diff --git a/...riplea/maps/indexing/MapIndexDaoTest.java → ...riplea/maps/indexing/MapIndexDaoTest.java b/...riplea/maps/indexing/MapIndexDaoTest.java → ...riplea/maps/indexing/MapIndexDaoTest.java
diff --git a/.../indexing/MapIndexingIntegrationTest.java → .../indexing/MapIndexingIntegrationTest.java b/.../indexing/MapIndexingIntegrationTest.java → .../indexing/MapIndexingIntegrationTest.java
diff --git a/...s/indexing/MapIndexingTaskRunnerTest.java → ...s/indexing/MapIndexingTaskRunnerTest.java b/...s/indexing/MapIndexingTaskRunnerTest.java → ...s/indexing/MapIndexingTaskRunnerTest.java
diff --git a/...ea/maps/indexing/MapIndexingTaskTest.java → ...ea/maps/indexing/MapIndexingTaskTest.java b/...ea/maps/indexing/MapIndexingTaskTest.java → ...ea/maps/indexing/MapIndexingTaskTest.java
diff --git a/...dexing/tasks/DownloadSizeFetcherTest.java → ...dexing/tasks/DownloadSizeFetcherTest.java b/...dexing/tasks/DownloadSizeFetcherTest.java → ...dexing/tasks/DownloadSizeFetcherTest.java
diff --git a/...xing/tasks/DownloadUriCalculatorTest.java → ...xing/tasks/DownloadUriCalculatorTest.java b/...xing/tasks/DownloadUriCalculatorTest.java → ...xing/tasks/DownloadUriCalculatorTest.java
diff --git a/...aps/indexing/tasks/MapNameReaderTest.java → ...aps/indexing/tasks/MapNameReaderTest.java b/...aps/indexing/tasks/MapNameReaderTest.java → ...aps/indexing/tasks/MapNameReaderTest.java
diff --git a/...exing/tasks/PreviewUriCalculatorTest.java → ...exing/tasks/PreviewUriCalculatorTest.java b/...exing/tasks/PreviewUriCalculatorTest.java → ...exing/tasks/PreviewUriCalculatorTest.java
diff --git a/...iplea/maps/listing/MapListingDaoTest.java → ...iplea/maps/listing/MapListingDaoTest.java b/...iplea/maps/listing/MapListingDaoTest.java → ...iplea/maps/listing/MapListingDaoTest.java
diff --git a/...a/maps/listing/MapsListingModuleTest.java → ...a/maps/listing/MapsListingModuleTest.java b/...a/maps/listing/MapsListingModuleTest.java → ...a/maps/listing/MapsListingModuleTest.java
diff --git a/...plea/maps/tags/MapTagAdminModuleTest.java → ...plea/maps/tags/MapTagAdminModuleTest.java b/...plea/maps/tags/MapTagAdminModuleTest.java → ...plea/maps/tags/MapTagAdminModuleTest.java
diff --git a/...org/triplea/maps/tags/MapTagsDaoTest.java → ...org/triplea/maps/tags/MapTagsDaoTest.java b/...org/triplea/maps/tags/MapTagsDaoTest.java → ...org/triplea/maps/tags/MapTagsDaoTest.java
diff --git a/...tasets/expected/map_index_post_remove.yml → ...tasets/expected/map_index_post_remove.yml b/...tasets/expected/map_index_post_remove.yml → ...tasets/expected/map_index_post_remove.yml
diff --git a/...atasets/expected/map_index_upsert_new.yml → ...atasets/expected/map_index_upsert_new.yml b/...atasets/expected/map_index_upsert_new.yml → ...atasets/expected/map_index_upsert_new.yml
diff --git a/...ets/expected/map_index_upsert_updated.yml → ...ets/expected/map_index_upsert_updated.yml b/...ets/expected/map_index_upsert_updated.yml → ...ets/expected/map_index_upsert_updated.yml
diff --git a/.../map_tag_value_after_insert_new_value.yml → .../map_tag_value_after_insert_new_value.yml b/.../map_tag_value_after_insert_new_value.yml → .../map_tag_value_after_insert_new_value.yml
diff --git a/...ected/map_tag_value_after_tag_deleted.yml → ...ected/map_tag_value_after_tag_deleted.yml b/...ected/map_tag_value_after_tag_deleted.yml → ...ected/map_tag_value_after_tag_deleted.yml
diff --git a/...p_tag_value_after_update_to_new_value.yml → ...p_tag_value_after_update_to_new_value.yml b/...p_tag_value_after_update_to_new_value.yml → ...p_tag_value_after_update_to_new_value.yml
diff --git a/...src/test/resources/datasets/map_index.yml → ...src/test/resources/datasets/map_index.yml b/...src/test/resources/datasets/map_index.yml → ...src/test/resources/datasets/map_index.yml
diff --git a/...test/resources/datasets/map_tag_value.yml → ...test/resources/datasets/map_tag_value.yml b/...test/resources/datasets/map_tag_value.yml → ...test/resources/datasets/map_tag_value.yml
diff --git a/...-module/src/test/resources/db-cleanup.sql → .../server/src/test/resources/db-cleanup.sql b/...-module/src/test/resources/db-cleanup.sql → .../server/src/test/resources/db-cleanup.sql
diff --git a/...maps-module/src/test/resources/dbunit.yml → ...maps/server/src/test/resources/dbunit.yml b/...maps-module/src/test/resources/dbunit.yml → ...maps/server/src/test/resources/dbunit.yml
diff --git a/...odule/src/test/resources/logback-test.xml → ...erver/src/test/resources/logback-test.xml b/...odule/src/test/resources/logback-test.xml → ...erver/src/test/resources/logback-test.xml
diff --git a/settings.gradle b/settings.gradle
@@ -20,6 +20,7 @@ include 'lib:websocket-server'
 include 'lib:xml-reader'
 include 'servers:game-support:client'
 include 'servers:game-support:server'
+include 'servers:maps:server'
 include 'servers:server-lib'
 include 'servers:server-test-support'
 include 'spitfire-server:database'
@@ -28,4 +29,3 @@ include 'spitfire-server:dropwizard-server'
 include 'spitfire-server:latest-version-module'
 include 'spitfire-server:lib:scheduled-tasks'
 include 'spitfire-server:lobby-module'
-include 'spitfire-server:maps-module'
diff --git a/spitfire-server/dropwizard-server/build.gradle b/spitfire-server/dropwizard-server/build.gradle
@@ -57,10 +57,10 @@ dependencies {
     implementation project(':lib:java-extras')
     implementation project(':lib:websocket-client')
     implementation project(':lib:websocket-server')
+    implementation project(':servers:maps:server')
     implementation project(':servers:server-lib')
     implementation project(':spitfire-server:latest-version-module')
     implementation project(':spitfire-server:lobby-module')
-    implementation project(':spitfire-server:maps-module')
     testImplementation "com.github.database-rider:rider-junit5:$databaseRiderVersion"
     testImplementation "io.dropwizard:dropwizard-testing:$dropwizardVersion"
     testImplementation "io.github.openfeign:feign-core:$feignCoreVersion"

diff --git a/spitfire-server/maps-module/build.gradle b/spitfire-server/maps-module/build.gradle
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,3 @@ Eventually this was evolved to be a YML file. The maps-index server
		is a further step on this evolution to where maps are dynamically
		read from the triplea-maps github organization and then the list
		fo maps is maintained in a database.