From f55fccea09c20f033a516122b398f5ca43517c07 Mon Sep 17 00:00:00 2001
From: neelesh thakur <nthakur4@slb.com>
Date: Wed, 29 Jul 2020 14:58:38 -0400
Subject: [PATCH] move interfaces to package provider.interfaces
---
.../provider/gcp/action/datastore/DatastoreActionRepo.java | 2 +-
.../provider/gcp/ddms/datastore/DatastoreDdmsRepository.java | 2 +-
.../provider/gcp/subscriber/SubscriptionRepository.java | 2 +-
.../register/action/services/RetrieveActionServiceImpl.java | 1 +
.../main/java/org/opengroup/osdu/register/api/ActionApi.java | 4 ++--
.../main/java/org/opengroup/osdu/register/api/DdmsApi.java | 2 +-
.../java/org/opengroup/osdu/register/api/SubscriberApi.java | 2 +-
.../register/ddms/persistence/mongo/MongoDdmsRepository.java | 2 +-
.../osdu/register/ddms/services/ConsumptionService.java | 2 +-
.../interfaces/action}/IActionRepo.java | 2 +-
.../interfaces/action}/IRetrieveActionService.java | 2 +-
.../interfaces/ddms}/IDdmsRepository.java | 2 +-
.../interfaces/subscriber}/ISubscriptionRepository.java | 2 +-
.../osdu/register/subscriber/services/CreateSubscription.java | 2 +-
.../osdu/register/subscriber/services/DeleteSubscription.java | 2 +-
.../subscriber/services/UpdateSubscriptionSecret.java | 2 +-
.../java/org/opengroup/osdu/register/api/ActionApiTest.java | 4 ++--
.../java/org/opengroup/osdu/register/api/DdmsApiTest.java | 2 +-
.../org/opengroup/osdu/register/api/SubscriberApiTest.java | 2 +-
.../osdu/register/ddms/services/ConsumptionServiceTest.java | 2 +-
.../register/subscriber/services/CreateSubscriptionTest.java | 2 +-
.../register/subscriber/services/DeleteSubscriptionTest.java | 2 +-
.../register/subscriber/services/UpdateSubscriptionTest.java | 2 +-
23 files changed, 25 insertions(+), 24 deletions(-)
rename register-core/src/main/java/org/opengroup/osdu/register/{action/persistence => provider/interfaces/action}/IActionRepo.java (95%)
rename register-core/src/main/java/org/opengroup/osdu/register/{action/services => provider/interfaces/action}/IRetrieveActionService.java (92%)
rename register-core/src/main/java/org/opengroup/osdu/register/{ddms/persistence => provider/interfaces/ddms}/IDdmsRepository.java (93%)
rename register-core/src/main/java/org/opengroup/osdu/register/{subscriber/persistence => provider/interfaces/subscriber}/ISubscriptionRepository.java (94%)
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 89972da36..a65321e30 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 f6274b92f..4397ac6ea 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 47dc7218c..06e5dd870 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 129c8a831..88de86dfa 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 52d72f0ff..ed6eb76da 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 7492541d6..0d92999ce 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 ad4ef097b..ed99d9854 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 8783d833d..ddaa59e7f 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 5b064157f..e72f6f759 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 bc7c7b113..3ee5ee617 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 5529dcd26..0bdda0372 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 fedaba3f9..e68dbfaf6 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 cf9dd9180..bafd83162 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 c01cb9118..3d6dc8cd4 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 b12030b8e..f70525b99 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 d768f5408..afec85a19 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 d306f0fcf..01b9057bf 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 aadd0d2a5..62f787e4c 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 a388d4b9e..4167393ba 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 b1de6e49d..e08c66838 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 ff6f5a194..545bf3136 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 bd29e3174..86893a295 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 c91646019..0e19235ae 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;
--
GitLab