tracing-decomposition

finos · Oct 13, 2023 · 1ba6c85 · 1ba6c85
1 parent d878c22
commit 1ba6c85
Show file tree

Hide file tree

Showing 124 changed files with 476 additions and 503 deletions.
diff --git a/legend-depot-artifacts-api/pom.xml b/legend-depot-artifacts-api/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
-            <artifactId>legend-depot-core-store-api</artifactId>
+            <artifactId>legend-depot-entities-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>

diff --git a/legend-depot-artifacts-repository-api/pom.xml b/legend-depot-artifacts-repository-api/pom.xml
@@ -31,9 +31,17 @@
         <!-- DEPOT -->
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
-            <artifactId>legend-depot-core-http</artifactId>
+            <artifactId>legend-depot-core-tracing</artifactId>
         </dependency>
         <!-- DEPOT -->
+        <dependency>
+            <groupId>org.finos.legend.sdlc</groupId>
+            <artifactId>legend-sdlc-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
@@ -65,5 +73,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 </project>
diff --git a/.../java/org/finos/legend/depot/store/resources/artifacts/repository/RepositoryResource.java b/.../java/org/finos/legend/depot/store/resources/artifacts/repository/RepositoryResource.java
@@ -20,8 +20,8 @@
 import io.swagger.annotations.ApiParam;
 import org.finos.legend.depot.services.api.artifacts.repository.ArtifactRepository;
 import org.finos.legend.depot.services.api.artifacts.repository.ArtifactRepositoryException;
-import org.finos.legend.depot.tracing.resources.BaseResource;
-import org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing;
+import org.finos.legend.depot.core.services.tracing.resources.TracingResource;
+import org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;
@@ -35,7 +35,7 @@
 
 @Path("")
 @Api("Repository")
-public class RepositoryResource extends BaseResource
+public class RepositoryResource extends TracingResource
 {
 
     private final ArtifactRepository artifactRepository;

diff --git a/legend-depot-artifacts-repository-maven-impl/pom.xml b/legend-depot-artifacts-repository-maven-impl/pom.xml
@@ -33,6 +33,10 @@
             <groupId>org.finos.legend.depot</groupId>
             <artifactId>legend-depot-core-tracing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.depot</groupId>
+            <artifactId>legend-depot-model</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
             <artifactId>legend-depot-artifacts-repository-api</artifactId>
@@ -67,6 +71,7 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>

diff --git a/...a/org/finos/legend/depot/services/artifacts/repository/maven/MavenArtifactRepository.java b/...a/org/finos/legend/depot/services/artifacts/repository/maven/MavenArtifactRepository.java
@@ -29,7 +29,7 @@
 import org.finos.legend.depot.domain.artifacts.repository.ArtifactDependency;
 import org.finos.legend.depot.domain.artifacts.repository.ArtifactType;
 import org.finos.legend.depot.domain.version.VersionValidator;
-import org.finos.legend.depot.tracing.services.TracerFactory;
+import org.finos.legend.depot.core.services.tracing.TracerFactory;
 import org.finos.legend.sdlc.domain.model.version.VersionId;
 import org.jboss.shrinkwrap.resolver.api.NoResolvedResultException;
 import org.jboss.shrinkwrap.resolver.api.ResolutionException;

diff --git a/legend-depot-artifacts-services/pom.xml b/legend-depot-artifacts-services/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
-            <artifactId>legend-depot-core-http</artifactId>
+            <artifactId>legend-depot-core-tracing</artifactId>
         </dependency>
         <!-- SDLC -->
         <dependency>

diff --git a/.../main/java/org/finos/legend/depot/services/artifacts/purge/ArtifactsPurgeServiceImpl.java b/.../main/java/org/finos/legend/depot/services/artifacts/purge/ArtifactsPurgeServiceImpl.java
@@ -27,8 +27,8 @@
 import org.finos.legend.depot.services.api.artifacts.reconciliation.VersionsReconciliationService;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
-import org.finos.legend.depot.tracing.services.TracerFactory;
-import org.finos.legend.depot.tracing.services.prometheus.PrometheusMetricsFactory;
+import org.finos.legend.depot.core.services.tracing.TracerFactory;
+import org.finos.legend.depot.core.services.metrics.PrometheusMetricsFactory;
 import org.slf4j.Logger;
 
 import javax.inject.Inject;
@@ -42,9 +42,9 @@
 import java.util.stream.Collectors;
 
 import static org.finos.legend.depot.domain.DatesHandler.toDate;
-import static org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing.DELETE_VERSION;
-import static org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing.DEPRECATE_VERSION;
-import static org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing.EVICT_VERSION;
+import static org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing.DELETE_VERSION;
+import static org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing.DEPRECATE_VERSION;
+import static org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing.EVICT_VERSION;
 
 
 public class ArtifactsPurgeServiceImpl implements ArtifactsPurgeService

diff --git a/...nos/legend/depot/services/artifacts/reconciliation/VersionsReconciliationServiceImpl.java b/...nos/legend/depot/services/artifacts/reconciliation/VersionsReconciliationServiceImpl.java
@@ -23,7 +23,7 @@
 import org.finos.legend.depot.domain.version.VersionMismatch;
 import org.finos.legend.depot.domain.version.VersionValidator;
 import org.finos.legend.depot.services.api.projects.ProjectsService;
-import org.finos.legend.depot.tracing.services.prometheus.PrometheusMetricsFactory;
+import org.finos.legend.depot.core.services.metrics.PrometheusMetricsFactory;
 import org.slf4j.Logger;
 
 import javax.inject.Inject;

diff --git a/...n/java/org/finos/legend/depot/services/artifacts/refresh/ArtifactsRefreshServiceImpl.java b/...n/java/org/finos/legend/depot/services/artifacts/refresh/ArtifactsRefreshServiceImpl.java
@@ -28,7 +28,7 @@
 import org.finos.legend.depot.services.api.artifacts.refresh.ArtifactsRefreshService;
 import org.finos.legend.depot.services.api.artifacts.refresh.ParentEvent;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
-import org.finos.legend.depot.tracing.services.TracerFactory;
+import org.finos.legend.depot.core.services.tracing.TracerFactory;
 import org.finos.legend.sdlc.domain.model.version.VersionId;
 import org.slf4j.Logger;
 

diff --git a/.../java/org/finos/legend/depot/services/artifacts/refresh/ProjectVersionRefreshHandler.java b/.../java/org/finos/legend/depot/services/artifacts/refresh/ProjectVersionRefreshHandler.java
@@ -41,8 +41,8 @@
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactHandlerFactory;
 import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactsHandler;
-import org.finos.legend.depot.tracing.services.TracerFactory;
-import org.finos.legend.depot.tracing.services.prometheus.PrometheusMetricsFactory;
+import org.finos.legend.depot.core.services.tracing.TracerFactory;
+import org.finos.legend.depot.core.services.metrics.PrometheusMetricsFactory;
 import org.slf4j.Logger;
 
 import javax.inject.Inject;

diff --git a/...services/src/main/java/org/finos/legend/depot/services/guice/ArtifactsServicesModule.java b/...services/src/main/java/org/finos/legend/depot/services/guice/ArtifactsServicesModule.java
@@ -44,7 +44,7 @@
 import org.finos.legend.depot.services.api.artifacts.handlers.entties.VersionedEntityArtifactsProvider;
 import org.finos.legend.depot.services.api.artifacts.handlers.generations.FileGenerationsArtifactsHandler;
 import org.finos.legend.depot.services.api.artifacts.handlers.generations.FileGenerationsArtifactsProvider;
-import org.finos.legend.depot.tracing.api.PrometheusMetricsHandler;
+import org.finos.legend.depot.core.services.api.metrics.PrometheusMetricsHandler;
 
 import static org.finos.legend.depot.services.artifacts.refresh.ProjectVersionRefreshHandler.TOTAL_NUMBER_OF_VERSIONS_REFRESH;
 import static org.finos.legend.depot.services.artifacts.refresh.ProjectVersionRefreshHandler.VERSION_REFRESH_COUNTER;

diff --git a/...main/java/org/finos/legend/depot/services/guice/VersionReconciliationSchedulesModule.java b/...main/java/org/finos/legend/depot/services/guice/VersionReconciliationSchedulesModule.java
@@ -21,8 +21,8 @@
 import com.google.inject.name.Named;
 import org.finos.legend.depot.services.api.artifacts.reconciliation.VersionsReconciliationService;
 import org.finos.legend.depot.services.api.schedules.SchedulesFactory;
-import org.finos.legend.depot.tracing.api.PrometheusMetricsHandler;
-import org.finos.legend.depot.tracing.configuration.PrometheusConfiguration;
+import org.finos.legend.depot.core.services.api.metrics.PrometheusMetricsHandler;
+import org.finos.legend.depot.core.services.api.metrics.configuration.PrometheusConfiguration;
 
 import static org.finos.legend.depot.services.artifacts.reconciliation.VersionsReconciliationServiceImpl.MISSING_REPO_VERSIONS;
 import static org.finos.legend.depot.services.artifacts.reconciliation.VersionsReconciliationServiceImpl.MISSING_STORE_VERSIONS;

diff --git a/...org/finos/legend/depot/store/resources/artifacts/ArtifactDependenciesRefreshResource.java b/...org/finos/legend/depot/store/resources/artifacts/ArtifactDependenciesRefreshResource.java
@@ -17,11 +17,11 @@
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.finos.legend.depot.core.authorisation.api.AuthorisationProvider;
-import org.finos.legend.depot.core.authorisation.resources.BaseAuthorisedResource;
+import org.finos.legend.depot.core.services.api.authorisation.AuthorisationProvider;
+import org.finos.legend.depot.core.services.authorisation.resources.AuthorisedResource;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
 import org.finos.legend.depot.services.api.artifacts.refresh.RefreshDependenciesService;
-import org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing;
+import org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -36,7 +36,7 @@
 
 @Path("")
 @Api("Artifacts Refresh")
-public class ArtifactDependenciesRefreshResource extends BaseAuthorisedResource
+public class ArtifactDependenciesRefreshResource extends AuthorisedResource
 {
     public static final String ARTIFACTS_RESOURCE = "ArtifactsRefresh";
     private final RefreshDependenciesService refreshDependenciesService;

diff --git a/...rc/main/java/org/finos/legend/depot/store/resources/artifacts/ArtifactsPurgeResource.java b/...rc/main/java/org/finos/legend/depot/store/resources/artifacts/ArtifactsPurgeResource.java
@@ -18,11 +18,11 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.finos.legend.depot.core.authorisation.api.AuthorisationProvider;
-import org.finos.legend.depot.core.authorisation.resources.BaseAuthorisedResource;
+import org.finos.legend.depot.core.services.api.authorisation.AuthorisationProvider;
+import org.finos.legend.depot.core.services.authorisation.resources.AuthorisedResource;
 import org.finos.legend.depot.domain.api.MetadataEventResponse;
 import org.finos.legend.depot.services.api.artifacts.purge.ArtifactsPurgeService;
-import org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing;
+import org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -37,7 +37,7 @@
 
 @Path("")
 @Api("Artifacts Purge")
-public class ArtifactsPurgeResource extends BaseAuthorisedResource
+public class ArtifactsPurgeResource extends AuthorisedResource
 {
     public static final String ARTIFACTS_RESOURCE = "ArtifactsPurge";
     private final ArtifactsPurgeService artifactsPurgeService;

diff --git a/.../main/java/org/finos/legend/depot/store/resources/artifacts/ArtifactsRefreshResource.java b/.../main/java/org/finos/legend/depot/store/resources/artifacts/ArtifactsRefreshResource.java
@@ -18,12 +18,12 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.finos.legend.depot.core.authorisation.api.AuthorisationProvider;
-import org.finos.legend.depot.core.authorisation.resources.BaseAuthorisedResource;
+import org.finos.legend.depot.core.services.api.authorisation.AuthorisationProvider;
+import org.finos.legend.depot.core.services.authorisation.resources.AuthorisedResource;
 import org.finos.legend.depot.domain.api.MetadataEventResponse;
 import org.finos.legend.depot.services.api.artifacts.refresh.ArtifactsRefreshService;
 import org.finos.legend.depot.services.api.artifacts.refresh.ParentEvent;
-import org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing;
+import org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -40,7 +40,7 @@
 
 @Path("")
 @Api("Artifacts Refresh")
-public class ArtifactsRefreshResource extends BaseAuthorisedResource
+public class ArtifactsRefreshResource extends AuthorisedResource
 {
 
     public static final String ARTIFACTS_RESOURCE = "ArtifactsRefresh";

diff --git a/...java/org/finos/legend/depot/store/resources/artifacts/VersionsReconciliationResource.java b/...java/org/finos/legend/depot/store/resources/artifacts/VersionsReconciliationResource.java
@@ -17,11 +17,11 @@
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.finos.legend.depot.core.authorisation.api.AuthorisationProvider;
-import org.finos.legend.depot.core.authorisation.resources.BaseAuthorisedResource;
+import org.finos.legend.depot.core.services.api.authorisation.AuthorisationProvider;
+import org.finos.legend.depot.core.services.authorisation.resources.AuthorisedResource;
 import org.finos.legend.depot.domain.version.VersionMismatch;
 import org.finos.legend.depot.services.api.artifacts.reconciliation.VersionsReconciliationService;
-import org.finos.legend.depot.tracing.resources.ResourceLoggingAndTracing;
+import org.finos.legend.depot.core.services.tracing.ResourceLoggingAndTracing;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -35,7 +35,7 @@
 
 @Path("")
 @Api("Repository")
-public class VersionsReconciliationResource extends BaseAuthorisedResource
+public class VersionsReconciliationResource extends AuthorisedResource
 {
     private static final String REPOSITORY = "Repository";
     private final VersionsReconciliationService reconciliationService;

diff --git a/...g/finos/legend/depot/services/artifacts/handlers/generations/TestGenerationsProvider.java b/...g/finos/legend/depot/services/artifacts/handlers/generations/TestGenerationsProvider.java
@@ -26,7 +26,7 @@
 import org.finos.legend.depot.services.api.generations.ManageFileGenerationsService;
 import org.finos.legend.depot.services.generations.impl.ManageFileGenerationsServiceImpl;
 import org.finos.legend.depot.services.projects.ProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.entities.UpdateEntities;
 import org.finos.legend.depot.store.api.projects.UpdateProjects;
 import org.finos.legend.depot.store.api.projects.UpdateProjectsVersions;

diff --git a/.../test/java/org/finos/legend/depot/services/artifacts/purge/TestArtifactsPurgeService.java b/.../test/java/org/finos/legend/depot/services/artifacts/purge/TestArtifactsPurgeService.java
@@ -31,7 +31,7 @@
 import org.finos.legend.depot.services.entities.ManageEntitiesServiceImpl;
 import org.finos.legend.depot.services.generations.impl.ManageFileGenerationsServiceImpl;
 import org.finos.legend.depot.services.projects.ManageProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.entities.UpdateEntities;
 import org.finos.legend.depot.store.api.generations.UpdateFileGenerations;
 import org.finos.legend.depot.store.api.projects.UpdateProjects;

diff --git a/...t/java/org/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshService.java b/...t/java/org/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshService.java
@@ -27,7 +27,7 @@
 import org.finos.legend.depot.services.entities.ManageEntitiesServiceImpl;
 import org.finos.legend.depot.services.generations.impl.ManageFileGenerationsServiceImpl;
 import org.finos.legend.depot.services.projects.ManageProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 
 import org.finos.legend.depot.store.api.admin.artifacts.ArtifactsFilesStore;
 import org.finos.legend.depot.store.api.entities.UpdateEntities;

diff --git a/...gend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceExceptionEscenarios.java b/...gend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceExceptionEscenarios.java
@@ -22,7 +22,7 @@
 import org.finos.legend.depot.services.entities.ManageEntitiesServiceImpl;
 import org.finos.legend.depot.services.generations.impl.ManageFileGenerationsServiceImpl;
 import org.finos.legend.depot.services.projects.ManageProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.admin.artifacts.ArtifactsFilesStore;
 import org.finos.legend.depot.store.api.entities.UpdateEntities;
 import org.finos.legend.depot.store.api.generations.UpdateFileGenerations;

diff --git a/...g/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceWithMocks.java b/...g/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceWithMocks.java
@@ -20,7 +20,7 @@
 import org.finos.legend.depot.services.entities.ManageEntitiesServiceImpl;
 import org.finos.legend.depot.services.generations.impl.ManageFileGenerationsServiceImpl;
 import org.finos.legend.depot.services.projects.ManageProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.admin.artifacts.ArtifactsFilesStore;
 import org.finos.legend.depot.store.api.entities.UpdateEntities;
 import org.finos.legend.depot.store.api.generations.UpdateFileGenerations;

diff --git a/...a/org/finos/legend/depot/services/artifacts/refresh/TestProjectVersionRefreshHandler.java b/...a/org/finos/legend/depot/services/artifacts/refresh/TestProjectVersionRefreshHandler.java
@@ -24,7 +24,7 @@
 import org.finos.legend.depot.services.dependencies.DependencyUtil;
 import org.finos.legend.depot.services.entities.ManageEntitiesServiceImpl;
 import org.finos.legend.depot.services.projects.ManageProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.admin.artifacts.ArtifactsFilesStore;
 import org.finos.legend.depot.store.api.entities.UpdateEntities;
 import org.finos.legend.depot.store.api.projects.UpdateProjects;

diff --git a/...ava/org/finos/legend/depot/services/artifacts/refresh/TestRefreshDependenciesService.java b/...ava/org/finos/legend/depot/services/artifacts/refresh/TestRefreshDependenciesService.java
@@ -19,7 +19,7 @@
 import org.finos.legend.depot.services.api.projects.ManageProjectsService;
 import org.finos.legend.depot.services.dependencies.DependencyUtil;
 import org.finos.legend.depot.services.projects.ManageProjectsServiceImpl;
-import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
+import org.finos.legend.depot.services.api.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.projects.UpdateProjects;
 import org.finos.legend.depot.store.api.projects.UpdateProjectsVersions;
 import org.finos.legend.depot.services.api.artifacts.repository.ArtifactRepository;

diff --git a/legend-depot-core-authorisation/pom.xml b/legend-depot-core-authorisation/pom.xml
@@ -28,6 +28,10 @@
     <artifactId>legend-depot-core-authorisation</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.finos.legend.depot</groupId>
+            <artifactId>legend-depot-core-tracing</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

diff --git a/...horisation/api/AuthorisationProvider.java → .../authorisation/AuthorisationProvider.java b/...horisation/api/AuthorisationProvider.java → .../authorisation/AuthorisationProvider.java
@@ -13,7 +13,7 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.core.authorisation.api;
+package org.finos.legend.depot.core.services.api.authorisation;
 
 import javax.inject.Provider;
 import java.security.Principal;

diff --git a/.../services/BasicAuthorisationProvider.java → ...orisation/BasicAuthorisationProvider.java b/.../services/BasicAuthorisationProvider.java → ...orisation/BasicAuthorisationProvider.java
@@ -13,11 +13,11 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.core.authorisation.services;
+package org.finos.legend.depot.core.services.authorisation;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.finos.legend.depot.core.authorisation.api.AuthorisationProvider;
+import org.finos.legend.depot.core.services.api.authorisation.AuthorisationProvider;
 
 import javax.inject.Provider;
 import java.io.IOException;

diff --git a/...ion/resources/BaseAuthorisedResource.java → ...isation/resources/AuthorisedResource.java b/...ion/resources/BaseAuthorisedResource.java → ...isation/resources/AuthorisedResource.java
@@ -13,23 +13,23 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.core.authorisation.resources;
+package org.finos.legend.depot.core.services.authorisation.resources;
 
-import org.finos.legend.depot.core.authorisation.api.AuthorisationProvider;
-import org.finos.legend.depot.tracing.resources.BaseResource;
+import org.finos.legend.depot.core.services.api.authorisation.AuthorisationProvider;
+import org.finos.legend.depot.core.services.tracing.resources.TracingResource;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
 import java.security.Principal;
 
-public abstract class BaseAuthorisedResource extends BaseResource
+public abstract class AuthorisedResource extends TracingResource
 {
     private final AuthorisationProvider authorisationProvider;
     private final Provider<Principal> principalProvider;
 
     @Inject
-    public BaseAuthorisedResource(AuthorisationProvider authorisationProvider, @Named("requestPrincipal") Provider<Principal> principalProvider)
+    public AuthorisedResource(AuthorisationProvider authorisationProvider, @Named("requestPrincipal") Provider<Principal> principalProvider)
     {
         this.authorisationProvider = authorisationProvider;
         this.principalProvider = principalProvider;