diff --git a/core/src/main/java/feast/core/config/FeatureStreamConfig.java b/core/src/main/java/feast/core/config/FeatureStreamConfig.java index 44f0e0e0993..c1982604c31 100644 --- a/core/src/main/java/feast/core/config/FeatureStreamConfig.java +++ b/core/src/main/java/feast/core/config/FeatureStreamConfig.java @@ -17,10 +17,10 @@ package feast.core.config; import com.google.common.base.Strings; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.SourceType; import feast.core.config.FeastProperties.StreamProperties; import feast.core.model.Source; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.SourceType; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/feast/core/grpc/CoreServiceImpl.java b/core/src/main/java/feast/core/grpc/CoreServiceImpl.java index 42bc0ba23de..0c7ea5828e7 100644 --- a/core/src/main/java/feast/core/grpc/CoreServiceImpl.java +++ b/core/src/main/java/feast/core/grpc/CoreServiceImpl.java @@ -18,37 +18,37 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceGrpc.CoreServiceImplBase; -import feast.core.CoreServiceProto.ApplyFeatureSetRequest; -import feast.core.CoreServiceProto.ApplyFeatureSetResponse; -import feast.core.CoreServiceProto.ArchiveProjectRequest; -import feast.core.CoreServiceProto.ArchiveProjectResponse; -import feast.core.CoreServiceProto.CreateProjectRequest; -import feast.core.CoreServiceProto.CreateProjectResponse; -import feast.core.CoreServiceProto.GetFeastCoreVersionRequest; -import feast.core.CoreServiceProto.GetFeastCoreVersionResponse; -import feast.core.CoreServiceProto.GetFeatureSetRequest; -import feast.core.CoreServiceProto.GetFeatureSetResponse; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.ListIngestionJobsRequest; -import feast.core.CoreServiceProto.ListIngestionJobsResponse; -import feast.core.CoreServiceProto.ListProjectsRequest; -import feast.core.CoreServiceProto.ListProjectsResponse; -import feast.core.CoreServiceProto.ListStoresRequest; -import feast.core.CoreServiceProto.ListStoresResponse; -import feast.core.CoreServiceProto.RestartIngestionJobRequest; -import feast.core.CoreServiceProto.RestartIngestionJobResponse; -import feast.core.CoreServiceProto.StopIngestionJobRequest; -import feast.core.CoreServiceProto.StopIngestionJobResponse; -import feast.core.CoreServiceProto.UpdateStoreRequest; -import feast.core.CoreServiceProto.UpdateStoreResponse; import feast.core.exception.RetrievalException; import feast.core.grpc.interceptors.MonitoringInterceptor; import feast.core.model.Project; import feast.core.service.AccessManagementService; import feast.core.service.JobService; import feast.core.service.SpecService; +import feast.proto.core.CoreServiceGrpc.CoreServiceImplBase; +import feast.proto.core.CoreServiceProto.ApplyFeatureSetRequest; +import feast.proto.core.CoreServiceProto.ApplyFeatureSetResponse; +import feast.proto.core.CoreServiceProto.ArchiveProjectRequest; +import feast.proto.core.CoreServiceProto.ArchiveProjectResponse; +import feast.proto.core.CoreServiceProto.CreateProjectRequest; +import feast.proto.core.CoreServiceProto.CreateProjectResponse; +import feast.proto.core.CoreServiceProto.GetFeastCoreVersionRequest; +import feast.proto.core.CoreServiceProto.GetFeastCoreVersionResponse; +import feast.proto.core.CoreServiceProto.GetFeatureSetRequest; +import feast.proto.core.CoreServiceProto.GetFeatureSetResponse; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.ListIngestionJobsRequest; +import feast.proto.core.CoreServiceProto.ListIngestionJobsResponse; +import feast.proto.core.CoreServiceProto.ListProjectsRequest; +import feast.proto.core.CoreServiceProto.ListProjectsResponse; +import feast.proto.core.CoreServiceProto.ListStoresRequest; +import feast.proto.core.CoreServiceProto.ListStoresResponse; +import feast.proto.core.CoreServiceProto.RestartIngestionJobRequest; +import feast.proto.core.CoreServiceProto.RestartIngestionJobResponse; +import feast.proto.core.CoreServiceProto.StopIngestionJobRequest; +import feast.proto.core.CoreServiceProto.StopIngestionJobResponse; +import feast.proto.core.CoreServiceProto.UpdateStoreRequest; +import feast.proto.core.CoreServiceProto.UpdateStoreResponse; import io.grpc.Status; import io.grpc.StatusRuntimeException; import io.grpc.stub.StreamObserver; diff --git a/core/src/main/java/feast/core/job/dataflow/DataflowJobManager.java b/core/src/main/java/feast/core/job/dataflow/DataflowJobManager.java index 08b6bfbd01f..a504c623172 100644 --- a/core/src/main/java/feast/core/job/dataflow/DataflowJobManager.java +++ b/core/src/main/java/feast/core/job/dataflow/DataflowJobManager.java @@ -27,9 +27,6 @@ import com.google.common.base.Strings; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import feast.core.FeatureSetProto; -import feast.core.SourceProto; -import feast.core.StoreProto; import feast.core.config.FeastProperties.MetricsProperties; import feast.core.exception.JobExecutionException; import feast.core.job.JobManager; @@ -41,6 +38,9 @@ import feast.ingestion.options.BZip2Compressor; import feast.ingestion.options.ImportOptions; import feast.ingestion.options.OptionCompressor; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.SourceProto; +import feast.proto.core.StoreProto; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.ArrayList; diff --git a/core/src/main/java/feast/core/job/direct/DirectRunnerJobManager.java b/core/src/main/java/feast/core/job/direct/DirectRunnerJobManager.java index 7b160b2c3db..4bcff016868 100644 --- a/core/src/main/java/feast/core/job/direct/DirectRunnerJobManager.java +++ b/core/src/main/java/feast/core/job/direct/DirectRunnerJobManager.java @@ -18,8 +18,6 @@ import com.google.common.base.Strings; import com.google.protobuf.util.JsonFormat; -import feast.core.FeatureSetProto; -import feast.core.StoreProto; import feast.core.config.FeastProperties.MetricsProperties; import feast.core.exception.JobExecutionException; import feast.core.job.JobManager; @@ -33,6 +31,8 @@ import feast.ingestion.options.BZip2Compressor; import feast.ingestion.options.ImportOptions; import feast.ingestion.options.OptionCompressor; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.StoreProto; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/feast/core/job/option/FeatureSetJsonByteConverter.java b/core/src/main/java/feast/core/job/option/FeatureSetJsonByteConverter.java index dbd04d668fd..2f6b37df1b5 100644 --- a/core/src/main/java/feast/core/job/option/FeatureSetJsonByteConverter.java +++ b/core/src/main/java/feast/core/job/option/FeatureSetJsonByteConverter.java @@ -18,8 +18,8 @@ import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import feast.core.FeatureSetProto; import feast.ingestion.options.OptionByteConverter; +import feast.proto.core.FeatureSetProto; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/feast/core/model/Entity.java b/core/src/main/java/feast/core/model/Entity.java index 190f2781d58..6133d492fcc 100644 --- a/core/src/main/java/feast/core/model/Entity.java +++ b/core/src/main/java/feast/core/model/Entity.java @@ -16,8 +16,8 @@ */ package feast.core.model; -import feast.core.FeatureSetProto.EntitySpec; -import feast.types.ValueProto.ValueType; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.types.ValueProto.ValueType; import java.util.Objects; import javax.persistence.*; import lombok.Getter; diff --git a/core/src/main/java/feast/core/model/Feature.java b/core/src/main/java/feast/core/model/Feature.java index 2ae91b1997a..0b457493792 100644 --- a/core/src/main/java/feast/core/model/Feature.java +++ b/core/src/main/java/feast/core/model/Feature.java @@ -17,10 +17,10 @@ package feast.core.model; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.FeatureSetProto.FeatureSpec.Builder; import feast.core.util.TypeConversion; -import feast.types.ValueProto.ValueType; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec.Builder; +import feast.proto.types.ValueProto.ValueType; import java.util.Arrays; import java.util.Map; import java.util.Objects; diff --git a/core/src/main/java/feast/core/model/FeatureSet.java b/core/src/main/java/feast/core/model/FeatureSet.java index 1c8351f4790..3008c37a3f9 100644 --- a/core/src/main/java/feast/core/model/FeatureSet.java +++ b/core/src/main/java/feast/core/model/FeatureSet.java @@ -20,9 +20,9 @@ import com.google.protobuf.Duration; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.*; import feast.core.util.TypeConversion; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.*; import java.util.*; import java.util.stream.Collectors; import javax.persistence.*; diff --git a/core/src/main/java/feast/core/model/Job.java b/core/src/main/java/feast/core/model/Job.java index 5c812f2a9ca..5fce3dffbe4 100644 --- a/core/src/main/java/feast/core/model/Job.java +++ b/core/src/main/java/feast/core/model/Job.java @@ -17,9 +17,9 @@ package feast.core.model; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto; -import feast.core.IngestionJobProto; import feast.core.job.Runner; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.IngestionJobProto; import java.util.ArrayList; import java.util.List; import javax.persistence.*; diff --git a/core/src/main/java/feast/core/model/JobStatus.java b/core/src/main/java/feast/core/model/JobStatus.java index 1d86900e2c5..6bafc06ec90 100644 --- a/core/src/main/java/feast/core/model/JobStatus.java +++ b/core/src/main/java/feast/core/model/JobStatus.java @@ -16,7 +16,7 @@ */ package feast.core.model; -import feast.core.IngestionJobProto.IngestionJobStatus; +import feast.proto.core.IngestionJobProto.IngestionJobStatus; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/feast/core/model/Source.java b/core/src/main/java/feast/core/model/Source.java index 28db1e9a5ba..d199a1b676a 100644 --- a/core/src/main/java/feast/core/model/Source.java +++ b/core/src/main/java/feast/core/model/Source.java @@ -18,10 +18,10 @@ import com.google.common.collect.Sets; import com.google.protobuf.Message; -import feast.core.SourceProto; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.Source.Builder; -import feast.core.SourceProto.SourceType; +import feast.proto.core.SourceProto; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.Source.Builder; +import feast.proto.core.SourceProto.SourceType; import io.grpc.Status; import java.util.Objects; import java.util.Set; diff --git a/core/src/main/java/feast/core/model/Store.java b/core/src/main/java/feast/core/model/Store.java index a08c50b28a6..1f7c373bdc5 100644 --- a/core/src/main/java/feast/core/model/Store.java +++ b/core/src/main/java/feast/core/model/Store.java @@ -17,14 +17,14 @@ package feast.core.model; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.BigQueryConfig; -import feast.core.StoreProto.Store.Builder; -import feast.core.StoreProto.Store.CassandraConfig; -import feast.core.StoreProto.Store.RedisClusterConfig; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.BigQueryConfig; +import feast.proto.core.StoreProto.Store.Builder; +import feast.proto.core.StoreProto.Store.CassandraConfig; +import feast.proto.core.StoreProto.Store.RedisClusterConfig; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/feast/core/service/JobCoordinatorService.java b/core/src/main/java/feast/core/service/JobCoordinatorService.java index f61c1b829d4..d710c3361a6 100644 --- a/core/src/main/java/feast/core/service/JobCoordinatorService.java +++ b/core/src/main/java/feast/core/service/JobCoordinatorService.java @@ -17,11 +17,6 @@ package feast.core.service; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceProto.ListStoresRequest.Filter; -import feast.core.CoreServiceProto.ListStoresResponse; -import feast.core.FeatureSetProto.FeatureSetStatus; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.Subscription; import feast.core.config.FeastProperties; import feast.core.config.FeastProperties.JobProperties; import feast.core.dao.FeatureSetRepository; @@ -32,6 +27,11 @@ import feast.core.model.Job; import feast.core.model.Source; import feast.core.model.Store; +import feast.proto.core.CoreServiceProto.ListStoresRequest.Filter; +import feast.proto.core.CoreServiceProto.ListStoresResponse; +import feast.proto.core.FeatureSetProto.FeatureSetStatus; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.Subscription; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/core/src/main/java/feast/core/service/JobService.java b/core/src/main/java/feast/core/service/JobService.java index 246ca91a4bc..cc125305ec3 100644 --- a/core/src/main/java/feast/core/service/JobService.java +++ b/core/src/main/java/feast/core/service/JobService.java @@ -17,16 +17,6 @@ package feast.core.service; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.ListIngestionJobsRequest; -import feast.core.CoreServiceProto.ListIngestionJobsResponse; -import feast.core.CoreServiceProto.RestartIngestionJobRequest; -import feast.core.CoreServiceProto.RestartIngestionJobResponse; -import feast.core.CoreServiceProto.StopIngestionJobRequest; -import feast.core.CoreServiceProto.StopIngestionJobResponse; -import feast.core.FeatureSetReferenceProto.FeatureSetReference; -import feast.core.IngestionJobProto; import feast.core.dao.JobRepository; import feast.core.job.JobManager; import feast.core.job.Runner; @@ -36,6 +26,16 @@ import feast.core.model.FeatureSet; import feast.core.model.Job; import feast.core.model.JobStatus; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.ListIngestionJobsRequest; +import feast.proto.core.CoreServiceProto.ListIngestionJobsResponse; +import feast.proto.core.CoreServiceProto.RestartIngestionJobRequest; +import feast.proto.core.CoreServiceProto.RestartIngestionJobResponse; +import feast.proto.core.CoreServiceProto.StopIngestionJobRequest; +import feast.proto.core.CoreServiceProto.StopIngestionJobResponse; +import feast.proto.core.FeatureSetReferenceProto.FeatureSetReference; +import feast.proto.core.IngestionJobProto; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/core/src/main/java/feast/core/service/SpecService.java b/core/src/main/java/feast/core/service/SpecService.java index d8efde1eace..767b3fe6920 100644 --- a/core/src/main/java/feast/core/service/SpecService.java +++ b/core/src/main/java/feast/core/service/SpecService.java @@ -20,22 +20,6 @@ import static feast.core.validators.Matchers.checkValidCharactersAllowAsterisk; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceProto.ApplyFeatureSetResponse; -import feast.core.CoreServiceProto.ApplyFeatureSetResponse.Status; -import feast.core.CoreServiceProto.GetFeatureSetRequest; -import feast.core.CoreServiceProto.GetFeatureSetResponse; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.ListStoresRequest; -import feast.core.CoreServiceProto.ListStoresResponse; -import feast.core.CoreServiceProto.ListStoresResponse.Builder; -import feast.core.CoreServiceProto.UpdateStoreRequest; -import feast.core.CoreServiceProto.UpdateStoreResponse; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetStatus; -import feast.core.SourceProto; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.Subscription; import feast.core.dao.FeatureSetRepository; import feast.core.dao.ProjectRepository; import feast.core.dao.StoreRepository; @@ -45,6 +29,22 @@ import feast.core.model.Source; import feast.core.model.Store; import feast.core.validators.FeatureSetValidator; +import feast.proto.core.CoreServiceProto.ApplyFeatureSetResponse; +import feast.proto.core.CoreServiceProto.ApplyFeatureSetResponse.Status; +import feast.proto.core.CoreServiceProto.GetFeatureSetRequest; +import feast.proto.core.CoreServiceProto.GetFeatureSetResponse; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.ListStoresRequest; +import feast.proto.core.CoreServiceProto.ListStoresResponse; +import feast.proto.core.CoreServiceProto.ListStoresResponse.Builder; +import feast.proto.core.CoreServiceProto.UpdateStoreRequest; +import feast.proto.core.CoreServiceProto.UpdateStoreResponse; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetStatus; +import feast.proto.core.SourceProto; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.Subscription; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/feast/core/validators/FeatureSetValidator.java b/core/src/main/java/feast/core/validators/FeatureSetValidator.java index ca0f1ec035d..9cfd136b84d 100644 --- a/core/src/main/java/feast/core/validators/FeatureSetValidator.java +++ b/core/src/main/java/feast/core/validators/FeatureSetValidator.java @@ -19,9 +19,9 @@ import static feast.core.validators.Matchers.checkValidCharacters; import com.google.common.collect.Sets; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSpec; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/test/java/feast/core/job/JobUpdateTaskTest.java b/core/src/test/java/feast/core/job/JobUpdateTaskTest.java index 5570c71a99a..3225dcd76e5 100644 --- a/core/src/test/java/feast/core/job/JobUpdateTaskTest.java +++ b/core/src/test/java/feast/core/job/JobUpdateTaskTest.java @@ -24,21 +24,21 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetMeta; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.SourceProto; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.SourceType; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; import feast.core.model.FeatureSet; import feast.core.model.Job; import feast.core.model.JobStatus; import feast.core.model.Source; import feast.core.model.Store; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetMeta; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.SourceProto; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/core/src/test/java/feast/core/job/dataflow/DataflowJobManagerTest.java b/core/src/test/java/feast/core/job/dataflow/DataflowJobManagerTest.java index b9671f07899..632c9d22a25 100644 --- a/core/src/test/java/feast/core/job/dataflow/DataflowJobManagerTest.java +++ b/core/src/test/java/feast/core/job/dataflow/DataflowJobManagerTest.java @@ -29,16 +29,6 @@ import com.google.protobuf.Duration; import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat.Printer; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetMeta; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.SourceProto; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.SourceType; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; import feast.core.config.FeastProperties.MetricsProperties; import feast.core.exception.JobExecutionException; import feast.core.job.Runner; @@ -47,6 +37,16 @@ import feast.ingestion.options.BZip2Compressor; import feast.ingestion.options.ImportOptions; import feast.ingestion.options.OptionCompressor; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetMeta; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.SourceProto; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/core/src/test/java/feast/core/job/direct/DirectRunnerJobManagerTest.java b/core/src/test/java/feast/core/job/direct/DirectRunnerJobManagerTest.java index 914177385e4..42d3189a730 100644 --- a/core/src/test/java/feast/core/job/direct/DirectRunnerJobManagerTest.java +++ b/core/src/test/java/feast/core/job/direct/DirectRunnerJobManagerTest.java @@ -29,15 +29,6 @@ import com.google.protobuf.Duration; import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat.Printer; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.SourceProto; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.SourceType; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; import feast.core.config.FeastProperties.MetricsProperties; import feast.core.job.Runner; import feast.core.job.option.FeatureSetJsonByteConverter; @@ -49,6 +40,15 @@ import feast.ingestion.options.BZip2Compressor; import feast.ingestion.options.ImportOptions; import feast.ingestion.options.OptionCompressor; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.SourceProto; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/core/src/test/java/feast/core/job/option/FeatureSetJsonByteConverterTest.java b/core/src/test/java/feast/core/job/option/FeatureSetJsonByteConverterTest.java index df9044e6331..a12452b593b 100644 --- a/core/src/test/java/feast/core/job/option/FeatureSetJsonByteConverterTest.java +++ b/core/src/test/java/feast/core/job/option/FeatureSetJsonByteConverterTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.*; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto; -import feast.core.SourceProto; -import feast.types.ValueProto; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.SourceProto; +import feast.proto.types.ValueProto; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/core/src/test/java/feast/core/model/FeatureSetTest.java b/core/src/test/java/feast/core/model/FeatureSetTest.java index 70d160e875c..270dc3f3bcd 100644 --- a/core/src/test/java/feast/core/model/FeatureSetTest.java +++ b/core/src/test/java/feast/core/model/FeatureSetTest.java @@ -22,15 +22,15 @@ import com.google.protobuf.Duration; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSetStatus; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.SourceProto; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.SourceType; -import feast.types.ValueProto.ValueType.Enum; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSetStatus; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.SourceProto; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.types.ValueProto.ValueType.Enum; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/feast/core/service/JobCoordinatorServiceTest.java b/core/src/test/java/feast/core/service/JobCoordinatorServiceTest.java index 38683c7bd59..765eff17636 100644 --- a/core/src/test/java/feast/core/service/JobCoordinatorServiceTest.java +++ b/core/src/test/java/feast/core/service/JobCoordinatorServiceTest.java @@ -27,19 +27,6 @@ import com.google.common.collect.Lists; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceProto.ListFeatureSetsRequest.Filter; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.ListStoresResponse; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetMeta; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.Source; -import feast.core.SourceProto.SourceType; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; import feast.core.config.FeastProperties; import feast.core.config.FeastProperties.JobProperties; import feast.core.dao.FeatureSetRepository; @@ -50,6 +37,19 @@ import feast.core.model.FeatureSet; import feast.core.model.Job; import feast.core.model.JobStatus; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest.Filter; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.ListStoresResponse; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetMeta; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.Source; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; import java.util.Arrays; import java.util.List; import org.junit.Before; diff --git a/core/src/test/java/feast/core/service/JobServiceTest.java b/core/src/test/java/feast/core/service/JobServiceTest.java index 0fe8e22f0a9..87b32d1a208 100644 --- a/core/src/test/java/feast/core/service/JobServiceTest.java +++ b/core/src/test/java/feast/core/service/JobServiceTest.java @@ -26,23 +26,23 @@ import static org.mockito.MockitoAnnotations.initMocks; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.ListIngestionJobsRequest; -import feast.core.CoreServiceProto.ListIngestionJobsResponse; -import feast.core.CoreServiceProto.RestartIngestionJobRequest; -import feast.core.CoreServiceProto.RestartIngestionJobResponse; -import feast.core.CoreServiceProto.StopIngestionJobRequest; -import feast.core.CoreServiceProto.StopIngestionJobResponse; -import feast.core.FeatureSetReferenceProto.FeatureSetReference; -import feast.core.IngestionJobProto.IngestionJob; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; import feast.core.dao.JobRepository; import feast.core.job.JobManager; import feast.core.job.Runner; import feast.core.model.*; -import feast.types.ValueProto.ValueType.Enum; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.ListIngestionJobsRequest; +import feast.proto.core.CoreServiceProto.ListIngestionJobsResponse; +import feast.proto.core.CoreServiceProto.RestartIngestionJobRequest; +import feast.proto.core.CoreServiceProto.RestartIngestionJobResponse; +import feast.proto.core.CoreServiceProto.StopIngestionJobRequest; +import feast.proto.core.CoreServiceProto.StopIngestionJobResponse; +import feast.proto.core.FeatureSetReferenceProto.FeatureSetReference; +import feast.proto.core.IngestionJobProto.IngestionJob; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.types.ValueProto.ValueType.Enum; import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/test/java/feast/core/service/SpecServiceTest.java b/core/src/test/java/feast/core/service/SpecServiceTest.java index 576bdeb8926..5a9c7c161f3 100644 --- a/core/src/test/java/feast/core/service/SpecServiceTest.java +++ b/core/src/test/java/feast/core/service/SpecServiceTest.java @@ -26,29 +26,29 @@ import com.google.api.client.util.Lists; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.CoreServiceProto.ApplyFeatureSetResponse; -import feast.core.CoreServiceProto.ApplyFeatureSetResponse.Status; -import feast.core.CoreServiceProto.GetFeatureSetRequest; -import feast.core.CoreServiceProto.ListFeatureSetsRequest.Filter; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.ListStoresRequest; -import feast.core.CoreServiceProto.ListStoresResponse; -import feast.core.CoreServiceProto.UpdateStoreRequest; -import feast.core.CoreServiceProto.UpdateStoreResponse; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; import feast.core.dao.FeatureSetRepository; import feast.core.dao.ProjectRepository; import feast.core.dao.StoreRepository; import feast.core.exception.RetrievalException; import feast.core.model.*; -import feast.types.ValueProto.ValueType.Enum; +import feast.proto.core.CoreServiceProto.ApplyFeatureSetResponse; +import feast.proto.core.CoreServiceProto.ApplyFeatureSetResponse.Status; +import feast.proto.core.CoreServiceProto.GetFeatureSetRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest.Filter; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.ListStoresRequest; +import feast.proto.core.CoreServiceProto.ListStoresResponse; +import feast.proto.core.CoreServiceProto.UpdateStoreRequest; +import feast.proto.core.CoreServiceProto.UpdateStoreResponse; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; +import feast.proto.types.ValueProto.ValueType.Enum; import java.sql.Date; import java.time.Instant; import java.util.*; diff --git a/core/src/test/java/feast/core/service/TestObjectFactory.java b/core/src/test/java/feast/core/service/TestObjectFactory.java index 2723db1d2ed..40c379d3cf7 100644 --- a/core/src/test/java/feast/core/service/TestObjectFactory.java +++ b/core/src/test/java/feast/core/service/TestObjectFactory.java @@ -16,13 +16,13 @@ */ package feast.core.service; -import feast.core.FeatureSetProto; -import feast.core.SourceProto; import feast.core.model.Entity; import feast.core.model.Feature; import feast.core.model.FeatureSet; import feast.core.model.Source; -import feast.types.ValueProto; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.SourceProto; +import feast.proto.types.ValueProto; import java.util.HashMap; import java.util.List; diff --git a/core/src/test/java/feast/core/validators/FeatureSetValidatorTest.java b/core/src/test/java/feast/core/validators/FeatureSetValidatorTest.java index 2e1e4e381ae..155a52d1005 100644 --- a/core/src/test/java/feast/core/validators/FeatureSetValidatorTest.java +++ b/core/src/test/java/feast/core/validators/FeatureSetValidatorTest.java @@ -16,8 +16,8 @@ */ package feast.core.validators; -import feast.core.FeatureSetProto; -import feast.types.ValueProto; +import feast.proto.core.FeatureSetProto; +import feast.proto.types.ValueProto; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/ingestion/pom.xml b/ingestion/pom.xml index 5a2fba8d658..a62d4202ee0 100644 --- a/ingestion/pom.xml +++ b/ingestion/pom.xml @@ -70,18 +70,10 @@ org.springframework org.springframework.vendor - - io.grpc - io.grpc.vendor - io.opencensus io.opencensus.vendor - - feast.core - feast.core.vendor - com.google.cloud.bigquery com.google.cloud.bigquery.vendor diff --git a/ingestion/src/main/java/feast/ingestion/ImportJob.java b/ingestion/src/main/java/feast/ingestion/ImportJob.java index 5afa66b5e14..0420ddcabb7 100644 --- a/ingestion/src/main/java/feast/ingestion/ImportJob.java +++ b/ingestion/src/main/java/feast/ingestion/ImportJob.java @@ -20,10 +20,6 @@ import static feast.ingestion.utils.StoreUtil.getFeatureSink; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.SourceProto.Source; -import feast.core.StoreProto.Store; import feast.ingestion.options.BZip2Decompressor; import feast.ingestion.options.ImportOptions; import feast.ingestion.options.StringListStreamConverter; @@ -32,12 +28,16 @@ import feast.ingestion.transform.metrics.WriteFailureMetricsTransform; import feast.ingestion.transform.metrics.WriteSuccessMetricsTransform; import feast.ingestion.utils.SpecUtil; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.SourceProto.Source; +import feast.proto.core.StoreProto.Store; +import feast.proto.types.FeatureRowProto.FeatureRow; import feast.storage.api.writer.DeadletterSink; import feast.storage.api.writer.FailedElement; import feast.storage.api.writer.FeatureSink; import feast.storage.api.writer.WriteResult; import feast.storage.connectors.bigquery.writer.BigQueryDeadletterSink; -import feast.types.FeatureRowProto.FeatureRow; import java.io.IOException; import java.util.HashMap; import java.util.List; diff --git a/ingestion/src/main/java/feast/ingestion/transform/ProcessAndValidateFeatureRows.java b/ingestion/src/main/java/feast/ingestion/transform/ProcessAndValidateFeatureRows.java index 53d56c667d6..50c3e0ee4fa 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/ProcessAndValidateFeatureRows.java +++ b/ingestion/src/main/java/feast/ingestion/transform/ProcessAndValidateFeatureRows.java @@ -17,12 +17,12 @@ package feast.ingestion.transform; import com.google.auto.value.AutoValue; -import feast.core.FeatureSetProto; import feast.ingestion.transform.fn.ProcessFeatureRowDoFn; import feast.ingestion.transform.fn.ValidateFeatureRowDoFn; import feast.ingestion.values.FeatureSet; +import feast.proto.core.FeatureSetProto; +import feast.proto.types.FeatureRowProto.FeatureRow; import feast.storage.api.writer.FailedElement; -import feast.types.FeatureRowProto.FeatureRow; import java.util.Map; import java.util.stream.Collectors; import org.apache.beam.sdk.transforms.PTransform; diff --git a/ingestion/src/main/java/feast/ingestion/transform/ReadFromSource.java b/ingestion/src/main/java/feast/ingestion/transform/ReadFromSource.java index ccae04486f6..45253735141 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/ReadFromSource.java +++ b/ingestion/src/main/java/feast/ingestion/transform/ReadFromSource.java @@ -18,11 +18,11 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; -import feast.core.SourceProto.Source; -import feast.core.SourceProto.SourceType; import feast.ingestion.transform.fn.KafkaRecordToFeatureRowDoFn; +import feast.proto.core.SourceProto.Source; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.types.FeatureRowProto.FeatureRow; import feast.storage.api.writer.FailedElement; -import feast.types.FeatureRowProto.FeatureRow; import org.apache.beam.sdk.io.kafka.KafkaIO; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.transforms.ParDo; diff --git a/ingestion/src/main/java/feast/ingestion/transform/fn/KafkaRecordToFeatureRowDoFn.java b/ingestion/src/main/java/feast/ingestion/transform/fn/KafkaRecordToFeatureRowDoFn.java index b332c0ca09a..7654c1e2fa0 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/fn/KafkaRecordToFeatureRowDoFn.java +++ b/ingestion/src/main/java/feast/ingestion/transform/fn/KafkaRecordToFeatureRowDoFn.java @@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue; import com.google.protobuf.InvalidProtocolBufferException; +import feast.proto.types.FeatureRowProto.FeatureRow; import feast.storage.api.writer.FailedElement; -import feast.types.FeatureRowProto.FeatureRow; import java.util.Base64; import org.apache.beam.sdk.io.kafka.KafkaRecord; import org.apache.beam.sdk.transforms.DoFn; diff --git a/ingestion/src/main/java/feast/ingestion/transform/fn/ProcessFeatureRowDoFn.java b/ingestion/src/main/java/feast/ingestion/transform/fn/ProcessFeatureRowDoFn.java index 70e173d5db1..2a115a80718 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/fn/ProcessFeatureRowDoFn.java +++ b/ingestion/src/main/java/feast/ingestion/transform/fn/ProcessFeatureRowDoFn.java @@ -16,7 +16,7 @@ */ package feast.ingestion.transform.fn; -import feast.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow; import org.apache.beam.sdk.transforms.DoFn; public class ProcessFeatureRowDoFn extends DoFn { diff --git a/ingestion/src/main/java/feast/ingestion/transform/fn/ValidateFeatureRowDoFn.java b/ingestion/src/main/java/feast/ingestion/transform/fn/ValidateFeatureRowDoFn.java index d3e0475abf3..856d94828ad 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/fn/ValidateFeatureRowDoFn.java +++ b/ingestion/src/main/java/feast/ingestion/transform/fn/ValidateFeatureRowDoFn.java @@ -19,10 +19,10 @@ import com.google.auto.value.AutoValue; import feast.ingestion.values.FeatureSet; import feast.ingestion.values.Field; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto; +import feast.proto.types.ValueProto.Value.ValCase; import feast.storage.api.writer.FailedElement; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto; -import feast.types.ValueProto.Value.ValCase; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFn.java b/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFn.java index aa8c7a7e89a..809687a6b2c 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFn.java +++ b/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFn.java @@ -26,9 +26,9 @@ import com.google.auto.value.AutoValue; import com.timgroup.statsd.NonBlockingStatsDClient; import com.timgroup.statsd.StatsDClient; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; import java.util.ArrayList; import java.util.DoubleSummaryStatistics; import java.util.HashMap; diff --git a/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFn.java b/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFn.java index d8cc7635730..3c7f04a98e7 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFn.java +++ b/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFn.java @@ -20,10 +20,10 @@ import com.google.protobuf.util.Timestamps; import com.timgroup.statsd.NonBlockingStatsDClient; import com.timgroup.statsd.StatsDClient; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; -import feast.types.ValueProto.Value.ValCase; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; +import feast.proto.types.ValueProto.Value.ValCase; import java.time.Clock; import java.util.HashMap; import java.util.Map; diff --git a/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteSuccessMetricsTransform.java b/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteSuccessMetricsTransform.java index 37eed7455a9..e75debf4a93 100644 --- a/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteSuccessMetricsTransform.java +++ b/ingestion/src/main/java/feast/ingestion/transform/metrics/WriteSuccessMetricsTransform.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue; import feast.ingestion.options.ImportOptions; -import feast.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow; import org.apache.beam.sdk.metrics.Counter; import org.apache.beam.sdk.metrics.Metrics; import org.apache.beam.sdk.transforms.*; diff --git a/ingestion/src/main/java/feast/ingestion/utils/SpecUtil.java b/ingestion/src/main/java/feast/ingestion/utils/SpecUtil.java index 9aac352fe45..a1356584b3f 100644 --- a/ingestion/src/main/java/feast/ingestion/utils/SpecUtil.java +++ b/ingestion/src/main/java/feast/ingestion/utils/SpecUtil.java @@ -18,13 +18,13 @@ import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto.Store; -import feast.core.StoreProto.Store.Subscription; import feast.ingestion.values.Field; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto.Store; +import feast.proto.core.StoreProto.Store.Subscription; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/ingestion/src/main/java/feast/ingestion/utils/StoreUtil.java b/ingestion/src/main/java/feast/ingestion/utils/StoreUtil.java index 566124b3075..54323869cf8 100644 --- a/ingestion/src/main/java/feast/ingestion/utils/StoreUtil.java +++ b/ingestion/src/main/java/feast/ingestion/utils/StoreUtil.java @@ -16,17 +16,17 @@ */ package feast.ingestion.utils; -import static feast.types.ValueProto.ValueType; +import static feast.proto.types.ValueProto.ValueType; import com.google.cloud.bigquery.StandardSQLTypeName; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.StoreProto.Store; -import feast.core.StoreProto.Store.StoreType; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.StoreProto.Store; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.types.ValueProto.ValueType.Enum; import feast.storage.api.writer.FeatureSink; import feast.storage.connectors.bigquery.writer.BigQueryFeatureSink; import feast.storage.connectors.redis.writer.RedisFeatureSink; import feast.storage.connectors.rediscluster.writer.RedisClusterFeatureSink; -import feast.types.ValueProto.ValueType.Enum; import java.util.HashMap; import java.util.Map; import org.slf4j.Logger; diff --git a/ingestion/src/main/java/feast/ingestion/values/FeatureSet.java b/ingestion/src/main/java/feast/ingestion/values/FeatureSet.java index 758fbd0ba31..f49ab2f98a4 100644 --- a/ingestion/src/main/java/feast/ingestion/values/FeatureSet.java +++ b/ingestion/src/main/java/feast/ingestion/values/FeatureSet.java @@ -19,12 +19,12 @@ import static feast.ingestion.utils.SpecUtil.getFeatureSetReference; import static feast.ingestion.utils.SpecUtil.getFieldsByName; -import feast.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto; import java.io.Serializable; import java.util.Map; /** - * This class represents {@link feast.core.FeatureSetProto.FeatureSetSpec} but contains fields + * This class represents {@link feast.proto.core.FeatureSetProto.FeatureSetSpec} but contains fields * directly accessible by name for feature validation purposes. * *

The use for this class is mainly for validating the Fields in FeatureRow. diff --git a/ingestion/src/main/java/feast/ingestion/values/Field.java b/ingestion/src/main/java/feast/ingestion/values/Field.java index 9b4f570d7e6..79cb83e76ad 100644 --- a/ingestion/src/main/java/feast/ingestion/values/Field.java +++ b/ingestion/src/main/java/feast/ingestion/values/Field.java @@ -16,13 +16,13 @@ */ package feast.ingestion.values; -import feast.types.ValueProto.ValueType; +import feast.proto.types.ValueProto.ValueType; import java.io.Serializable; import org.apache.beam.sdk.coders.AvroCoder; import org.apache.beam.sdk.coders.DefaultCoder; /** - * Field class represents {@link feast.types.FieldProto.Field} but without value. + * Field class represents {@link feast.proto.types.FieldProto.Field} but without value. * *

The use for this class is mainly for validating the Fields in FeatureRow. */ diff --git a/ingestion/src/test/java/feast/ToOrderedFeatureRows.java b/ingestion/src/test/java/feast/ToOrderedFeatureRows.java index db552693f98..35453f0754f 100644 --- a/ingestion/src/test/java/feast/ToOrderedFeatureRows.java +++ b/ingestion/src/test/java/feast/ToOrderedFeatureRows.java @@ -18,9 +18,9 @@ import com.google.common.collect.Lists; import com.google.common.primitives.UnsignedBytes; -import feast.types.FeatureRowExtendedProto.FeatureRowExtended; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; +import feast.proto.types.FeatureRowExtendedProto.FeatureRowExtended; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; import java.util.List; import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.transforms.PTransform; diff --git a/ingestion/src/test/java/feast/ingestion/ImportJobTest.java b/ingestion/src/test/java/feast/ingestion/ImportJobTest.java index cd25cdf380a..16d27303cd2 100644 --- a/ingestion/src/test/java/feast/ingestion/ImportJobTest.java +++ b/ingestion/src/test/java/feast/ingestion/ImportJobTest.java @@ -19,26 +19,26 @@ import com.google.common.io.Files; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.SourceProto.KafkaSourceConfig; -import feast.core.SourceProto.Source; -import feast.core.SourceProto.SourceType; -import feast.core.StoreProto.Store; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; import feast.ingestion.options.BZip2Compressor; import feast.ingestion.options.ImportOptions; -import feast.storage.RedisProto.RedisKey; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.SourceProto.KafkaSourceConfig; +import feast.proto.core.SourceProto.Source; +import feast.proto.core.SourceProto.SourceType; +import feast.proto.core.StoreProto.Store; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto; +import feast.proto.types.ValueProto.ValueType.Enum; import feast.test.TestUtil; import feast.test.TestUtil.LocalKafka; import feast.test.TestUtil.LocalRedis; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto; -import feast.types.ValueProto.ValueType.Enum; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; import io.lettuce.core.api.StatefulRedisConnection; diff --git a/ingestion/src/test/java/feast/ingestion/transform/ProcessAndValidateFeatureRowsTest.java b/ingestion/src/test/java/feast/ingestion/transform/ProcessAndValidateFeatureRowsTest.java index be082988716..96105e37895 100644 --- a/ingestion/src/test/java/feast/ingestion/transform/ProcessAndValidateFeatureRowsTest.java +++ b/ingestion/src/test/java/feast/ingestion/transform/ProcessAndValidateFeatureRowsTest.java @@ -16,15 +16,15 @@ */ package feast.ingestion.transform; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; +import feast.proto.types.ValueProto.ValueType.Enum; import feast.storage.api.writer.FailedElement; import feast.test.TestUtil; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; -import feast.types.ValueProto.ValueType.Enum; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFnTest.java b/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFnTest.java index cc65f2cff96..e4686e89aaa 100644 --- a/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFnTest.java +++ b/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteFeatureValueMetricsDoFnTest.java @@ -21,18 +21,18 @@ import com.google.protobuf.ByteString; import com.google.protobuf.Timestamp; import com.google.protobuf.util.Timestamps; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow.Builder; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.BoolList; +import feast.proto.types.ValueProto.BytesList; +import feast.proto.types.ValueProto.DoubleList; +import feast.proto.types.ValueProto.FloatList; +import feast.proto.types.ValueProto.Int32List; +import feast.proto.types.ValueProto.Int64List; +import feast.proto.types.ValueProto.StringList; +import feast.proto.types.ValueProto.Value; import feast.test.TestUtil.DummyStatsDServer; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FeatureRowProto.FeatureRow.Builder; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.BoolList; -import feast.types.ValueProto.BytesList; -import feast.types.ValueProto.DoubleList; -import feast.types.ValueProto.FloatList; -import feast.types.ValueProto.Int32List; -import feast.types.ValueProto.Int64List; -import feast.types.ValueProto.StringList; -import feast.types.ValueProto.Value; import java.io.BufferedReader; import java.io.IOException; import java.net.URL; diff --git a/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFnTest.java b/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFnTest.java index 6e3caff56b9..3309a0cdebc 100644 --- a/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFnTest.java +++ b/ingestion/src/test/java/feast/ingestion/transform/metrics/WriteRowMetricsDoFnTest.java @@ -20,8 +20,8 @@ import static feast.ingestion.transform.metrics.WriteFeatureValueMetricsDoFnTest.readTestOutput; import static org.junit.Assert.fail; +import feast.proto.types.FeatureRowProto.FeatureRow; import feast.test.TestUtil.DummyStatsDServer; -import feast.types.FeatureRowProto.FeatureRow; import java.io.IOException; import java.time.Clock; import java.time.Instant; diff --git a/ingestion/src/test/java/feast/test/TestUtil.java b/ingestion/src/test/java/feast/test/TestUtil.java index 2cd3242fb00..3204d93bcda 100644 --- a/ingestion/src/test/java/feast/test/TestUtil.java +++ b/ingestion/src/test/java/feast/test/TestUtil.java @@ -20,14 +20,14 @@ import com.google.protobuf.ByteString; import com.google.protobuf.util.Timestamps; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; import feast.ingestion.transform.metrics.WriteSuccessMetricsTransform; -import feast.storage.RedisProto.RedisKey; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FeatureRowProto.FeatureRow.Builder; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.*; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow.Builder; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.*; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; diff --git a/protos/feast/core/CoreService.proto b/protos/feast/core/CoreService.proto index 5edc6be7bc1..e81a260731b 100644 --- a/protos/feast/core/CoreService.proto +++ b/protos/feast/core/CoreService.proto @@ -15,12 +15,11 @@ // syntax = "proto3"; - package feast.core; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; option java_outer_classname = "CoreServiceProto"; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; import "feast/core/FeatureSet.proto"; import "feast/core/Store.proto"; diff --git a/protos/feast/core/FeatureSet.proto b/protos/feast/core/FeatureSet.proto index 46b5ab27a6b..31ca2abcae6 100644 --- a/protos/feast/core/FeatureSet.proto +++ b/protos/feast/core/FeatureSet.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package feast.core; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; option java_outer_classname = "FeatureSetProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; diff --git a/protos/feast/core/FeatureSetReference.proto b/protos/feast/core/FeatureSetReference.proto index f33dbf46e17..85762512ca6 100644 --- a/protos/feast/core/FeatureSetReference.proto +++ b/protos/feast/core/FeatureSetReference.proto @@ -20,7 +20,7 @@ package feast.core; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; option java_outer_classname = "FeatureSetReferenceProto"; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; // Defines a composite key that refers to a unique FeatureSet message FeatureSetReference { diff --git a/protos/feast/core/IngestionJob.proto b/protos/feast/core/IngestionJob.proto index 2095ea115b1..c63e573ffea 100644 --- a/protos/feast/core/IngestionJob.proto +++ b/protos/feast/core/IngestionJob.proto @@ -20,7 +20,7 @@ package feast.core; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; option java_outer_classname = "IngestionJobProto"; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; import "feast/core/FeatureSet.proto"; import "feast/core/Store.proto"; diff --git a/protos/feast/core/Runner.proto b/protos/feast/core/Runner.proto index 73895d55dae..544972286df 100644 --- a/protos/feast/core/Runner.proto +++ b/protos/feast/core/Runner.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package feast.core; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; option java_outer_classname = "RunnerProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; diff --git a/protos/feast/core/Source.proto b/protos/feast/core/Source.proto index 47b6a4ce611..9dcbf2fa056 100644 --- a/protos/feast/core/Source.proto +++ b/protos/feast/core/Source.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package feast.core; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; option java_outer_classname = "SourceProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; diff --git a/protos/feast/core/Store.proto b/protos/feast/core/Store.proto index f0030dbc8cf..7279c484eea 100644 --- a/protos/feast/core/Store.proto +++ b/protos/feast/core/Store.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package feast.core; -option java_package = "feast.core"; +option java_package = "feast.proto.core"; option java_outer_classname = "StoreProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core"; diff --git a/protos/feast/serving/ServingService.proto b/protos/feast/serving/ServingService.proto index 17d42a4050a..edef4a4a228 100644 --- a/protos/feast/serving/ServingService.proto +++ b/protos/feast/serving/ServingService.proto @@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "feast/types/Value.proto"; -option java_package = "feast.serving"; +option java_package = "feast.proto.serving"; option java_outer_classname = "ServingAPIProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/serving"; diff --git a/protos/feast/storage/Redis.proto b/protos/feast/storage/Redis.proto index 15633520463..04052aa800c 100644 --- a/protos/feast/storage/Redis.proto +++ b/protos/feast/storage/Redis.proto @@ -21,7 +21,7 @@ import "feast/types/Field.proto"; package feast.storage; option java_outer_classname = "RedisProto"; -option java_package = "feast.storage"; +option java_package = "feast.proto.storage"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/storage"; message RedisKey { diff --git a/protos/feast/types/FeatureRow.proto b/protos/feast/types/FeatureRow.proto index 9018a89cce5..fd8a561c7bc 100644 --- a/protos/feast/types/FeatureRow.proto +++ b/protos/feast/types/FeatureRow.proto @@ -21,7 +21,7 @@ import "feast/types/Field.proto"; package feast.types; -option java_package = "feast.types"; +option java_package = "feast.proto.types"; option java_outer_classname = "FeatureRowProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/types"; diff --git a/protos/feast/types/FeatureRowExtended.proto b/protos/feast/types/FeatureRowExtended.proto index a459f441069..f922fe66bfd 100644 --- a/protos/feast/types/FeatureRowExtended.proto +++ b/protos/feast/types/FeatureRowExtended.proto @@ -21,7 +21,7 @@ import "feast/types/FeatureRow.proto"; package feast.types; -option java_package = "feast.types"; +option java_package = "feast.proto.types"; option java_outer_classname = "FeatureRowExtendedProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/types"; diff --git a/protos/feast/types/Field.proto b/protos/feast/types/Field.proto index 80cd2dcc3c2..3b8416c253a 100644 --- a/protos/feast/types/Field.proto +++ b/protos/feast/types/Field.proto @@ -20,7 +20,7 @@ import "feast/types/Value.proto"; package feast.types; -option java_package = "feast.types"; +option java_package = "feast.proto.types"; option java_outer_classname = "FieldProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/types"; diff --git a/protos/feast/types/Value.proto b/protos/feast/types/Value.proto index 268a636347a..b0beabd7969 100644 --- a/protos/feast/types/Value.proto +++ b/protos/feast/types/Value.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package feast.types; -option java_package = "feast.types"; +option java_package = "feast.proto.types"; option java_outer_classname = "ValueProto"; option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/types"; diff --git a/sdk/java/src/main/java/com/gojek/feast/FeastClient.java b/sdk/java/src/main/java/com/gojek/feast/FeastClient.java index 4e18b651657..c09fe4b922a 100644 --- a/sdk/java/src/main/java/com/gojek/feast/FeastClient.java +++ b/sdk/java/src/main/java/com/gojek/feast/FeastClient.java @@ -16,13 +16,13 @@ */ package com.gojek.feast; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetFeastServingInfoRequest; -import feast.serving.ServingAPIProto.GetFeastServingInfoResponse; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; -import feast.serving.ServingServiceGrpc; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoRequest; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoResponse; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingServiceGrpc; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import java.util.List; diff --git a/sdk/java/src/main/java/com/gojek/feast/RequestUtil.java b/sdk/java/src/main/java/com/gojek/feast/RequestUtil.java index ebea625ff1e..3505f646c2b 100644 --- a/sdk/java/src/main/java/com/gojek/feast/RequestUtil.java +++ b/sdk/java/src/main/java/com/gojek/feast/RequestUtil.java @@ -16,7 +16,7 @@ */ package com.gojek.feast; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.FeatureReference; import java.util.ArrayList; import java.util.List; diff --git a/sdk/java/src/main/java/com/gojek/feast/Row.java b/sdk/java/src/main/java/com/gojek/feast/Row.java index ceef139aa13..2ac2581cac9 100644 --- a/sdk/java/src/main/java/com/gojek/feast/Row.java +++ b/sdk/java/src/main/java/com/gojek/feast/Row.java @@ -19,8 +19,8 @@ import com.google.protobuf.ByteString; import com.google.protobuf.Timestamp; import com.google.protobuf.util.Timestamps; -import feast.types.ValueProto.Value; -import feast.types.ValueProto.Value.ValCase; +import feast.proto.types.ValueProto.Value; +import feast.proto.types.ValueProto.Value.ValCase; import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; diff --git a/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java b/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java index a471609149b..c066ffa0b30 100644 --- a/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java +++ b/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.protobuf.TextFormat; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.FeatureReference; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; diff --git a/serving/src/main/java/feast/serving/config/FeastProperties.java b/serving/src/main/java/feast/serving/config/FeastProperties.java index 9eec333a148..f905f5f5c02 100644 --- a/serving/src/main/java/feast/serving/config/FeastProperties.java +++ b/serving/src/main/java/feast/serving/config/FeastProperties.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; -import feast.core.StoreProto; +import feast.proto.core.StoreProto; import java.util.*; import java.util.stream.Collectors; import javax.validation.constraints.NotBlank; diff --git a/serving/src/main/java/feast/serving/config/JobServiceConfig.java b/serving/src/main/java/feast/serving/config/JobServiceConfig.java index fa2272e5cd0..b85e24062da 100644 --- a/serving/src/main/java/feast/serving/config/JobServiceConfig.java +++ b/serving/src/main/java/feast/serving/config/JobServiceConfig.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.StoreType; import feast.serving.service.JobService; import feast.serving.service.NoopJobService; import feast.serving.service.RedisBackedJobService; diff --git a/serving/src/main/java/feast/serving/config/ServingServiceConfig.java b/serving/src/main/java/feast/serving/config/ServingServiceConfig.java index a1dbc1db604..46ffdb2fcc8 100644 --- a/serving/src/main/java/feast/serving/config/ServingServiceConfig.java +++ b/serving/src/main/java/feast/serving/config/ServingServiceConfig.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.StoreProto; +import feast.proto.core.StoreProto; import feast.serving.service.HistoricalServingService; import feast.serving.service.JobService; import feast.serving.service.NoopJobService; diff --git a/serving/src/main/java/feast/serving/config/SpecServiceConfig.java b/serving/src/main/java/feast/serving/config/SpecServiceConfig.java index dbe2de665ee..0a62557077f 100644 --- a/serving/src/main/java/feast/serving/config/SpecServiceConfig.java +++ b/serving/src/main/java/feast/serving/config/SpecServiceConfig.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.StoreProto; +import feast.proto.core.StoreProto; import feast.serving.specs.CachedSpecService; import feast.serving.specs.CoreSpecService; import java.util.concurrent.Executors; diff --git a/serving/src/main/java/feast/serving/controller/HealthServiceController.java b/serving/src/main/java/feast/serving/controller/HealthServiceController.java index 3d34aea97b5..0810429183e 100644 --- a/serving/src/main/java/feast/serving/controller/HealthServiceController.java +++ b/serving/src/main/java/feast/serving/controller/HealthServiceController.java @@ -16,8 +16,8 @@ */ package feast.serving.controller; -import feast.core.StoreProto.Store; -import feast.serving.ServingAPIProto.GetFeastServingInfoRequest; +import feast.proto.core.StoreProto.Store; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoRequest; import feast.serving.interceptors.GrpcMonitoringInterceptor; import feast.serving.service.ServingService; import feast.serving.specs.CachedSpecService; diff --git a/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java b/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java index 91f38e2bd41..3fae6ae65a7 100644 --- a/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java +++ b/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java @@ -16,15 +16,15 @@ */ package feast.serving.controller; -import feast.serving.ServingAPIProto.GetBatchFeaturesRequest; -import feast.serving.ServingAPIProto.GetBatchFeaturesResponse; -import feast.serving.ServingAPIProto.GetFeastServingInfoRequest; -import feast.serving.ServingAPIProto.GetFeastServingInfoResponse; -import feast.serving.ServingAPIProto.GetJobRequest; -import feast.serving.ServingAPIProto.GetJobResponse; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; -import feast.serving.ServingServiceGrpc.ServingServiceImplBase; +import feast.proto.serving.ServingAPIProto.GetBatchFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetBatchFeaturesResponse; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoRequest; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoResponse; +import feast.proto.serving.ServingAPIProto.GetJobRequest; +import feast.proto.serving.ServingAPIProto.GetJobResponse; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingServiceGrpc.ServingServiceImplBase; import feast.serving.config.FeastProperties; import feast.serving.exception.SpecRetrievalException; import feast.serving.interceptors.GrpcMonitoringInterceptor; diff --git a/serving/src/main/java/feast/serving/controller/ServingServiceRestController.java b/serving/src/main/java/feast/serving/controller/ServingServiceRestController.java index 344ab7cf3ae..df71112ef78 100644 --- a/serving/src/main/java/feast/serving/controller/ServingServiceRestController.java +++ b/serving/src/main/java/feast/serving/controller/ServingServiceRestController.java @@ -18,10 +18,10 @@ import static feast.serving.util.mappers.ResponseJSONMapper.mapGetOnlineFeaturesResponse; -import feast.serving.ServingAPIProto.GetFeastServingInfoRequest; -import feast.serving.ServingAPIProto.GetFeastServingInfoResponse; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoRequest; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoResponse; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; import feast.serving.config.FeastProperties; import feast.serving.service.ServingService; import feast.serving.util.RequestHelper; diff --git a/serving/src/main/java/feast/serving/service/HistoricalServingService.java b/serving/src/main/java/feast/serving/service/HistoricalServingService.java index cc6df1b6b5a..b4a694e3bfa 100644 --- a/serving/src/main/java/feast/serving/service/HistoricalServingService.java +++ b/serving/src/main/java/feast/serving/service/HistoricalServingService.java @@ -16,9 +16,9 @@ */ package feast.serving.service; -import feast.serving.ServingAPIProto; -import feast.serving.ServingAPIProto.*; -import feast.serving.ServingAPIProto.Job.Builder; +import feast.proto.serving.ServingAPIProto; +import feast.proto.serving.ServingAPIProto.*; +import feast.proto.serving.ServingAPIProto.Job.Builder; import feast.serving.specs.CachedSpecService; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.HistoricalRetrievalResult; diff --git a/serving/src/main/java/feast/serving/service/JobService.java b/serving/src/main/java/feast/serving/service/JobService.java index 96af5cd4d60..3198fffd4cc 100644 --- a/serving/src/main/java/feast/serving/service/JobService.java +++ b/serving/src/main/java/feast/serving/service/JobService.java @@ -16,7 +16,7 @@ */ package feast.serving.service; -import feast.serving.ServingAPIProto.Job; +import feast.proto.serving.ServingAPIProto.Job; import java.util.Optional; // JobService interface specifies the operations to manage Job instances internally in Feast diff --git a/serving/src/main/java/feast/serving/service/NoopJobService.java b/serving/src/main/java/feast/serving/service/NoopJobService.java index 41fd561073d..5407cdcbe51 100644 --- a/serving/src/main/java/feast/serving/service/NoopJobService.java +++ b/serving/src/main/java/feast/serving/service/NoopJobService.java @@ -16,7 +16,7 @@ */ package feast.serving.service; -import feast.serving.ServingAPIProto.Job; +import feast.proto.serving.ServingAPIProto.Job; import java.util.Optional; // No-op implementation of the JobService, for online serving stores. diff --git a/serving/src/main/java/feast/serving/service/OnlineServingService.java b/serving/src/main/java/feast/serving/service/OnlineServingService.java index 28885ca4452..d5c615059d1 100644 --- a/serving/src/main/java/feast/serving/service/OnlineServingService.java +++ b/serving/src/main/java/feast/serving/service/OnlineServingService.java @@ -18,16 +18,16 @@ import com.google.common.collect.Maps; import com.google.protobuf.Duration; -import feast.serving.ServingAPIProto.*; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues; +import feast.proto.serving.ServingAPIProto.*; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.ValueProto.Value; import feast.serving.specs.CachedSpecService; import feast.serving.util.Metrics; import feast.serving.util.RefUtil; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.OnlineRetriever; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.ValueProto.Value; import io.grpc.Status; import io.opentracing.Scope; import io.opentracing.Tracer; diff --git a/serving/src/main/java/feast/serving/service/RedisBackedJobService.java b/serving/src/main/java/feast/serving/service/RedisBackedJobService.java index dd010e58970..9081b03f518 100644 --- a/serving/src/main/java/feast/serving/service/RedisBackedJobService.java +++ b/serving/src/main/java/feast/serving/service/RedisBackedJobService.java @@ -17,8 +17,8 @@ package feast.serving.service; import com.google.protobuf.util.JsonFormat; -import feast.serving.ServingAPIProto.Job; -import feast.serving.ServingAPIProto.Job.Builder; +import feast.proto.serving.ServingAPIProto.Job; +import feast.proto.serving.ServingAPIProto.Job.Builder; import feast.serving.config.FeastProperties; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; diff --git a/serving/src/main/java/feast/serving/service/ServingService.java b/serving/src/main/java/feast/serving/service/ServingService.java index 5e662229eeb..1fe9840d594 100644 --- a/serving/src/main/java/feast/serving/service/ServingService.java +++ b/serving/src/main/java/feast/serving/service/ServingService.java @@ -16,14 +16,14 @@ */ package feast.serving.service; -import feast.serving.ServingAPIProto.GetBatchFeaturesRequest; -import feast.serving.ServingAPIProto.GetBatchFeaturesResponse; -import feast.serving.ServingAPIProto.GetFeastServingInfoRequest; -import feast.serving.ServingAPIProto.GetFeastServingInfoResponse; -import feast.serving.ServingAPIProto.GetJobRequest; -import feast.serving.ServingAPIProto.GetJobResponse; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingAPIProto.GetBatchFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetBatchFeaturesResponse; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoRequest; +import feast.proto.serving.ServingAPIProto.GetFeastServingInfoResponse; +import feast.proto.serving.ServingAPIProto.GetJobRequest; +import feast.proto.serving.ServingAPIProto.GetJobResponse; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; public interface ServingService { /** @@ -41,31 +41,31 @@ GetFeastServingInfoResponse getFeastServingInfo( /** * Get features from an online serving store, given a list of {@link - * feast.serving.ServingAPIProto.FeatureReference}s to retrieve, and list of {@link - * feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow}s to join the retrieved values - * to. + * feast.proto.serving.ServingAPIProto.FeatureReference}s to retrieve, and list of {@link + * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow}s to join the retrieved + * values to. * *

Features can be queried across feature sets, but each {@link - * feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow} must contain all entities for - * all feature sets included in the request. + * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow} must contain all + * entities for all feature sets included in the request. * *

This request is fulfilled synchronously. * * @param getFeaturesRequest {@link GetOnlineFeaturesRequest} containing list of {@link - * feast.serving.ServingAPIProto.FeatureReference}s to retrieve and list of {@link - * feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow}s to join the retrieved - * values to. + * feast.proto.serving.ServingAPIProto.FeatureReference}s to retrieve and list of {@link + * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow}s to join the + * retrieved values to. * @return {@link GetOnlineFeaturesResponse} with list of {@link - * feast.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues} for each {@link - * feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow} supplied. + * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues} for each {@link + * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow} supplied. */ GetOnlineFeaturesResponse getOnlineFeatures(GetOnlineFeaturesRequest getFeaturesRequest); /** * Get features from a batch serving store, given a list of {@link - * feast.serving.ServingAPIProto.FeatureReference}s to retrieve, and {@link - * feast.serving.ServingAPIProto.DatasetSource} pointing to remote location of dataset to join - * retrieved features to. All columns in the provided dataset will be preserved in the output + * feast.proto.serving.ServingAPIProto.FeatureReference}s to retrieve, and {@link + * feast.proto.serving.ServingAPIProto.DatasetSource} pointing to remote location of dataset to + * join retrieved features to. All columns in the provided dataset will be preserved in the output * dataset. * *

Due to the potential size of batch retrieval requests, this request is fulfilled @@ -73,11 +73,11 @@ GetFeastServingInfoResponse getFeastServingInfo( * #getJob(GetJobRequest)} will return the status of the retrieval job. * * @param getFeaturesRequest {@link GetBatchFeaturesRequest} containing a list of {@link - * feast.serving.ServingAPIProto.FeatureReference}s to retrieve, and {@link - * feast.serving.ServingAPIProto.DatasetSource} pointing to remote location of dataset to join - * retrieved features to. + * feast.proto.serving.ServingAPIProto.FeatureReference}s to retrieve, and {@link + * feast.proto.serving.ServingAPIProto.DatasetSource} pointing to remote location of dataset + * to join retrieved features to. * @return {@link GetBatchFeaturesResponse} containing reference to a retrieval {@link - * feast.serving.ServingAPIProto.Job}. + * feast.proto.serving.ServingAPIProto.Job}. */ GetBatchFeaturesResponse getBatchFeatures(GetBatchFeaturesRequest getFeaturesRequest); diff --git a/serving/src/main/java/feast/serving/specs/CachedSpecService.java b/serving/src/main/java/feast/serving/specs/CachedSpecService.java index 5dc57de7c2a..edb8ee6ee55 100644 --- a/serving/src/main/java/feast/serving/specs/CachedSpecService.java +++ b/serving/src/main/java/feast/serving/specs/CachedSpecService.java @@ -23,15 +23,15 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto; -import feast.core.StoreProto.Store; -import feast.core.StoreProto.Store.Subscription; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store; +import feast.proto.core.StoreProto.Store.Subscription; +import feast.proto.serving.ServingAPIProto.FeatureReference; import feast.serving.exception.SpecRetrievalException; import feast.storage.api.retriever.FeatureSetRequest; import io.grpc.StatusRuntimeException; diff --git a/serving/src/main/java/feast/serving/specs/CoreSpecService.java b/serving/src/main/java/feast/serving/specs/CoreSpecService.java index 259aa3f3f0c..e2feaebccb2 100644 --- a/serving/src/main/java/feast/serving/specs/CoreSpecService.java +++ b/serving/src/main/java/feast/serving/specs/CoreSpecService.java @@ -16,14 +16,14 @@ */ package feast.serving.specs; -import feast.core.CoreServiceGrpc; -import feast.core.CoreServiceProto.GetFeatureSetRequest; -import feast.core.CoreServiceProto.GetFeatureSetResponse; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.CoreServiceProto.UpdateStoreRequest; -import feast.core.CoreServiceProto.UpdateStoreResponse; -import feast.core.StoreProto.Store; +import feast.proto.core.CoreServiceGrpc; +import feast.proto.core.CoreServiceProto.GetFeatureSetRequest; +import feast.proto.core.CoreServiceProto.GetFeatureSetResponse; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.CoreServiceProto.UpdateStoreRequest; +import feast.proto.core.CoreServiceProto.UpdateStoreResponse; +import feast.proto.core.StoreProto.Store; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import org.slf4j.Logger; diff --git a/serving/src/main/java/feast/serving/util/RefUtil.java b/serving/src/main/java/feast/serving/util/RefUtil.java index 7557bd12bf2..018b440c503 100644 --- a/serving/src/main/java/feast/serving/util/RefUtil.java +++ b/serving/src/main/java/feast/serving/util/RefUtil.java @@ -16,8 +16,8 @@ */ package feast.serving.util; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; public class RefUtil { public static String generateFeatureStringRef(FeatureReference featureReference) { diff --git a/serving/src/main/java/feast/serving/util/RequestHelper.java b/serving/src/main/java/feast/serving/util/RequestHelper.java index e6e8e8629a1..16073e9b5c0 100644 --- a/serving/src/main/java/feast/serving/util/RequestHelper.java +++ b/serving/src/main/java/feast/serving/util/RequestHelper.java @@ -16,9 +16,9 @@ */ package feast.serving.util; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetBatchFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetBatchFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; import io.grpc.Status; import java.util.Set; import java.util.stream.Collectors; diff --git a/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java b/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java index 14723efe7b1..6aba17ac431 100644 --- a/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java +++ b/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java @@ -16,9 +16,9 @@ */ package feast.serving.util.mappers; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues; -import feast.types.ValueProto.Value; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues; +import feast.proto.types.ValueProto.Value; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/serving/src/test/java/feast/serving/controller/ServingServiceGRpcControllerTest.java b/serving/src/test/java/feast/serving/controller/ServingServiceGRpcControllerTest.java index d292c33fba9..bf8ed710ca7 100644 --- a/serving/src/test/java/feast/serving/controller/ServingServiceGRpcControllerTest.java +++ b/serving/src/test/java/feast/serving/controller/ServingServiceGRpcControllerTest.java @@ -19,13 +19,13 @@ import static org.mockito.MockitoAnnotations.initMocks; import com.google.protobuf.Timestamp; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.types.ValueProto.Value; import feast.serving.config.FeastProperties; import feast.serving.service.ServingService; -import feast.types.ValueProto.Value; import io.grpc.StatusRuntimeException; import io.grpc.stub.StreamObserver; import io.jaegertracing.Configuration; diff --git a/serving/src/test/java/feast/serving/service/CachedSpecServiceTest.java b/serving/src/test/java/feast/serving/service/CachedSpecServiceTest.java index 0987b95e956..66a443ae777 100644 --- a/serving/src/test/java/feast/serving/service/CachedSpecServiceTest.java +++ b/serving/src/test/java/feast/serving/service/CachedSpecServiceTest.java @@ -25,16 +25,16 @@ import static org.mockito.MockitoAnnotations.initMocks; import com.google.common.collect.Lists; -import feast.core.CoreServiceProto.ListFeatureSetsRequest; -import feast.core.CoreServiceProto.ListFeatureSetsResponse; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto.Store; -import feast.core.StoreProto.Store.RedisConfig; -import feast.core.StoreProto.Store.StoreType; -import feast.core.StoreProto.Store.Subscription; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest; +import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto.Store; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.core.StoreProto.Store.StoreType; +import feast.proto.core.StoreProto.Store.Subscription; +import feast.proto.serving.ServingAPIProto.FeatureReference; import feast.serving.specs.CachedSpecService; import feast.serving.specs.CoreSpecService; import feast.storage.api.retriever.FeatureSetRequest; diff --git a/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java b/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java index 5b9421a3c13..3148d0e030d 100644 --- a/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java +++ b/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java @@ -24,19 +24,19 @@ import com.google.common.collect.Lists; import com.google.protobuf.Duration; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse; -import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; import feast.serving.specs.CachedSpecService; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.connectors.redis.retriever.RedisOnlineRetriever; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; import io.opentracing.Tracer; import io.opentracing.Tracer.SpanBuilder; import java.util.Collections; diff --git a/storage/api/src/main/java/feast/storage/api/retriever/FeatureSetRequest.java b/storage/api/src/main/java/feast/storage/api/retriever/FeatureSetRequest.java index d181abfbe63..3482529a97d 100644 --- a/storage/api/src/main/java/feast/storage/api/retriever/FeatureSetRequest.java +++ b/storage/api/src/main/java/feast/storage/api/retriever/FeatureSetRequest.java @@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetrievalResult.java b/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetrievalResult.java index a81ce776254..6127ce616f2 100644 --- a/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetrievalResult.java +++ b/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetrievalResult.java @@ -17,8 +17,8 @@ package feast.storage.api.retriever; import com.google.auto.value.AutoValue; -import feast.serving.ServingAPIProto.DataFormat; -import feast.serving.ServingAPIProto.JobStatus; +import feast.proto.serving.ServingAPIProto.DataFormat; +import feast.proto.serving.ServingAPIProto.JobStatus; import java.io.Serializable; import java.util.List; import javax.annotation.Nullable; diff --git a/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetriever.java b/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetriever.java index 95a89c1a3cb..f07a6cd0dfd 100644 --- a/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetriever.java +++ b/storage/api/src/main/java/feast/storage/api/retriever/HistoricalRetriever.java @@ -16,7 +16,7 @@ */ package feast.storage.api.retriever; -import feast.serving.ServingAPIProto.DatasetSource; +import feast.proto.serving.ServingAPIProto.DatasetSource; import java.util.List; /** diff --git a/storage/api/src/main/java/feast/storage/api/retriever/OnlineRetriever.java b/storage/api/src/main/java/feast/storage/api/retriever/OnlineRetriever.java index 5eb27b995ea..45d6b352632 100644 --- a/storage/api/src/main/java/feast/storage/api/retriever/OnlineRetriever.java +++ b/storage/api/src/main/java/feast/storage/api/retriever/OnlineRetriever.java @@ -16,8 +16,8 @@ */ package feast.storage.api.retriever; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.types.FeatureRowProto.FeatureRow; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.types.FeatureRowProto.FeatureRow; import java.util.List; /** diff --git a/storage/api/src/main/java/feast/storage/api/writer/FeatureSink.java b/storage/api/src/main/java/feast/storage/api/writer/FeatureSink.java index 3dfe7e8f103..f49ea9f423e 100644 --- a/storage/api/src/main/java/feast/storage/api/writer/FeatureSink.java +++ b/storage/api/src/main/java/feast/storage/api/writer/FeatureSink.java @@ -16,8 +16,8 @@ */ package feast.storage.api.writer; -import feast.core.FeatureSetProto; -import feast.types.FeatureRowProto.FeatureRow; +import feast.proto.core.FeatureSetProto; +import feast.proto.types.FeatureRowProto.FeatureRow; import java.io.Serializable; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.PCollection; diff --git a/storage/api/src/main/java/feast/storage/api/writer/WriteResult.java b/storage/api/src/main/java/feast/storage/api/writer/WriteResult.java index e378c2b46a4..abe06e41ee8 100644 --- a/storage/api/src/main/java/feast/storage/api/writer/WriteResult.java +++ b/storage/api/src/main/java/feast/storage/api/writer/WriteResult.java @@ -17,7 +17,7 @@ package feast.storage.api.writer; import com.google.common.collect.ImmutableMap; -import feast.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow; import java.io.Serializable; import java.util.Map; import org.apache.beam.sdk.Pipeline; diff --git a/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java b/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java index e1f5c116752..43a96e97efa 100644 --- a/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java +++ b/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java @@ -18,12 +18,12 @@ import com.google.protobuf.ByteString; import com.google.protobuf.util.Timestamps; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FeatureRowProto.FeatureRow.Builder; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.*; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow.Builder; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.*; import java.util.concurrent.ThreadLocalRandom; import org.apache.commons.lang3.RandomStringUtils; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/common/TypeUtil.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/common/TypeUtil.java index dcd13093177..a8e4cda678d 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/common/TypeUtil.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/common/TypeUtil.java @@ -17,7 +17,7 @@ package feast.storage.connectors.bigquery.common; import com.google.cloud.bigquery.StandardSQLTypeName; -import feast.types.ValueProto; +import feast.proto.types.ValueProto; import java.util.HashMap; import java.util.Map; @@ -54,7 +54,7 @@ public class TypeUtil { } /** - * Converts {@link feast.types.ValueProto.ValueType} to its corresponding {@link + * Converts {@link feast.proto.types.ValueProto.ValueType} to its corresponding {@link * StandardSQLTypeName} * * @param valueType value type to convert diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java index 0edcf67806b..4b2ee45543e 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java @@ -25,8 +25,8 @@ import com.google.cloud.storage.Blob; import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageOptions; -import feast.serving.ServingAPIProto; -import feast.serving.ServingAPIProto.DatasetSource; +import feast.proto.serving.ServingAPIProto; +import feast.proto.serving.ServingAPIProto.DatasetSource; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.HistoricalRetrievalResult; import feast.storage.api.retriever.HistoricalRetriever; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/QueryTemplater.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/QueryTemplater.java index 1fb0a617afb..84899d69adb 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/QueryTemplater.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/QueryTemplater.java @@ -20,9 +20,9 @@ import com.google.protobuf.Duration; import com.mitchellbosecke.pebble.PebbleEngine; import com.mitchellbosecke.pebble.template.PebbleTemplate; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.serving.ServingAPIProto.FeatureReference; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; import feast.storage.api.retriever.FeatureSetRequest; import java.io.IOException; import java.io.StringWriter; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryFeatureSink.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryFeatureSink.java index 20281783cf2..8dffe629769 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryFeatureSink.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryFeatureSink.java @@ -19,12 +19,12 @@ import com.google.auto.value.AutoValue; import com.google.cloud.bigquery.*; import com.google.common.collect.ImmutableMap; -import feast.core.FeatureSetProto; -import feast.core.StoreProto.Store.BigQueryConfig; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.StoreProto.Store.BigQueryConfig; +import feast.proto.types.FeatureRowProto; import feast.storage.api.writer.FeatureSink; import feast.storage.api.writer.WriteResult; import feast.storage.connectors.bigquery.common.TypeUtil; -import feast.types.FeatureRowProto; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryWrite.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryWrite.java index e3f5e5ae713..b1309e59b5e 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryWrite.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/BigQueryWrite.java @@ -19,9 +19,9 @@ import com.google.api.services.bigquery.model.TableDataInsertAllResponse; import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.bigquery.DatasetId; +import feast.proto.types.FeatureRowProto; import feast.storage.api.writer.FailedElement; import feast.storage.api.writer.WriteResult; -import feast.types.FeatureRowProto; import java.io.IOException; import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO; import org.apache.beam.sdk.io.gcp.bigquery.BigQueryInsertError; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/FeatureRowToTableRow.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/FeatureRowToTableRow.java index 6a69b96d717..f936c951fe3 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/FeatureRowToTableRow.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/FeatureRowToTableRow.java @@ -18,8 +18,8 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.protobuf.util.Timestamps; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; import java.util.Base64; import java.util.stream.Collectors; import org.apache.beam.sdk.transforms.SerializableFunction; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/GetTableDestination.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/GetTableDestination.java index 2007f8573fb..b7774ae7ec4 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/GetTableDestination.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/writer/GetTableDestination.java @@ -17,7 +17,7 @@ package feast.storage.connectors.bigquery.writer; import com.google.api.services.bigquery.model.TimePartitioning; -import feast.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FeatureRowProto.FeatureRow; import org.apache.beam.sdk.io.gcp.bigquery.TableDestination; import org.apache.beam.sdk.transforms.SerializableFunction; import org.apache.beam.sdk.values.ValueInSingleWindow; diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/FeatureRowDecoder.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/FeatureRowDecoder.java index a5506028cbf..fd9556841e4 100644 --- a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/FeatureRowDecoder.java +++ b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/FeatureRowDecoder.java @@ -16,10 +16,10 @@ */ package feast.storage.connectors.redis.retriever; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisOnlineRetriever.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisOnlineRetriever.java index f25bf558f22..0db4837c069 100644 --- a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisOnlineRetriever.java +++ b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisOnlineRetriever.java @@ -18,16 +18,16 @@ import com.google.protobuf.AbstractMessageLite; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.storage.RedisProto.RedisKey; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.OnlineRetriever; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; import io.grpc.Status; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; @@ -68,8 +68,8 @@ public static OnlineRetriever create(StatefulRedisConnection con * {@link EntityRow} provided by the user. * * @param entityRows list of entity rows in the feature request - * @param featureSetRequests Map of {@link feast.core.FeatureSetProto.FeatureSetSpec} to feature - * references in the request tied to that feature set. + * @param featureSetRequests Map of {@link feast.proto.core.FeatureSetProto.FeatureSetSpec} to + * feature references in the request tied to that feature set. * @return List of List of {@link FeatureRow} */ @Override diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisCustomIO.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisCustomIO.java index cfe7771b324..3fe9148eed5 100644 --- a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisCustomIO.java +++ b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisCustomIO.java @@ -16,18 +16,18 @@ */ package feast.storage.connectors.redis.writer; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto.Store.RedisConfig; -import feast.storage.RedisProto.RedisKey; -import feast.storage.RedisProto.RedisKey.Builder; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.storage.RedisProto.RedisKey.Builder; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto; import feast.storage.api.writer.FailedElement; import feast.storage.api.writer.WriteResult; import feast.storage.common.retry.Retriable; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto; import io.lettuce.core.RedisConnectionException; import java.io.IOException; import java.util.ArrayList; diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisFeatureSink.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisFeatureSink.java index 8801460231e..171f17daac2 100644 --- a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisFeatureSink.java +++ b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisFeatureSink.java @@ -17,13 +17,13 @@ package feast.storage.connectors.redis.writer; import com.google.auto.value.AutoValue; -import feast.core.FeatureSetProto.FeatureSet; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; +import feast.proto.core.FeatureSetProto.FeatureSet; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.types.FeatureRowProto.FeatureRow; import feast.storage.api.writer.FeatureSink; import feast.storage.api.writer.WriteResult; -import feast.types.FeatureRowProto.FeatureRow; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisConnectionException; import io.lettuce.core.RedisURI; diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisStandaloneIngestionClient.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisStandaloneIngestionClient.java index 95bd7ad1516..24591a1dc0f 100644 --- a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisStandaloneIngestionClient.java +++ b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisStandaloneIngestionClient.java @@ -17,7 +17,7 @@ package feast.storage.connectors.redis.writer; import com.google.common.collect.Lists; -import feast.core.StoreProto; +import feast.proto.core.StoreProto; import feast.storage.common.retry.BackOffExecutor; import io.lettuce.core.LettuceFutures; import io.lettuce.core.RedisClient; diff --git a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/FeatureRowDecoderTest.java b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/FeatureRowDecoderTest.java index 0f37e68941c..63ad7aa26de 100644 --- a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/FeatureRowDecoderTest.java +++ b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/FeatureRowDecoderTest.java @@ -19,12 +19,12 @@ import static org.junit.Assert.*; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.types.FeatureRowProto; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; -import feast.types.ValueProto.ValueType; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.types.FeatureRowProto; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; +import feast.proto.types.ValueProto.ValueType; import java.util.Collections; import org.junit.Test; diff --git a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/RedisOnlineRetrieverTest.java b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/RedisOnlineRetrieverTest.java index 9e9ccbe53f6..4ab2ac9e130 100644 --- a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/RedisOnlineRetrieverTest.java +++ b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/RedisOnlineRetrieverTest.java @@ -26,17 +26,17 @@ import com.google.protobuf.AbstractMessageLite; import com.google.protobuf.Duration; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.storage.RedisProto.RedisKey; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.OnlineRetriever; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; import io.lettuce.core.KeyValue; import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.api.sync.RedisCommands; diff --git a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/writer/RedisFeatureSinkTest.java b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/writer/RedisFeatureSinkTest.java index c9d8cf4cfc5..0da4c102cd4 100644 --- a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/writer/RedisFeatureSinkTest.java +++ b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/writer/RedisFeatureSinkTest.java @@ -23,16 +23,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto; -import feast.core.StoreProto.Store.RedisConfig; -import feast.storage.RedisProto.RedisKey; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; -import feast.types.ValueProto.ValueType.Enum; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto; +import feast.proto.core.StoreProto.Store.RedisConfig; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; +import feast.proto.types.ValueProto.ValueType.Enum; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; import io.lettuce.core.api.StatefulRedisConnection; diff --git a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/FeatureRowDecoder.java b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/FeatureRowDecoder.java index d6312c6b6ab..d398752aa47 100644 --- a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/FeatureRowDecoder.java +++ b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/FeatureRowDecoder.java @@ -16,10 +16,10 @@ */ package feast.storage.connectors.rediscluster.retriever; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetriever.java b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetriever.java index 1141e4eeed5..f80de0fc8af 100644 --- a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetriever.java +++ b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetriever.java @@ -18,16 +18,16 @@ import com.google.protobuf.AbstractMessageLite; import com.google.protobuf.InvalidProtocolBufferException; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.storage.RedisProto.RedisKey; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.OnlineRetriever; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; import io.grpc.Status; import io.lettuce.core.RedisURI; import io.lettuce.core.cluster.RedisClusterClient; diff --git a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterCustomIO.java b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterCustomIO.java index 0a7634c5c5f..8984dc877cd 100644 --- a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterCustomIO.java +++ b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterCustomIO.java @@ -16,18 +16,18 @@ */ package feast.storage.connectors.rediscluster.writer; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto.Store.RedisClusterConfig; -import feast.storage.RedisProto.RedisKey; -import feast.storage.RedisProto.RedisKey.Builder; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto.Store.RedisClusterConfig; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.storage.RedisProto.RedisKey.Builder; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto; import feast.storage.api.writer.FailedElement; import feast.storage.api.writer.WriteResult; import feast.storage.common.retry.Retriable; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto; import io.lettuce.core.RedisException; import java.io.IOException; import java.util.ArrayList; diff --git a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSink.java b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSink.java index c8126c77930..160df6553cc 100644 --- a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSink.java +++ b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSink.java @@ -17,11 +17,11 @@ package feast.storage.connectors.rediscluster.writer; import com.google.auto.value.AutoValue; -import feast.core.FeatureSetProto; -import feast.core.StoreProto.Store.RedisClusterConfig; +import feast.proto.core.FeatureSetProto; +import feast.proto.core.StoreProto.Store.RedisClusterConfig; +import feast.proto.types.FeatureRowProto; import feast.storage.api.writer.FeatureSink; import feast.storage.api.writer.WriteResult; -import feast.types.FeatureRowProto; import java.util.Map; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.values.PCollection; diff --git a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterIngestionClient.java b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterIngestionClient.java index 1f395f02e56..5bd70d08b43 100644 --- a/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterIngestionClient.java +++ b/storage/connectors/rediscluster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterIngestionClient.java @@ -17,7 +17,7 @@ package feast.storage.connectors.rediscluster.writer; import com.google.common.collect.Lists; -import feast.core.StoreProto; +import feast.proto.core.StoreProto; import feast.storage.common.retry.BackOffExecutor; import io.lettuce.core.LettuceFutures; import io.lettuce.core.RedisFuture; diff --git a/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetrieverTest.java b/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetrieverTest.java index b89ed8b2286..16ab7962d60 100644 --- a/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetrieverTest.java +++ b/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetrieverTest.java @@ -26,17 +26,17 @@ import com.google.protobuf.AbstractMessageLite; import com.google.protobuf.Duration; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.serving.ServingAPIProto.FeatureReference; -import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; -import feast.storage.RedisProto.RedisKey; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.serving.ServingAPIProto.FeatureReference; +import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; import feast.storage.api.retriever.FeatureSetRequest; import feast.storage.api.retriever.OnlineRetriever; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; import io.lettuce.core.KeyValue; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; diff --git a/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSinkTest.java b/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSinkTest.java index c766d9b26c6..8c5afd3d679 100644 --- a/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSinkTest.java +++ b/storage/connectors/rediscluster/src/test/java/feast/storage/connectors/rediscluster/writer/RedisClusterFeatureSinkTest.java @@ -23,15 +23,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.protobuf.Timestamp; -import feast.core.FeatureSetProto.EntitySpec; -import feast.core.FeatureSetProto.FeatureSetSpec; -import feast.core.FeatureSetProto.FeatureSpec; -import feast.core.StoreProto.Store.RedisClusterConfig; -import feast.storage.RedisProto.RedisKey; -import feast.types.FeatureRowProto.FeatureRow; -import feast.types.FieldProto.Field; -import feast.types.ValueProto.Value; -import feast.types.ValueProto.ValueType.Enum; +import feast.proto.core.FeatureSetProto.EntitySpec; +import feast.proto.core.FeatureSetProto.FeatureSetSpec; +import feast.proto.core.FeatureSetProto.FeatureSpec; +import feast.proto.core.StoreProto.Store.RedisClusterConfig; +import feast.proto.storage.RedisProto.RedisKey; +import feast.proto.types.FeatureRowProto.FeatureRow; +import feast.proto.types.FieldProto.Field; +import feast.proto.types.ValueProto.Value; +import feast.proto.types.ValueProto.ValueType.Enum; import io.lettuce.core.RedisURI; import io.lettuce.core.cluster.RedisClusterClient; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;