From 41c40101a4de8dee637e820dfec9545816527964 Mon Sep 17 00:00:00 2001 From: DanVanAtta Date: Mon, 27 Nov 2023 20:49:09 -0800 Subject: [PATCH 1/2] Move 'maps-module' code to 'servers/maps/server' (next steps will be to make this a standalone server) --- servers/maps/server/build.gradle | 17 +++++++++++++++++ .../java/org/triplea/maps/MapsModuleConfig.java | 0 .../org/triplea/maps/MapsModuleRowMappers.java | 0 .../org/triplea/maps/indexing/MapIndexDao.java | 0 .../maps/indexing/MapIndexingResult.java | 0 .../triplea/maps/indexing/MapIndexingTask.java | 0 .../maps/indexing/MapIndexingTaskRunner.java | 0 .../indexing/MapsIndexingObjectFactory.java | 0 .../java/org/triplea/maps/indexing/README.md | 0 .../maps/indexing/tasks/CommitDateFetcher.java | 0 .../indexing/tasks/DownloadSizeFetcher.java | 0 .../indexing/tasks/DownloadUriCalculator.java | 0 .../indexing/tasks/MapDescriptionReader.java | 0 .../maps/indexing/tasks/MapNameReader.java | 0 .../indexing/tasks/PreviewUriCalculator.java | 0 .../indexing/tasks/SkipMapIndexingCheck.java | 0 .../org/triplea/maps/listing/MapListingDao.java | 0 .../triplea/maps/listing/MapListingRecord.java | 0 .../org/triplea/maps/listing/MapTagRecord.java | 0 .../triplea/maps/listing/MapsListingModule.java | 0 .../triplea/maps/tags/MapTagAdminModule.java | 0 .../maps/tags/MapTagAllowedValueRecord.java | 0 .../triplea/maps/tags/MapTagMetaDataRecord.java | 0 .../java/org/triplea/maps/tags/MapTagsDao.java | 0 .../triplea/maps/tags/UpdateMapTagResult.java | 0 .../maps/MapsModuleDatabaseTestSupport.java | 0 .../triplea/maps/indexing/MapIndexDaoTest.java | 0 .../indexing/MapIndexingIntegrationTest.java | 0 .../indexing/MapIndexingTaskRunnerTest.java | 0 .../maps/indexing/MapIndexingTaskTest.java | 0 .../indexing/tasks/DownloadSizeFetcherTest.java | 0 .../tasks/DownloadUriCalculatorTest.java | 0 .../maps/indexing/tasks/MapNameReaderTest.java | 0 .../tasks/PreviewUriCalculatorTest.java | 0 .../triplea/maps/listing/MapListingDaoTest.java | 0 .../maps/listing/MapsListingModuleTest.java | 0 .../maps/tags/MapTagAdminModuleTest.java | 0 .../org/triplea/maps/tags/MapTagsDaoTest.java | 0 .../datasets/expected/map_index_post_remove.yml | 0 .../datasets/expected/map_index_upsert_new.yml | 0 .../expected/map_index_upsert_updated.yml | 0 .../map_tag_value_after_insert_new_value.yml | 0 .../map_tag_value_after_tag_deleted.yml | 0 .../map_tag_value_after_update_to_new_value.yml | 0 .../src/test/resources/datasets/map_index.yml | 0 .../test/resources/datasets/map_tag_value.yml | 0 .../server}/src/test/resources/db-cleanup.sql | 0 .../maps/server}/src/test/resources/dbunit.yml | 0 .../server}/src/test/resources/logback-test.xml | 0 settings.gradle | 2 +- spitfire-server/dropwizard-server/build.gradle | 2 +- spitfire-server/maps-module/build.gradle | 17 ----------------- 52 files changed, 19 insertions(+), 19 deletions(-) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/MapsModuleConfig.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/MapsModuleRowMappers.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/MapIndexDao.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/MapIndexingResult.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/MapIndexingTask.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/MapIndexingTaskRunner.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/MapsIndexingObjectFactory.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/README.md (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/CommitDateFetcher.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcher.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/DownloadUriCalculator.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/MapDescriptionReader.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/MapNameReader.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/PreviewUriCalculator.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/indexing/tasks/SkipMapIndexingCheck.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/listing/MapListingDao.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/listing/MapListingRecord.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/listing/MapTagRecord.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/listing/MapsListingModule.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/tags/MapTagAdminModule.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/tags/MapTagAllowedValueRecord.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/tags/MapTagMetaDataRecord.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/tags/MapTagsDao.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/main/java/org/triplea/maps/tags/UpdateMapTagResult.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/MapsModuleDatabaseTestSupport.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/MapIndexDaoTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/MapIndexingIntegrationTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/MapIndexingTaskRunnerTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/MapIndexingTaskTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcherTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/tasks/DownloadUriCalculatorTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/tasks/MapNameReaderTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/indexing/tasks/PreviewUriCalculatorTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/listing/MapListingDaoTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/listing/MapsListingModuleTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/tags/MapTagAdminModuleTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/java/org/triplea/maps/tags/MapTagsDaoTest.java (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/expected/map_index_post_remove.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/expected/map_index_upsert_new.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/expected/map_index_upsert_updated.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/expected/map_tag_value_after_insert_new_value.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/expected/map_tag_value_after_tag_deleted.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/expected/map_tag_value_after_update_to_new_value.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/map_index.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/datasets/map_tag_value.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/db-cleanup.sql (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/dbunit.yml (100%) rename {spitfire-server/maps-module => servers/maps/server}/src/test/resources/logback-test.xml (100%) delete mode 100644 spitfire-server/maps-module/build.gradle diff --git a/servers/maps/server/build.gradle b/servers/maps/server/build.gradle index e69de29bb2..0a051361c1 100644 --- 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/spitfire-server/maps-module/src/main/java/org/triplea/maps/MapsModuleConfig.java b/servers/maps/server/src/main/java/org/triplea/maps/MapsModuleConfig.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/MapsModuleConfig.java rename to servers/maps/server/src/main/java/org/triplea/maps/MapsModuleConfig.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/MapsModuleRowMappers.java b/servers/maps/server/src/main/java/org/triplea/maps/MapsModuleRowMappers.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/MapsModuleRowMappers.java rename to servers/maps/server/src/main/java/org/triplea/maps/MapsModuleRowMappers.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexDao.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexDao.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexDao.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexDao.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexingResult.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexingResult.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexingResult.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexingResult.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexingTask.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexingTask.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexingTask.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexingTask.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexingTaskRunner.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexingTaskRunner.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapIndexingTaskRunner.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/MapIndexingTaskRunner.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapsIndexingObjectFactory.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/MapsIndexingObjectFactory.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/MapsIndexingObjectFactory.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/MapsIndexingObjectFactory.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/README.md b/servers/maps/server/src/main/java/org/triplea/maps/indexing/README.md similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/README.md rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/README.md diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/CommitDateFetcher.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/CommitDateFetcher.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/CommitDateFetcher.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/CommitDateFetcher.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcher.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcher.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcher.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcher.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/DownloadUriCalculator.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/DownloadUriCalculator.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/DownloadUriCalculator.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/DownloadUriCalculator.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/MapDescriptionReader.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/MapDescriptionReader.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/MapDescriptionReader.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/MapDescriptionReader.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/MapNameReader.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/MapNameReader.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/MapNameReader.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/MapNameReader.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/PreviewUriCalculator.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/PreviewUriCalculator.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/PreviewUriCalculator.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/PreviewUriCalculator.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/SkipMapIndexingCheck.java b/servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/SkipMapIndexingCheck.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/indexing/tasks/SkipMapIndexingCheck.java rename to servers/maps/server/src/main/java/org/triplea/maps/indexing/tasks/SkipMapIndexingCheck.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapListingDao.java b/servers/maps/server/src/main/java/org/triplea/maps/listing/MapListingDao.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapListingDao.java rename to servers/maps/server/src/main/java/org/triplea/maps/listing/MapListingDao.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapListingRecord.java b/servers/maps/server/src/main/java/org/triplea/maps/listing/MapListingRecord.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapListingRecord.java rename to servers/maps/server/src/main/java/org/triplea/maps/listing/MapListingRecord.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapTagRecord.java b/servers/maps/server/src/main/java/org/triplea/maps/listing/MapTagRecord.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapTagRecord.java rename to servers/maps/server/src/main/java/org/triplea/maps/listing/MapTagRecord.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapsListingModule.java b/servers/maps/server/src/main/java/org/triplea/maps/listing/MapsListingModule.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/listing/MapsListingModule.java rename to servers/maps/server/src/main/java/org/triplea/maps/listing/MapsListingModule.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagAdminModule.java b/servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagAdminModule.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagAdminModule.java rename to servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagAdminModule.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagAllowedValueRecord.java b/servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagAllowedValueRecord.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagAllowedValueRecord.java rename to servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagAllowedValueRecord.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagMetaDataRecord.java b/servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagMetaDataRecord.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagMetaDataRecord.java rename to servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagMetaDataRecord.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagsDao.java b/servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagsDao.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/MapTagsDao.java rename to servers/maps/server/src/main/java/org/triplea/maps/tags/MapTagsDao.java diff --git a/spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/UpdateMapTagResult.java b/servers/maps/server/src/main/java/org/triplea/maps/tags/UpdateMapTagResult.java similarity index 100% rename from spitfire-server/maps-module/src/main/java/org/triplea/maps/tags/UpdateMapTagResult.java rename to servers/maps/server/src/main/java/org/triplea/maps/tags/UpdateMapTagResult.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/MapsModuleDatabaseTestSupport.java b/servers/maps/server/src/test/java/org/triplea/maps/MapsModuleDatabaseTestSupport.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/MapsModuleDatabaseTestSupport.java rename to servers/maps/server/src/test/java/org/triplea/maps/MapsModuleDatabaseTestSupport.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexDaoTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexDaoTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexDaoTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexDaoTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexingIntegrationTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexingIntegrationTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexingIntegrationTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexingIntegrationTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexingTaskRunnerTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexingTaskRunnerTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexingTaskRunnerTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexingTaskRunnerTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexingTaskTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexingTaskTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/MapIndexingTaskTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/MapIndexingTaskTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcherTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcherTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcherTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/DownloadSizeFetcherTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/DownloadUriCalculatorTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/DownloadUriCalculatorTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/DownloadUriCalculatorTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/DownloadUriCalculatorTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/MapNameReaderTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/MapNameReaderTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/MapNameReaderTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/MapNameReaderTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/PreviewUriCalculatorTest.java b/servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/PreviewUriCalculatorTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/indexing/tasks/PreviewUriCalculatorTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/indexing/tasks/PreviewUriCalculatorTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/listing/MapListingDaoTest.java b/servers/maps/server/src/test/java/org/triplea/maps/listing/MapListingDaoTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/listing/MapListingDaoTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/listing/MapListingDaoTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/listing/MapsListingModuleTest.java b/servers/maps/server/src/test/java/org/triplea/maps/listing/MapsListingModuleTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/listing/MapsListingModuleTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/listing/MapsListingModuleTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/tags/MapTagAdminModuleTest.java b/servers/maps/server/src/test/java/org/triplea/maps/tags/MapTagAdminModuleTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/tags/MapTagAdminModuleTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/tags/MapTagAdminModuleTest.java diff --git a/spitfire-server/maps-module/src/test/java/org/triplea/maps/tags/MapTagsDaoTest.java b/servers/maps/server/src/test/java/org/triplea/maps/tags/MapTagsDaoTest.java similarity index 100% rename from spitfire-server/maps-module/src/test/java/org/triplea/maps/tags/MapTagsDaoTest.java rename to servers/maps/server/src/test/java/org/triplea/maps/tags/MapTagsDaoTest.java diff --git a/spitfire-server/maps-module/src/test/resources/datasets/expected/map_index_post_remove.yml b/servers/maps/server/src/test/resources/datasets/expected/map_index_post_remove.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/expected/map_index_post_remove.yml rename to servers/maps/server/src/test/resources/datasets/expected/map_index_post_remove.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/expected/map_index_upsert_new.yml b/servers/maps/server/src/test/resources/datasets/expected/map_index_upsert_new.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/expected/map_index_upsert_new.yml rename to servers/maps/server/src/test/resources/datasets/expected/map_index_upsert_new.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/expected/map_index_upsert_updated.yml b/servers/maps/server/src/test/resources/datasets/expected/map_index_upsert_updated.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/expected/map_index_upsert_updated.yml rename to servers/maps/server/src/test/resources/datasets/expected/map_index_upsert_updated.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/expected/map_tag_value_after_insert_new_value.yml b/servers/maps/server/src/test/resources/datasets/expected/map_tag_value_after_insert_new_value.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/expected/map_tag_value_after_insert_new_value.yml rename to servers/maps/server/src/test/resources/datasets/expected/map_tag_value_after_insert_new_value.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/expected/map_tag_value_after_tag_deleted.yml b/servers/maps/server/src/test/resources/datasets/expected/map_tag_value_after_tag_deleted.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/expected/map_tag_value_after_tag_deleted.yml rename to servers/maps/server/src/test/resources/datasets/expected/map_tag_value_after_tag_deleted.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/expected/map_tag_value_after_update_to_new_value.yml b/servers/maps/server/src/test/resources/datasets/expected/map_tag_value_after_update_to_new_value.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/expected/map_tag_value_after_update_to_new_value.yml rename to servers/maps/server/src/test/resources/datasets/expected/map_tag_value_after_update_to_new_value.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/map_index.yml b/servers/maps/server/src/test/resources/datasets/map_index.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/map_index.yml rename to servers/maps/server/src/test/resources/datasets/map_index.yml diff --git a/spitfire-server/maps-module/src/test/resources/datasets/map_tag_value.yml b/servers/maps/server/src/test/resources/datasets/map_tag_value.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/datasets/map_tag_value.yml rename to servers/maps/server/src/test/resources/datasets/map_tag_value.yml diff --git a/spitfire-server/maps-module/src/test/resources/db-cleanup.sql b/servers/maps/server/src/test/resources/db-cleanup.sql similarity index 100% rename from spitfire-server/maps-module/src/test/resources/db-cleanup.sql rename to servers/maps/server/src/test/resources/db-cleanup.sql diff --git a/spitfire-server/maps-module/src/test/resources/dbunit.yml b/servers/maps/server/src/test/resources/dbunit.yml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/dbunit.yml rename to servers/maps/server/src/test/resources/dbunit.yml diff --git a/spitfire-server/maps-module/src/test/resources/logback-test.xml b/servers/maps/server/src/test/resources/logback-test.xml similarity index 100% rename from spitfire-server/maps-module/src/test/resources/logback-test.xml rename to servers/maps/server/src/test/resources/logback-test.xml diff --git a/settings.gradle b/settings.gradle index d1bd610ed0..214cb52cce 100644 --- 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 index 5a76ea69de..60433b4e8a 100644 --- a/spitfire-server/dropwizard-server/build.gradle +++ b/spitfire-server/dropwizard-server/build.gradle @@ -59,10 +59,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 deleted file mode 100644 index 0a051361c1..0000000000 --- a/spitfire-server/maps-module/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -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') -} From 0df17818a2b4a915ca69fe1d4c81178f23398b5b Mon Sep 17 00:00:00 2001 From: DanVanAtta Date: Mon, 27 Nov 2023 21:12:44 -0800 Subject: [PATCH 2/2] Formatting --- servers/maps/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/servers/maps/README.md b/servers/maps/README.md index bc7eda2bc5..a87a2a67e2 100644 --- 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. - - -