Fixed Java SDK after unnesting FeatureSet requests

woop · woop · commit 8234bfacf5ee · 2019-10-23T15:02:36.000+08:00
diff --git a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/FeastClient.java b/sdk/java/src/main/java/com/gojek/feast/v1alpha1/FeastClient.java
@@ -4,7 +4,7 @@
 import feast.serving.ServingAPIProto.GetFeastServingInfoResponse;
 import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest;
 import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.EntityRow;
-import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.FeatureSet;
+import feast.serving.ServingAPIProto.FeatureSetRequest;
 import feast.serving.ServingAPIProto.GetOnlineFeaturesResponse;
 import feast.serving.ServingServiceGrpc;
 import io.grpc.ManagedChannel;
@@ -78,7 +78,7 @@ public List<Row> getOnlineFeatures(List<String> featureIds, List<Row> rows) {
    */
   public List<Row> getOnlineFeatures(
       List<String> featureIds, List<Row> rows, boolean omitEntitiesInResponse) {
-    List<FeatureSet> featureSets = RequestUtil.createFeatureSets(featureIds);
+    List<FeatureSetRequest> featureSets = RequestUtil.createFeatureSets(featureIds);
     List<EntityRow> entityRows =
         rows.stream()
             .map(
diff --git a/sdk/java/src/main/java/com/gojek/feast/v1alpha1/RequestUtil.java b/sdk/java/src/main/java/com/gojek/feast/v1alpha1/RequestUtil.java
@@ -1,6 +1,6 @@
 package com.gojek.feast.v1alpha1;
 
-import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.FeatureSet;
+import feast.serving.ServingAPIProto.FeatureSetRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -11,7 +11,7 @@
 
 @SuppressWarnings("WeakerAccess")
 public class RequestUtil {
-  public static List<FeatureSet> createFeatureSets(List<String> featureIds) {
+  public static List<FeatureSetRequest> createFeatureSets(List<String> featureIds) {
     if (featureIds == null) {
       throw new IllegalArgumentException("featureIds cannot be null");
     }
@@ -49,7 +49,7 @@ public static List<FeatureSet> createFeatureSets(List<String> featureIds) {
     return featureSetMap.entrySet().stream()
         .map(
             entry ->
-                FeatureSet.newBuilder()
+                FeatureSetRequest.newBuilder()
                     .setName(entry.getKey().getKey())
                     .setVersion(entry.getKey().getValue())
                     .addAllFeatureNames(entry.getValue())
diff --git a/sdk/java/src/test/java/com/gojek/feast/v1alpha1/RequestUtilTest.java b/sdk/java/src/test/java/com/gojek/feast/v1alpha1/RequestUtilTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.protobuf.TextFormat;
-import feast.serving.ServingAPIProto.GetOnlineFeaturesRequest.FeatureSet;
+import feast.serving.ServingAPIProto.FeatureSetRequest;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -22,27 +22,27 @@ private static Stream<Arguments> provideValidFeatureIds() {
         Arguments.of(
             Collections.singletonList("driver:1:driver_id"),
             Collections.singletonList(
-                FeatureSet.newBuilder()
+                FeatureSetRequest.newBuilder()
                     .setName("driver")
                     .setVersion(1)
                     .addFeatureNames("driver_id"))),
         Arguments.of(
             Arrays.asList("driver:1:driver_id", "driver:1:driver_name"),
             Collections.singletonList(
-                FeatureSet.newBuilder()
+                FeatureSetRequest.newBuilder()
                     .setName("driver")
                     .setVersion(1)
                     .addAllFeatureNames(Arrays.asList("driver_id", "driver_name"))
                     .build())),
         Arguments.of(
             Arrays.asList("driver:1:driver_id", "driver:1:driver_name", "booking:2:booking_id"),
             Arrays.asList(
-                FeatureSet.newBuilder()
+                FeatureSetRequest.newBuilder()
                     .setName("driver")
                     .setVersion(1)
                     .addAllFeatureNames(Arrays.asList("driver_id", "driver_name"))
                     .build(),
-                FeatureSet.newBuilder()
+                FeatureSetRequest.newBuilder()
                     .setName("booking")
                     .setVersion(2)
                     .addFeatureNames("booking_id")
@@ -52,11 +52,11 @@ private static Stream<Arguments> provideValidFeatureIds() {
   @ParameterizedTest
   @MethodSource("provideValidFeatureIds")
   void createFeatureSets_ShouldReturnFeatureSetsForValidFeatureIds(
-      List<String> input, List<FeatureSet> expected) {
-    List<FeatureSet> actual = RequestUtil.createFeatureSets(input);
+      List<String> input, List<FeatureSetRequest> expected) {
+    List<FeatureSetRequest> actual = RequestUtil.createFeatureSets(input);
     // Order of the actual and expected featureSets do no not matter
-    actual.sort(Comparator.comparing(FeatureSet::getName));
-    expected.sort(Comparator.comparing(FeatureSet::getName));
+    actual.sort(Comparator.comparing(FeatureSetRequest::getName));
+    expected.sort(Comparator.comparing(FeatureSetRequest::getName));
     assertEquals(expected.size(), actual.size());
     for (int i = 0; i < expected.size(); i++) {
       String expectedString = TextFormat.printer().printToString(expected.get(i));
