diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java index 9ce8a1b91e..8b045084c2 100644 --- a/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java +++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java @@ -6,10 +6,10 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.linkedin.common.urn.Urn; import com.linkedin.data.template.RecordTemplate; -import com.linkedin.metadata.systemmetadata.TraceStorageStatus; -import com.linkedin.metadata.systemmetadata.TraceWriteStatus; import com.linkedin.mxe.SystemMetadata; import com.linkedin.util.Pair; +import io.datahubproject.openapi.v1.models.TraceStorageStatus; +import io.datahubproject.openapi.v1.models.TraceWriteStatus; import java.time.Duration; import java.util.Collection; import java.util.Collections; diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java index 51e30bd6f6..47eddba432 100644 --- a/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java +++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java @@ -11,9 +11,6 @@ import com.linkedin.metadata.models.registry.EntityRegistry; import com.linkedin.metadata.run.AspectRowSummary; import com.linkedin.metadata.systemmetadata.SystemMetadataService; import com.linkedin.metadata.systemmetadata.TraceService; -import com.linkedin.metadata.systemmetadata.TraceStatus; -import com.linkedin.metadata.systemmetadata.TraceStorageStatus; -import com.linkedin.metadata.systemmetadata.TraceWriteStatus; import com.linkedin.mxe.FailedMetadataChangeProposal; import com.linkedin.mxe.SystemMetadata; import com.linkedin.util.Pair; @@ -21,6 +18,9 @@ import io.datahubproject.metadata.context.OperationContext; import io.datahubproject.metadata.context.TraceContext; import io.datahubproject.metadata.context.TraceIdGenerator; import io.datahubproject.metadata.exception.TraceException; +import io.datahubproject.openapi.v1.models.TraceStatus; +import io.datahubproject.openapi.v1.models.TraceStorageStatus; +import io.datahubproject.openapi.v1.models.TraceWriteStatus; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java index c521747536..06e40a4e14 100644 --- a/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java +++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java @@ -12,11 +12,11 @@ import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.UrnUtils; import com.linkedin.data.template.RecordTemplate; import com.linkedin.data.template.StringMap; -import com.linkedin.metadata.systemmetadata.TraceStorageStatus; -import com.linkedin.metadata.systemmetadata.TraceWriteStatus; import com.linkedin.mxe.SystemMetadata; import com.linkedin.util.Pair; import io.datahubproject.metadata.context.TraceContext; +import io.datahubproject.openapi.v1.models.TraceStorageStatus; +import io.datahubproject.openapi.v1.models.TraceWriteStatus; import java.io.IOException; import java.time.Duration; import java.util.Collections; diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java index abe65d48b3..1ec575e556 100644 --- a/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java +++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java @@ -25,9 +25,6 @@ import com.linkedin.metadata.EventUtils; import com.linkedin.metadata.entity.EntityService; import com.linkedin.metadata.run.AspectRowSummary; import com.linkedin.metadata.systemmetadata.SystemMetadataService; -import com.linkedin.metadata.systemmetadata.TraceStatus; -import com.linkedin.metadata.systemmetadata.TraceStorageStatus; -import com.linkedin.metadata.systemmetadata.TraceWriteStatus; import com.linkedin.mxe.FailedMetadataChangeProposal; import com.linkedin.mxe.MetadataChangeProposal; import com.linkedin.mxe.SystemMetadata; @@ -35,6 +32,9 @@ import com.linkedin.util.Pair; import io.datahubproject.metadata.context.OperationContext; import io.datahubproject.metadata.context.TraceContext; import io.datahubproject.metadata.context.TraceIdGenerator; +import io.datahubproject.openapi.v1.models.TraceStatus; +import io.datahubproject.openapi.v1.models.TraceStorageStatus; +import io.datahubproject.openapi.v1.models.TraceWriteStatus; import io.datahubproject.test.metadata.context.TestOperationContexts; import java.time.Instant; import java.util.Collections; diff --git a/metadata-service/openapi-servlet/models/build.gradle b/metadata-service/openapi-servlet/models/build.gradle index dbc51ca17e..d75e656e5e 100644 --- a/metadata-service/openapi-servlet/models/build.gradle +++ b/metadata-service/openapi-servlet/models/build.gradle @@ -6,7 +6,6 @@ dependencies { implementation project(':entity-registry') implementation project(':metadata-operation-context') implementation project(':metadata-auth:auth-api') - implementation project(':metadata-service:services') implementation externalDependency.jacksonDataBind implementation externalDependency.httpClient diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java index 5fc721c281..5c3c14ee57 100644 --- a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java +++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java @@ -2,7 +2,6 @@ package io.datahubproject.openapi.v1.models; import com.fasterxml.jackson.annotation.JsonInclude; import com.linkedin.common.urn.Urn; -import com.linkedin.metadata.systemmetadata.TraceStatus; import java.util.LinkedHashMap; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java similarity index 88% rename from metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java rename to metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java index 35bdecee45..720c7c2a15 100644 --- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java +++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java @@ -1,4 +1,4 @@ -package com.linkedin.metadata.systemmetadata; +package io.datahubproject.openapi.v1.models; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java similarity index 97% rename from metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java rename to metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java index 0def8785a6..b3fb486b00 100644 --- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java +++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java @@ -1,4 +1,4 @@ -package com.linkedin.metadata.systemmetadata; +package io.datahubproject.openapi.v1.models; import com.fasterxml.jackson.annotation.JsonInclude; import io.datahubproject.metadata.exception.TraceException; diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java similarity index 90% rename from metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java rename to metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java index 78bccd6bf1..7fcbe03f1d 100644 --- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java +++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java @@ -1,4 +1,4 @@ -package com.linkedin.metadata.systemmetadata; +package io.datahubproject.openapi.v1.models; public enum TraceWriteStatus { // error occurred during processing diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java index ca26ba4283..d4f387e618 100644 --- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java +++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java @@ -18,15 +18,15 @@ import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.UrnUtils; import com.linkedin.metadata.models.registry.EntityRegistry; import com.linkedin.metadata.systemmetadata.TraceService; -import com.linkedin.metadata.systemmetadata.TraceStatus; -import com.linkedin.metadata.systemmetadata.TraceStorageStatus; -import com.linkedin.metadata.systemmetadata.TraceWriteStatus; import io.datahubproject.metadata.context.ObjectMapperContext; import io.datahubproject.metadata.context.OperationContext; import io.datahubproject.metadata.context.TraceContext; import io.datahubproject.openapi.config.TracingInterceptor; import io.datahubproject.openapi.v1.models.TraceRequestV1; import io.datahubproject.openapi.v1.models.TraceResponseV1; +import io.datahubproject.openapi.v1.models.TraceStatus; +import io.datahubproject.openapi.v1.models.TraceStorageStatus; +import io.datahubproject.openapi.v1.models.TraceWriteStatus; import io.datahubproject.test.metadata.context.TestOperationContexts; import java.util.List; import java.util.Map; diff --git a/metadata-service/services/build.gradle b/metadata-service/services/build.gradle index 0e84580cc0..1981538582 100644 --- a/metadata-service/services/build.gradle +++ b/metadata-service/services/build.gradle @@ -16,6 +16,7 @@ dependencies { implementation project(':metadata-events:mxe-avro') implementation project(':metadata-events:mxe-registration') implementation project(':metadata-events:mxe-utils-avro') + api project(':metadata-service:openapi-servlet:models') api project(path: ':metadata-models', configuration: 'dataTemplate') api project(':metadata-models') diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java index 1b6f32da11..1b92200d0e 100644 --- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java +++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java @@ -2,6 +2,7 @@ package com.linkedin.metadata.systemmetadata; import com.linkedin.common.urn.Urn; import io.datahubproject.metadata.context.OperationContext; +import io.datahubproject.openapi.v1.models.TraceStatus; import java.util.List; import java.util.Map; import javax.annotation.Nonnull;