From d9ccb791513801863b248ad44ab303b98dbe6e74 Mon Sep 17 00:00:00 2001 From: halprin Date: Tue, 16 Jan 2024 15:58:44 -0700 Subject: [PATCH 1/2] Moved partner metadata classes to partner package --- .../trustedintermediary/etor/EtorDomainRegistration.java | 8 ++++---- .../etor/metadata/{ => partner}/PartnerMetadata.java | 3 +-- .../metadata/{ => partner}/PartnerMetadataException.java | 2 +- .../{ => partner}/PartnerMetadataOrchestrator.java | 3 +-- .../metadata/{ => partner}/PartnerMetadataStorage.java | 2 +- .../trustedintermediary/etor/orders/OrderConverter.java | 2 +- .../trustedintermediary/etor/orders/SendOrderUseCase.java | 4 ++-- .../azure/AzureStorageAccountPartnerMetadataStorage.java | 6 +++--- .../external/database/DatabasePartnerMetadataStorage.java | 6 +++--- .../external/database/PostgresDao.java | 2 +- .../external/hapi/HapiOrderConverter.java | 2 +- .../external/localfile/FilePartnerMetadataStorage.java | 6 +++--- .../etor/EtorDomainRegistrationTest.groovy | 8 +++----- .../etor/metadata/PartnerMetadataExceptionTest.groovy | 2 +- .../etor/metadata/PartnerMetadataOrchestratorTest.groovy | 4 ++++ .../etor/metadata/PartnerMetadataTest.groovy | 1 + .../etor/orders/SendOrderUseCaseTest.groovy | 4 ++-- .../AzureStorageAccountPartnerMetadataStorageTest.groovy | 4 ++-- .../database/DatabasePartnerMetadataStorageTest.groovy | 6 +++--- .../external/database/PostgresDaoTest.groovy | 2 +- .../external/hapi/HapiOrderConverterTest.groovy | 2 +- .../localfile/FilePartnerMetadataStorageTest.groovy | 4 ++-- 22 files changed, 42 insertions(+), 41 deletions(-) rename etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadata.java (94%) rename etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadataException.java (83%) rename etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadataOrchestrator.java (98%) rename etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadataStorage.java (92%) diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistration.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistration.java index 7b68b66aa..2f93c13e4 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistration.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistration.java @@ -11,11 +11,11 @@ import gov.hhs.cdc.trustedintermediary.etor.demographics.Demographics; import gov.hhs.cdc.trustedintermediary.etor.demographics.PatientDemographicsController; import gov.hhs.cdc.trustedintermediary.etor.demographics.PatientDemographicsResponse; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataOrchestrator; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataStorage; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataOrchestrator; import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStorage; import gov.hhs.cdc.trustedintermediary.etor.operationoutcomes.FhirMetadata; import gov.hhs.cdc.trustedintermediary.etor.orders.Order; import gov.hhs.cdc.trustedintermediary.etor.orders.OrderController; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadata.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadata.java similarity index 94% rename from etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadata.java rename to etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadata.java index a2ee1e6b6..eaf798a25 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadata.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadata.java @@ -1,6 +1,5 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata; +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner; -import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus; import java.time.Instant; /** diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataException.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataException.java similarity index 83% rename from etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataException.java rename to etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataException.java index eac65c323..b78c031d3 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataException.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataException.java @@ -1,4 +1,4 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata; +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner; /** Custom exception class use to catch partner metadata exceptions */ public class PartnerMetadataException extends Exception { diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestrator.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestrator.java similarity index 98% rename from etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestrator.java rename to etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestrator.java index 8de48f715..8686bfbd5 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestrator.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestrator.java @@ -1,7 +1,6 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata; +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner; import gov.hhs.cdc.trustedintermediary.etor.RSEndpointClient; -import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus; import gov.hhs.cdc.trustedintermediary.external.reportstream.ReportStreamEndpointClientException; import gov.hhs.cdc.trustedintermediary.wrappers.Logger; import gov.hhs.cdc.trustedintermediary.wrappers.formatter.Formatter; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataStorage.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataStorage.java similarity index 92% rename from etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataStorage.java rename to etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataStorage.java index 315d7f8a2..4d245746c 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataStorage.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataStorage.java @@ -1,4 +1,4 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata; +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner; import java.util.Optional; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/OrderConverter.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/OrderConverter.java index 0f754cf38..9082cc111 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/OrderConverter.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/OrderConverter.java @@ -1,7 +1,7 @@ package gov.hhs.cdc.trustedintermediary.etor.orders; import gov.hhs.cdc.trustedintermediary.etor.demographics.Demographics; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; import gov.hhs.cdc.trustedintermediary.etor.operationoutcomes.FhirMetadata; /** Interface for converting things to orders and things in orders. */ diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCase.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCase.java index c713efefd..6c3f39ce2 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCase.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCase.java @@ -1,8 +1,8 @@ package gov.hhs.cdc.trustedintermediary.etor.orders; import gov.hhs.cdc.trustedintermediary.etor.metadata.EtorMetadataStep; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataOrchestrator; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataOrchestrator; import gov.hhs.cdc.trustedintermediary.wrappers.Logger; import gov.hhs.cdc.trustedintermediary.wrappers.MetricMetadata; import javax.inject.Inject; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorage.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorage.java index 8280ba5a0..0f725f48f 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorage.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorage.java @@ -3,9 +3,9 @@ import com.azure.core.exception.AzureException; import com.azure.core.util.BinaryData; import com.azure.storage.blob.BlobClient; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataStorage; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStorage; import gov.hhs.cdc.trustedintermediary.wrappers.Logger; import gov.hhs.cdc.trustedintermediary.wrappers.formatter.Formatter; import gov.hhs.cdc.trustedintermediary.wrappers.formatter.FormatterProcessingException; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorage.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorage.java index b3374188c..89822e4c3 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorage.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorage.java @@ -1,8 +1,8 @@ package gov.hhs.cdc.trustedintermediary.external.database; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataStorage; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStorage; import gov.hhs.cdc.trustedintermediary.wrappers.Logger; import java.sql.SQLException; import java.util.Optional; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java index 21b111500..2d1a9e1a2 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java @@ -1,7 +1,7 @@ package gov.hhs.cdc.trustedintermediary.external.database; import gov.hhs.cdc.trustedintermediary.context.ApplicationContext; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus; import gov.hhs.cdc.trustedintermediary.external.azure.AzureClient; import gov.hhs.cdc.trustedintermediary.wrappers.Logger; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverter.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverter.java index dfd8fa0e8..b365ca078 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverter.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverter.java @@ -1,7 +1,7 @@ package gov.hhs.cdc.trustedintermediary.external.hapi; import gov.hhs.cdc.trustedintermediary.etor.demographics.Demographics; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; import gov.hhs.cdc.trustedintermediary.etor.operationoutcomes.FhirMetadata; import gov.hhs.cdc.trustedintermediary.etor.operationoutcomes.HapiFhirMetadata; import gov.hhs.cdc.trustedintermediary.etor.orders.Order; diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorage.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorage.java index 7f67494fe..9d07c92c4 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorage.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorage.java @@ -1,8 +1,8 @@ package gov.hhs.cdc.trustedintermediary.external.localfile; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException; -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataStorage; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException; +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStorage; import gov.hhs.cdc.trustedintermediary.wrappers.Logger; import gov.hhs.cdc.trustedintermediary.wrappers.formatter.Formatter; import gov.hhs.cdc.trustedintermediary.wrappers.formatter.FormatterProcessingException; diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistrationTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistrationTest.groovy index 932eddd74..2f2c292aa 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistrationTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistrationTest.groovy @@ -11,9 +11,9 @@ import gov.hhs.cdc.trustedintermediary.etor.demographics.ConvertAndSendDemograph import gov.hhs.cdc.trustedintermediary.etor.demographics.Demographics import gov.hhs.cdc.trustedintermediary.etor.demographics.PatientDemographicsController import gov.hhs.cdc.trustedintermediary.etor.demographics.PatientDemographicsResponse -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataOrchestrator +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataOrchestrator import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import gov.hhs.cdc.trustedintermediary.etor.operationoutcomes.FhirMetadata import gov.hhs.cdc.trustedintermediary.etor.orders.Order @@ -25,8 +25,6 @@ import gov.hhs.cdc.trustedintermediary.etor.orders.UnableToSendOrderException import gov.hhs.cdc.trustedintermediary.wrappers.FhirParseException import gov.hhs.cdc.trustedintermediary.wrappers.HapiFhir import gov.hhs.cdc.trustedintermediary.wrappers.Logger -import org.hl7.fhir.r4.model.OperationOutcome - import java.time.Instant import spock.lang.Specification diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy index a3988f02d..d71121739 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy @@ -1,6 +1,6 @@ package gov.hhs.cdc.trustedintermediary.etor.metadata - +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException import spock.lang.Specification class PartnerMetadataExceptionTest extends Specification { diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy index 5c0af8931..493a8d93e 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy @@ -2,7 +2,11 @@ package gov.hhs.cdc.trustedintermediary.etor.metadata import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext import gov.hhs.cdc.trustedintermediary.etor.RSEndpointClient +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataOrchestrator import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStorage import gov.hhs.cdc.trustedintermediary.etor.orders.OrderConverter import gov.hhs.cdc.trustedintermediary.external.hapi.HapiOrderConverter import gov.hhs.cdc.trustedintermediary.external.jackson.Jackson diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy index f304c3831..92b9ee427 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy @@ -2,6 +2,7 @@ package gov.hhs.cdc.trustedintermediary.etor.metadata import gov.hhs.cdc.trustedintermediary.PojoTestUtils +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import java.time.Instant diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCaseTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCaseTest.groovy index 2b6f51427..e76f21ed8 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCaseTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCaseTest.groovy @@ -3,8 +3,8 @@ package gov.hhs.cdc.trustedintermediary.etor.orders import gov.hhs.cdc.trustedintermediary.OrderMock import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext import gov.hhs.cdc.trustedintermediary.etor.metadata.EtorMetadataStep -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataOrchestrator +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataOrchestrator import gov.hhs.cdc.trustedintermediary.wrappers.Logger import gov.hhs.cdc.trustedintermediary.wrappers.MetricMetadata import spock.lang.Specification diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorageTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorageTest.groovy index 8df14e7e5..51226f5f2 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorageTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/azure/AzureStorageAccountPartnerMetadataStorageTest.groovy @@ -4,8 +4,8 @@ import com.azure.core.exception.AzureException import com.azure.core.util.BinaryData import com.azure.storage.blob.BlobClient import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import gov.hhs.cdc.trustedintermediary.external.jackson.Jackson import gov.hhs.cdc.trustedintermediary.wrappers.formatter.Formatter diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorageTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorageTest.groovy index 13188047a..ab12254e9 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorageTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/DatabasePartnerMetadataStorageTest.groovy @@ -1,9 +1,9 @@ package gov.hhs.cdc.trustedintermediary.external.database import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataStorage +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStorage import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import spock.lang.Specification diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/PostgresDaoTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/PostgresDaoTest.groovy index 348223528..75a6ecd68 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/PostgresDaoTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/database/PostgresDaoTest.groovy @@ -1,7 +1,7 @@ package gov.hhs.cdc.trustedintermediary.external.database import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import gov.hhs.cdc.trustedintermediary.external.azure.AzureClient import gov.hhs.cdc.trustedintermediary.wrappers.SqlDriverManager diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverterTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverterTest.groovy index f499e227d..9cc59e389 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverterTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiOrderConverterTest.groovy @@ -3,7 +3,7 @@ package gov.hhs.cdc.trustedintermediary.external.hapi import gov.hhs.cdc.trustedintermediary.DemographicsMock import gov.hhs.cdc.trustedintermediary.OrderMock import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata import gov.hhs.cdc.trustedintermediary.etor.orders.OrderConverter import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import org.hl7.fhir.r4.model.Address diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorageTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorageTest.groovy index 8e2ffb2ac..243d004d5 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorageTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/localfile/FilePartnerMetadataStorageTest.groovy @@ -1,8 +1,8 @@ package gov.hhs.cdc.trustedintermediary.external.localfile import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadata -import gov.hhs.cdc.trustedintermediary.etor.metadata.PartnerMetadataException +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadata +import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataStatus import gov.hhs.cdc.trustedintermediary.external.jackson.Jackson import gov.hhs.cdc.trustedintermediary.wrappers.formatter.Formatter From 17497d22d97f4948c9c21b93c83c63890819cc0c Mon Sep 17 00:00:00 2001 From: halprin Date: Tue, 16 Jan 2024 16:02:30 -0700 Subject: [PATCH 2/2] Mpove the tests too --- .../{ => partner}/PartnerMetadataExceptionTest.groovy | 4 ++-- .../{ => partner}/PartnerMetadataOrchestratorTest.groovy | 2 +- .../etor/metadata/{ => partner}/PartnerMetadataTest.groovy | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadataExceptionTest.groovy (82%) rename etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadataOrchestratorTest.groovy (99%) rename etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/{ => partner}/PartnerMetadataTest.groovy (98%) diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataExceptionTest.groovy similarity index 82% rename from etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy rename to etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataExceptionTest.groovy index d71121739..00d80e0e0 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataExceptionTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataExceptionTest.groovy @@ -1,6 +1,6 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner + -import gov.hhs.cdc.trustedintermediary.etor.metadata.partner.PartnerMetadataException import spock.lang.Specification class PartnerMetadataExceptionTest extends Specification { diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestratorTest.groovy similarity index 99% rename from etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy rename to etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestratorTest.groovy index 493a8d93e..0201fe3c0 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataOrchestratorTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestratorTest.groovy @@ -1,4 +1,4 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext import gov.hhs.cdc.trustedintermediary.etor.RSEndpointClient diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataTest.groovy similarity index 98% rename from etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy rename to etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataTest.groovy index 92b9ee427..f1b7f296a 100644 --- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/PartnerMetadataTest.groovy +++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataTest.groovy @@ -1,4 +1,4 @@ -package gov.hhs.cdc.trustedintermediary.etor.metadata +package gov.hhs.cdc.trustedintermediary.etor.metadata.partner import gov.hhs.cdc.trustedintermediary.PojoTestUtils