Skip to content

Commit 14cae74

Browse files
woopwoop
authored
Add .proto to packages of Protobuf generated Java classes (#700)
* Add .proto to protobuf java package * Update dependencies on proto generated Java classes * Remove io.grpc.vendor from pom.xml * Remove vendor from pom.xml * Fix formatting on JobUpdateTask
1 parent 0edd651 commit 14cae74

File tree

113 files changed

+518
-527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+518
-527
lines changed

‎core/src/main/java/feast/core/config/FeatureStreamConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package feast.core.config;
1818

1919
import com.google.common.base.Strings;
20-
import feast.core.SourceProto.KafkaSourceConfig;
21-
import feast.core.SourceProto.SourceType;
2220
import feast.core.config.FeastProperties.StreamProperties;
2321
import feast.core.model.Source;
22+
import feast.proto.core.SourceProto.KafkaSourceConfig;
23+
import feast.proto.core.SourceProto.SourceType;
2424
import java.util.Collections;
2525
import java.util.HashMap;
2626
import java.util.Map;

‎core/src/main/java/feast/core/grpc/CoreServiceImpl.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,37 @@
1818

1919
import com.google.api.gax.rpc.InvalidArgumentException;
2020
import com.google.protobuf.InvalidProtocolBufferException;
21-
import feast.core.CoreServiceGrpc.CoreServiceImplBase;
22-
import feast.core.CoreServiceProto.ApplyFeatureSetRequest;
23-
import feast.core.CoreServiceProto.ApplyFeatureSetResponse;
24-
import feast.core.CoreServiceProto.ArchiveProjectRequest;
25-
import feast.core.CoreServiceProto.ArchiveProjectResponse;
26-
import feast.core.CoreServiceProto.CreateProjectRequest;
27-
import feast.core.CoreServiceProto.CreateProjectResponse;
28-
import feast.core.CoreServiceProto.GetFeastCoreVersionRequest;
29-
import feast.core.CoreServiceProto.GetFeastCoreVersionResponse;
30-
import feast.core.CoreServiceProto.GetFeatureSetRequest;
31-
import feast.core.CoreServiceProto.GetFeatureSetResponse;
32-
import feast.core.CoreServiceProto.ListFeatureSetsRequest;
33-
import feast.core.CoreServiceProto.ListFeatureSetsResponse;
34-
import feast.core.CoreServiceProto.ListIngestionJobsRequest;
35-
import feast.core.CoreServiceProto.ListIngestionJobsResponse;
36-
import feast.core.CoreServiceProto.ListProjectsRequest;
37-
import feast.core.CoreServiceProto.ListProjectsResponse;
38-
import feast.core.CoreServiceProto.ListStoresRequest;
39-
import feast.core.CoreServiceProto.ListStoresResponse;
40-
import feast.core.CoreServiceProto.RestartIngestionJobRequest;
41-
import feast.core.CoreServiceProto.RestartIngestionJobResponse;
42-
import feast.core.CoreServiceProto.StopIngestionJobRequest;
43-
import feast.core.CoreServiceProto.StopIngestionJobResponse;
44-
import feast.core.CoreServiceProto.UpdateStoreRequest;
45-
import feast.core.CoreServiceProto.UpdateStoreResponse;
4621
import feast.core.exception.RetrievalException;
4722
import feast.core.grpc.interceptors.MonitoringInterceptor;
4823
import feast.core.model.Project;
4924
import feast.core.service.AccessManagementService;
5025
import feast.core.service.JobService;
5126
import feast.core.service.SpecService;
27+
import feast.proto.core.CoreServiceGrpc.CoreServiceImplBase;
28+
import feast.proto.core.CoreServiceProto.ApplyFeatureSetRequest;
29+
import feast.proto.core.CoreServiceProto.ApplyFeatureSetResponse;
30+
import feast.proto.core.CoreServiceProto.ArchiveProjectRequest;
31+
import feast.proto.core.CoreServiceProto.ArchiveProjectResponse;
32+
import feast.proto.core.CoreServiceProto.CreateProjectRequest;
33+
import feast.proto.core.CoreServiceProto.CreateProjectResponse;
34+
import feast.proto.core.CoreServiceProto.GetFeastCoreVersionRequest;
35+
import feast.proto.core.CoreServiceProto.GetFeastCoreVersionResponse;
36+
import feast.proto.core.CoreServiceProto.GetFeatureSetRequest;
37+
import feast.proto.core.CoreServiceProto.GetFeatureSetResponse;
38+
import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest;
39+
import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse;
40+
import feast.proto.core.CoreServiceProto.ListIngestionJobsRequest;
41+
import feast.proto.core.CoreServiceProto.ListIngestionJobsResponse;
42+
import feast.proto.core.CoreServiceProto.ListProjectsRequest;
43+
import feast.proto.core.CoreServiceProto.ListProjectsResponse;
44+
import feast.proto.core.CoreServiceProto.ListStoresRequest;
45+
import feast.proto.core.CoreServiceProto.ListStoresResponse;
46+
import feast.proto.core.CoreServiceProto.RestartIngestionJobRequest;
47+
import feast.proto.core.CoreServiceProto.RestartIngestionJobResponse;
48+
import feast.proto.core.CoreServiceProto.StopIngestionJobRequest;
49+
import feast.proto.core.CoreServiceProto.StopIngestionJobResponse;
50+
import feast.proto.core.CoreServiceProto.UpdateStoreRequest;
51+
import feast.proto.core.CoreServiceProto.UpdateStoreResponse;
5252
import io.grpc.Status;
5353
import io.grpc.StatusRuntimeException;
5454
import io.grpc.stub.StreamObserver;

‎core/src/main/java/feast/core/job/dataflow/DataflowJobManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
import com.google.common.base.Strings;
2828
import com.google.protobuf.InvalidProtocolBufferException;
2929
import com.google.protobuf.util.JsonFormat;
30-
import feast.core.FeatureSetProto;
31-
import feast.core.SourceProto;
32-
import feast.core.StoreProto;
3330
import feast.core.config.FeastProperties.MetricsProperties;
3431
import feast.core.exception.JobExecutionException;
3532
import feast.core.job.JobManager;
@@ -41,6 +38,9 @@
4138
import feast.ingestion.options.BZip2Compressor;
4239
import feast.ingestion.options.ImportOptions;
4340
import feast.ingestion.options.OptionCompressor;
41+
import feast.proto.core.FeatureSetProto;
42+
import feast.proto.core.SourceProto;
43+
import feast.proto.core.StoreProto;
4444
import java.io.IOException;
4545
import java.security.GeneralSecurityException;
4646
import java.util.ArrayList;

‎core/src/main/java/feast/core/job/direct/DirectRunnerJobManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import com.google.common.base.Strings;
2020
import com.google.protobuf.util.JsonFormat;
21-
import feast.core.FeatureSetProto;
22-
import feast.core.StoreProto;
2321
import feast.core.config.FeastProperties.MetricsProperties;
2422
import feast.core.exception.JobExecutionException;
2523
import feast.core.job.JobManager;
@@ -33,6 +31,8 @@
3331
import feast.ingestion.options.BZip2Compressor;
3432
import feast.ingestion.options.ImportOptions;
3533
import feast.ingestion.options.OptionCompressor;
34+
import feast.proto.core.FeatureSetProto;
35+
import feast.proto.core.StoreProto;
3636
import java.io.IOException;
3737
import java.util.ArrayList;
3838
import java.util.Collections;

‎core/src/main/java/feast/core/job/option/FeatureSetJsonByteConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.google.protobuf.InvalidProtocolBufferException;
2020
import com.google.protobuf.util.JsonFormat;
21-
import feast.core.FeatureSetProto;
2221
import feast.ingestion.options.OptionByteConverter;
22+
import feast.proto.core.FeatureSetProto;
2323
import java.util.ArrayList;
2424
import java.util.List;
2525

‎core/src/main/java/feast/core/model/Entity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package feast.core.model;
1818

19-
import feast.core.FeatureSetProto.EntitySpec;
20-
import feast.types.ValueProto.ValueType;
19+
import feast.proto.core.FeatureSetProto.EntitySpec;
20+
import feast.proto.types.ValueProto.ValueType;
2121
import java.util.Objects;
2222
import javax.persistence.*;
2323
import lombok.Getter;

‎core/src/main/java/feast/core/model/Feature.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package feast.core.model;
1818

1919
import com.google.protobuf.InvalidProtocolBufferException;
20-
import feast.core.FeatureSetProto.FeatureSpec;
21-
import feast.core.FeatureSetProto.FeatureSpec.Builder;
2220
import feast.core.util.TypeConversion;
23-
import feast.types.ValueProto.ValueType;
21+
import feast.proto.core.FeatureSetProto.FeatureSpec;
22+
import feast.proto.core.FeatureSetProto.FeatureSpec.Builder;
23+
import feast.proto.types.ValueProto.ValueType;
2424
import java.util.Arrays;
2525
import java.util.Map;
2626
import java.util.Objects;

‎core/src/main/java/feast/core/model/FeatureSet.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import com.google.protobuf.Duration;
2121
import com.google.protobuf.InvalidProtocolBufferException;
2222
import com.google.protobuf.Timestamp;
23-
import feast.core.FeatureSetProto;
24-
import feast.core.FeatureSetProto.*;
2523
import feast.core.util.TypeConversion;
24+
import feast.proto.core.FeatureSetProto;
25+
import feast.proto.core.FeatureSetProto.*;
2626
import java.util.*;
2727
import java.util.stream.Collectors;
2828
import javax.persistence.*;

‎core/src/main/java/feast/core/model/Job.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package feast.core.model;
1818

1919
import com.google.protobuf.InvalidProtocolBufferException;
20-
import feast.core.FeatureSetProto;
21-
import feast.core.IngestionJobProto;
2220
import feast.core.job.Runner;
21+
import feast.proto.core.FeatureSetProto;
22+
import feast.proto.core.IngestionJobProto;
2323
import java.util.ArrayList;
2424
import java.util.List;
2525
import javax.persistence.*;

‎core/src/main/java/feast/core/model/JobStatus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package feast.core.model;
1818

19-
import feast.core.IngestionJobProto.IngestionJobStatus;
19+
import feast.proto.core.IngestionJobProto.IngestionJobStatus;
2020
import java.util.Map;
2121
import java.util.Set;
2222

0 commit comments

Comments
 (0)