Restore Feast Java SDK and Ingestion compatibility with Java 8 runtim…

…es (#739) Backports #722 to v0.5.
feast-dev · May 23, 2020 · de0a614 · de0a614
1 parent a102eb0
commit de0a614
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 32 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -32,6 +32,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>11</release>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/datatypes/java/pom.xml b/datatypes/java/pom.xml
@@ -37,15 +37,6 @@
 
     <build>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <!-- To ensure Ingestion remains compatible for Java 8-only Beam runners -->
-            <release>8</release>
-          </configuration>
-        </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>

diff --git a/ingestion/pom.xml b/ingestion/pom.xml
@@ -31,15 +31,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <!-- To ensure Ingestion remains compatible for Java 8-only Beam runners -->
-          <release>8</release>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -84,6 +75,31 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <!--
+            We want to keep Ingestion compatible with Java 8 runtime for Beam runners, #518.
+            Unfortunately this doesn't seem to work on Reactor modules, though:
+            https://github.com/mojohaus/mojo-parent/issues/85
+            -->
+          <execution>
+            <id>enforce-bytecode-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>1.8</maxJdkVersion>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -411,7 +411,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <release>11</release>
+                    <!-- Our leaf applications target 11, except Ingestion and its deps remain on 8 for Beam -->
+                    <release>8</release>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java b/sdk/java/src/test/java/com/gojek/feast/RequestUtilTest.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import com.google.common.collect.ImmutableList;
 import com.google.protobuf.TextFormat;
 import feast.proto.serving.ServingAPIProto.FeatureReference;
 import java.util.Arrays;
@@ -82,7 +83,7 @@ void renderFeatureRef_ShouldReturnFeatureRefString(
   }
 
   private static Stream<Arguments> provideInvalidFeatureRefs() {
-    return Stream.of(Arguments.of(List.of("project/feature", "")));
+    return Stream.of(Arguments.of(ImmutableList.of("project/feature", "")));
   }
 
   @ParameterizedTest

diff --git a/serving/pom.xml b/serving/pom.xml
@@ -40,6 +40,14 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>11</release>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/...e/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisCustomIO.java b/...e/connectors/redis/src/main/java/feast/storage/connectors/redis/writer/RedisCustomIO.java
@@ -54,8 +54,10 @@ public class RedisCustomIO {
   private static final int DEFAULT_BATCH_SIZE = 1000;
   private static final int DEFAULT_TIMEOUT = 2000;
 
-  private static TupleTag<FeatureRow> successfulInsertsTag = new TupleTag<>("successfulInserts") {};
-  private static TupleTag<FailedElement> failedInsertsTupleTag = new TupleTag<>("failedInserts") {};
+  private static TupleTag<FeatureRow> successfulInsertsTag =
+      new TupleTag<FeatureRow>("successfulInserts") {};
+  private static TupleTag<FailedElement> failedInsertsTupleTag =
+      new TupleTag<FailedElement>("failedInserts") {};
 
   private static final Logger log = LoggerFactory.getLogger(RedisCustomIO.class);
 

diff --git a/...edis/src/test/java/feast/storage/connectors/redis/retriever/RedisOnlineRetrieverTest.java b/...edis/src/test/java/feast/storage/connectors/redis/retriever/RedisOnlineRetrieverTest.java
@@ -133,7 +133,7 @@ public void shouldReturnResponseWithValuesIfKeysPresent() {
     when(syncCommands.mget(redisKeyList)).thenReturn(featureRowBytes);
 
     List<List<FeatureRow>> expected =
-        List.of(
+        ImmutableList.of(
             Lists.newArrayList(
                 FeatureRow.newBuilder()
                     .setEventTimestamp(Timestamp.newBuilder().setSeconds(100))
@@ -153,7 +153,7 @@ public void shouldReturnResponseWithValuesIfKeysPresent() {
                     .build()));
 
     List<List<FeatureRow>> actual =
-        redisOnlineRetriever.getOnlineFeatures(entityRows, List.of(featureSetRequest));
+        redisOnlineRetriever.getOnlineFeatures(entityRows, ImmutableList.of(featureSetRequest));
     assertThat(actual, equalTo(expected));
   }
 
@@ -201,7 +201,7 @@ public void shouldReturnResponseWithUnsetValuesIfKeysNotPresent() {
     when(syncCommands.mget(redisKeyList)).thenReturn(featureRowBytes);
 
     List<List<FeatureRow>> expected =
-        List.of(
+        ImmutableList.of(
             Lists.newArrayList(
                 FeatureRow.newBuilder()
                     .setEventTimestamp(Timestamp.newBuilder().setSeconds(100))
@@ -220,7 +220,7 @@ public void shouldReturnResponseWithUnsetValuesIfKeysNotPresent() {
                     .build()));
 
     List<List<FeatureRow>> actual =
-        redisOnlineRetriever.getOnlineFeatures(entityRows, List.of(featureSetRequest));
+        redisOnlineRetriever.getOnlineFeatures(entityRows, ImmutableList.of(featureSetRequest));
     assertThat(actual, equalTo(expected));
   }
 

diff --git a/...ster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterCustomIO.java b/...ster/src/main/java/feast/storage/connectors/rediscluster/writer/RedisClusterCustomIO.java
@@ -54,8 +54,10 @@ public class RedisClusterCustomIO {
   private static final int DEFAULT_BATCH_SIZE = 1000;
   private static final int DEFAULT_TIMEOUT = 2000;
 
-  private static TupleTag<FeatureRow> successfulInsertsTag = new TupleTag<>("successfulInserts") {};
-  private static TupleTag<FailedElement> failedInsertsTupleTag = new TupleTag<>("failedInserts") {};
+  private static TupleTag<FeatureRow> successfulInsertsTag =
+      new TupleTag<FeatureRow>("successfulInserts") {};
+  private static TupleTag<FailedElement> failedInsertsTupleTag =
+      new TupleTag<FailedElement>("failedInserts") {};
 
   private static final Logger log = LoggerFactory.getLogger(RedisClusterCustomIO.class);
 

diff --git a/...java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetrieverTest.java b/...java/feast/storage/connectors/rediscluster/retriever/RedisClusterOnlineRetrieverTest.java
@@ -133,7 +133,7 @@ public void shouldReturnResponseWithValuesIfKeysPresent() {
     when(syncCommands.mget(redisKeyList)).thenReturn(featureRowBytes);
 
     List<List<FeatureRow>> expected =
-        List.of(
+        ImmutableList.of(
             Lists.newArrayList(
                 FeatureRow.newBuilder()
                     .setEventTimestamp(Timestamp.newBuilder().setSeconds(100))
@@ -153,7 +153,8 @@ public void shouldReturnResponseWithValuesIfKeysPresent() {
                     .build()));
 
     List<List<FeatureRow>> actual =
-        redisClusterOnlineRetriever.getOnlineFeatures(entityRows, List.of(featureSetRequest));
+        redisClusterOnlineRetriever.getOnlineFeatures(
+            entityRows, ImmutableList.of(featureSetRequest));
     assertThat(actual, equalTo(expected));
   }
 
@@ -201,7 +202,7 @@ public void shouldReturnResponseWithUnsetValuesIfKeysNotPresent() {
     when(syncCommands.mget(redisKeyList)).thenReturn(featureRowBytes);
 
     List<List<FeatureRow>> expected =
-        List.of(
+        ImmutableList.of(
             Lists.newArrayList(
                 FeatureRow.newBuilder()
                     .setEventTimestamp(Timestamp.newBuilder().setSeconds(100))
@@ -220,7 +221,8 @@ public void shouldReturnResponseWithUnsetValuesIfKeysNotPresent() {
                     .build()));
 
     List<List<FeatureRow>> actual =
-        redisClusterOnlineRetriever.getOnlineFeatures(entityRows, List.of(featureSetRequest));
+        redisClusterOnlineRetriever.getOnlineFeatures(
+            entityRows, ImmutableList.of(featureSetRequest));
     assertThat(actual, equalTo(expected));
   }