diff --git a/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/action/datastore/DatastoreActionRepo.java b/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/action/datastore/DatastoreActionRepo.java index 89972da3672c6f7ee63a6b8d1e228abe4db12d4d..a65321e30745040fc65f7b26e51703e84fa0de18 100644 --- a/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/action/datastore/DatastoreActionRepo.java +++ b/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/action/datastore/DatastoreActionRepo.java @@ -21,7 +21,7 @@ import com.google.gson.Gson; import lombok.Getter; import org.apache.http.HttpStatus; import org.opengroup.osdu.register.action.model.Action; -import org.opengroup.osdu.register.action.persistence.IActionRepo; +import org.opengroup.osdu.register.provider.interfaces.action.IActionRepo; import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.tenant.TenantInfo; import org.opengroup.osdu.core.common.util.Crc32c; diff --git a/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/ddms/datastore/DatastoreDdmsRepository.java b/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/ddms/datastore/DatastoreDdmsRepository.java index f6274b92f3be226d942b19931428c3e4cc65d490..4397ac6ea7eea05beab531eb8351f86cd1eca75d 100644 --- a/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/ddms/datastore/DatastoreDdmsRepository.java +++ b/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/ddms/datastore/DatastoreDdmsRepository.java @@ -20,7 +20,7 @@ import com.google.cloud.datastore.*; import com.google.gson.Gson; import org.opengroup.osdu.register.ddms.model.Ddms; import org.opengroup.osdu.register.ddms.model.RegisteredInterface; -import org.opengroup.osdu.register.ddms.persistence.IDdmsRepository; +import org.opengroup.osdu.register.provider.interfaces.ddms.IDdmsRepository; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.core.common.model.tenant.TenantInfo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/subscriber/SubscriptionRepository.java b/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/subscriber/SubscriptionRepository.java index 47dc7218c34c997a5a70973cea58490025d2f32d..06e5dd87067b5c8b0af8ff7bd55dbdff50f7f5f8 100644 --- a/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/subscriber/SubscriptionRepository.java +++ b/provider/register-gcp/src/main/java/org/opengroup/osdu/register/provider/gcp/subscriber/SubscriptionRepository.java @@ -19,7 +19,7 @@ package org.opengroup.osdu.register.provider.gcp.subscriber; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.subscriber.model.Secret; import org.opengroup.osdu.register.subscriber.model.Subscription; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/action/services/RetrieveActionServiceImpl.java b/register-core/src/main/java/org/opengroup/osdu/register/action/services/RetrieveActionServiceImpl.java index 129c8a831ec580d4ecd80a41784dd09c84b146ee..88de86dfa645c0845926af03919de8ef1841bfb9 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/action/services/RetrieveActionServiceImpl.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/action/services/RetrieveActionServiceImpl.java @@ -22,6 +22,7 @@ import org.opengroup.osdu.register.action.model.CreateActionDto; import org.opengroup.osdu.register.action.model.ParsedAction; import org.opengroup.osdu.register.action.model.TestActionRequest; import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; +import org.opengroup.osdu.register.provider.interfaces.action.IRetrieveActionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/api/ActionApi.java b/register-core/src/main/java/org/opengroup/osdu/register/api/ActionApi.java index 52d72f0fff10db289e5a00afb6d575c0b2f267a9..ed6eb76da1de16888fb2218f308a7df730bdf265 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/api/ActionApi.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/api/ActionApi.java @@ -21,8 +21,8 @@ import org.opengroup.osdu.register.action.model.Action; import org.opengroup.osdu.register.action.model.CreateActionDto; import org.opengroup.osdu.register.action.model.ParsedAction; import org.opengroup.osdu.register.action.model.TestActionRequest; -import org.opengroup.osdu.register.action.persistence.IActionRepo; -import org.opengroup.osdu.register.action.services.IRetrieveActionService; +import org.opengroup.osdu.register.provider.interfaces.action.IActionRepo; +import org.opengroup.osdu.register.provider.interfaces.action.IRetrieveActionService; import org.opengroup.osdu.register.action.services.TestActionService; import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.http.AppException; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/api/DdmsApi.java b/register-core/src/main/java/org/opengroup/osdu/register/api/DdmsApi.java index 7492541d67403deb93180b1640b88a52bcd3332e..0d92999ce5690690d91607fd725061b2db113418 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/api/DdmsApi.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/api/DdmsApi.java @@ -18,7 +18,7 @@ package org.opengroup.osdu.register.api; import javax.validation.constraints.NotBlank; import org.opengroup.osdu.register.ddms.model.Ddms; -import org.opengroup.osdu.register.ddms.persistence.IDdmsRepository; +import org.opengroup.osdu.register.provider.interfaces.ddms.IDdmsRepository; import org.opengroup.osdu.register.ddms.services.ConsumptionService; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/api/SubscriberApi.java b/register-core/src/main/java/org/opengroup/osdu/register/api/SubscriberApi.java index ad4ef097b47bca2e3ff4e732b0f6431f76172ca5..ed99d9854db24dd2f8881da2872e5772f6a290d0 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/api/SubscriberApi.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/api/SubscriberApi.java @@ -21,7 +21,7 @@ import org.opengroup.osdu.register.api.dto.SubscriptionInfo; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.subscriber.model.Secret; import org.opengroup.osdu.register.subscriber.model.Subscription; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.opengroup.osdu.register.subscriber.services.AvailableTopics; import org.opengroup.osdu.register.subscriber.services.CreateSubscription; import org.opengroup.osdu.register.subscriber.services.DeleteSubscription; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/mongo/MongoDdmsRepository.java b/register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/mongo/MongoDdmsRepository.java index 8783d833d5d1f1c8d62e029622941f30d08abd51..ddaa59e7f64b03036486ca0203aa5cdcab199f98 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/mongo/MongoDdmsRepository.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/mongo/MongoDdmsRepository.java @@ -24,7 +24,7 @@ import org.bson.Document; import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.register.ddms.model.Ddms; import org.opengroup.osdu.register.ddms.model.RegisteredInterface; -import org.opengroup.osdu.register.ddms.persistence.IDdmsRepository; +import org.opengroup.osdu.register.provider.interfaces.ddms.IDdmsRepository; import org.opengroup.osdu.core.common.model.http.AppException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/ddms/services/ConsumptionService.java b/register-core/src/main/java/org/opengroup/osdu/register/ddms/services/ConsumptionService.java index 5b064157f80ae0a065e3d7244b15ac92a775cb13..e72f6f7598457d8ef1180b0db3512b9278d3f459 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/ddms/services/ConsumptionService.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/ddms/services/ConsumptionService.java @@ -19,7 +19,7 @@ package org.opengroup.osdu.register.ddms.services; import org.apache.http.HttpStatus; import org.opengroup.osdu.register.ddms.model.Ddms; import org.opengroup.osdu.register.ddms.model.RegisteredInterface; -import org.opengroup.osdu.register.ddms.persistence.IDdmsRepository; +import org.opengroup.osdu.register.provider.interfaces.ddms.IDdmsRepository; import org.opengroup.osdu.core.common.model.http.AppException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/action/persistence/IActionRepo.java b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/action/IActionRepo.java similarity index 95% rename from register-core/src/main/java/org/opengroup/osdu/register/action/persistence/IActionRepo.java rename to register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/action/IActionRepo.java index bc7c7b1131cffd13891745afb3c5129bc9bb58cf..3ee5ee617927277ad9e32c67104a45647619cd53 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/action/persistence/IActionRepo.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/action/IActionRepo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.opengroup.osdu.register.action.persistence; +package org.opengroup.osdu.register.provider.interfaces.action; import java.util.List; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/action/services/IRetrieveActionService.java b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/action/IRetrieveActionService.java similarity index 92% rename from register-core/src/main/java/org/opengroup/osdu/register/action/services/IRetrieveActionService.java rename to register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/action/IRetrieveActionService.java index 5529dcd2668322e82e085b156b55a103ebcc5774..0bdda03728cee767e535cdfda04ab5d504b0a9a8 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/action/services/IRetrieveActionService.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/action/IRetrieveActionService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.opengroup.osdu.register.action.services; +package org.opengroup.osdu.register.provider.interfaces.action; import com.fasterxml.jackson.databind.JsonNode; import org.opengroup.osdu.register.action.model.Action; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/IDdmsRepository.java b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/ddms/IDdmsRepository.java similarity index 93% rename from register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/IDdmsRepository.java rename to register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/ddms/IDdmsRepository.java index fedaba3f92990ecbea6932c19fdab18661bf95b2..e68dbfaf600db0ce97915bc44b5803ff4315c1ce 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/ddms/persistence/IDdmsRepository.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/ddms/IDdmsRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.opengroup.osdu.register.ddms.persistence; +package org.opengroup.osdu.register.provider.interfaces.ddms; import org.opengroup.osdu.register.ddms.model.Ddms; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/persistence/ISubscriptionRepository.java b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/subscriber/ISubscriptionRepository.java similarity index 94% rename from register-core/src/main/java/org/opengroup/osdu/register/subscriber/persistence/ISubscriptionRepository.java rename to register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/subscriber/ISubscriptionRepository.java index cf9dd9180b60c8cf8d19c18f212ede6860ed59bc..bafd83162f645dc1407b1badc0a173e277557ef5 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/persistence/ISubscriptionRepository.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/provider/interfaces/subscriber/ISubscriptionRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.opengroup.osdu.register.subscriber.persistence; +package org.opengroup.osdu.register.provider.interfaces.subscriber; import org.opengroup.osdu.register.subscriber.model.Secret; import org.opengroup.osdu.register.subscriber.model.Subscription; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/CreateSubscription.java b/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/CreateSubscription.java index c01cb911803f1473a285242a832306fddf764a2d..3d6dc8cd4addf53b6ab2c9e43f87995be8af6fa8 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/CreateSubscription.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/CreateSubscription.java @@ -19,7 +19,7 @@ package org.opengroup.osdu.register.subscriber.services; import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.opengroup.osdu.register.subscriber.model.Subscription; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscription.java b/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscription.java index b12030b8ec556bcae49b3fad188ab16f40507fbb..f70525b99687de1f3ae9b173a974d48622ba60b9 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscription.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscription.java @@ -17,7 +17,7 @@ package org.opengroup.osdu.register.subscriber.services; import org.opengroup.osdu.register.logging.AuditLog; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionSecret.java b/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionSecret.java index d768f540862f465d6e299c71754b05e7273ec2c6..afec85a19005e877ba91a210f0db27153d1bf5de 100644 --- a/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionSecret.java +++ b/register-core/src/main/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionSecret.java @@ -18,7 +18,7 @@ package org.opengroup.osdu.register.subscriber.services; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.opengroup.osdu.register.subscriber.model.Secret; import org.opengroup.osdu.register.subscriber.model.Subscription; import org.springframework.beans.factory.annotation.Autowired; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/api/ActionApiTest.java b/register-core/src/test/java/org/opengroup/osdu/register/api/ActionApiTest.java index d306f0fcff2b40fb1d4d6e1ddfdc4e489147bd93..01b9057bf3002dcacc8aaa8630a7c61e69615cb1 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/api/ActionApiTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/api/ActionApiTest.java @@ -27,8 +27,8 @@ import org.opengroup.osdu.register.action.model.Action; import org.opengroup.osdu.register.action.model.CreateActionDto; import org.opengroup.osdu.register.action.model.ParsedAction; import org.opengroup.osdu.register.action.model.TestActionRequest; -import org.opengroup.osdu.register.action.persistence.IActionRepo; -import org.opengroup.osdu.register.action.services.IRetrieveActionService; +import org.opengroup.osdu.register.provider.interfaces.action.IActionRepo; +import org.opengroup.osdu.register.provider.interfaces.action.IRetrieveActionService; import org.opengroup.osdu.register.action.services.TestActionService; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/api/DdmsApiTest.java b/register-core/src/test/java/org/opengroup/osdu/register/api/DdmsApiTest.java index aadd0d2a54b6ff0487a41c334a0d9e351d8b1c32..62f787e4c350c48a0376239c07545363884cb2c2 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/api/DdmsApiTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/api/DdmsApiTest.java @@ -24,7 +24,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.opengroup.osdu.register.utils.OpenApiFileUtils; import org.opengroup.osdu.register.ddms.model.Ddms; -import org.opengroup.osdu.register.ddms.persistence.IDdmsRepository; +import org.opengroup.osdu.register.provider.interfaces.ddms.IDdmsRepository; import org.opengroup.osdu.register.ddms.services.ConsumptionService; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/api/SubscriberApiTest.java b/register-core/src/test/java/org/opengroup/osdu/register/api/SubscriberApiTest.java index a388d4b9e96a0e3989dd005fa0e27f6ed05b6edf..4167393ba9bfd944816b302ec645ae5caa8f0bd8 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/api/SubscriberApiTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/api/SubscriberApiTest.java @@ -28,7 +28,7 @@ import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; import org.opengroup.osdu.register.subscriber.model.HmacSecret; import org.opengroup.osdu.register.subscriber.model.Subscription; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.opengroup.osdu.register.subscriber.services.AvailableTopics; import org.opengroup.osdu.register.subscriber.services.CreateSubscription; import org.opengroup.osdu.register.subscriber.services.DeleteSubscription; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/ddms/services/ConsumptionServiceTest.java b/register-core/src/test/java/org/opengroup/osdu/register/ddms/services/ConsumptionServiceTest.java index b1de6e49dda637f9ce4ca4a9b7c11a47489f9264..e08c668386a7988f4e4cb2625b1f8fbabde1637e 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/ddms/services/ConsumptionServiceTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/ddms/services/ConsumptionServiceTest.java @@ -17,7 +17,7 @@ package org.opengroup.osdu.register.ddms.services; import org.opengroup.osdu.register.ddms.model.Ddms; -import org.opengroup.osdu.register.ddms.persistence.IDdmsRepository; +import org.opengroup.osdu.register.provider.interfaces.ddms.IDdmsRepository; import org.opengroup.osdu.register.utils.OpenApiFileUtils; import org.opengroup.osdu.core.common.model.http.AppException; import org.apache.http.HttpStatus; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/CreateSubscriptionTest.java b/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/CreateSubscriptionTest.java index ff6f5a1943c7e681f1f3afd38bf7c60750058c29..545bf31369c179d2c4fba5e39768079d53071777 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/CreateSubscriptionTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/CreateSubscriptionTest.java @@ -25,7 +25,7 @@ import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; import org.opengroup.osdu.register.subscriber.model.Subscription; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscriptionTest.java b/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscriptionTest.java index bd29e317455e7ca22207b093c1a08bc9dc7b8399..86893a295a1a7e17d8c80c379a11ed081bbd84ad 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscriptionTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/DeleteSubscriptionTest.java @@ -19,7 +19,7 @@ package org.opengroup.osdu.register.subscriber.services; import org.opengroup.osdu.register.logging.AuditLog; import org.opengroup.osdu.register.subscriber.model.HmacSecret; import org.opengroup.osdu.register.subscriber.model.Subscription; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionTest.java b/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionTest.java index c91646019e05772653d4807f35bf083333b8b055..0e19235aedb9f78c5b862495f4cbe94973c8abac 100644 --- a/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionTest.java +++ b/register-core/src/test/java/org/opengroup/osdu/register/subscriber/services/UpdateSubscriptionTest.java @@ -20,7 +20,7 @@ import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.register.logging.AuditLog; import org.opengroup.osdu.register.subscriber.model.HmacSecret; import org.opengroup.osdu.register.subscriber.model.Subscription; -import org.opengroup.osdu.register.subscriber.persistence.ISubscriptionRepository; +import org.opengroup.osdu.register.provider.interfaces.subscriber.ISubscriptionRepository; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks;