[flink-statefun] branch master updated: [hotfix] Use JDK 8 Optional instead of shaded Optional class from Guava.

[ig...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

igal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git


The following commit(s) were added to refs/heads/master by this push:
     new d1e750c  [hotfix] Use JDK 8 Optional instead of shaded Optional class from Guava.
d1e750c is described below

commit d1e750cf35dfbf76eb9c582b4a0b8952152fd692
Author: neoXfire <ta...@outlook.fr>
AuthorDate: Tue Oct 12 19:22:02 2021 +0200

    [hotfix] Use JDK 8 Optional instead of shaded Optional class from Guava.
    
    This closes #275
---
 .../statefun/flink/datastream/StatefulFunctionDataStreamBuilder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/statefun-flink/statefun-flink-datastream/src/main/java/org/apache/flink/statefun/flink/datastream/StatefulFunctionDataStreamBuilder.java b/statefun-flink/statefun-flink-datastream/src/main/java/org/apache/flink/statefun/flink/datastream/StatefulFunctionDataStreamBuilder.java
index b61a89d..cb62ec0 100644
--- a/statefun-flink/statefun-flink-datastream/src/main/java/org/apache/flink/statefun/flink/datastream/StatefulFunctionDataStreamBuilder.java
+++ b/statefun-flink/statefun-flink-datastream/src/main/java/org/apache/flink/statefun/flink/datastream/StatefulFunctionDataStreamBuilder.java
@@ -24,10 +24,10 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
-import org.apache.flink.shaded.guava18.com.google.common.base.Optional;
 import org.apache.flink.statefun.flink.core.StatefulFunctionsConfig;
 import org.apache.flink.statefun.flink.core.feedback.FeedbackKey;
 import org.apache.flink.statefun.flink.core.httpfn.HttpFunctionEndpointSpec;
@@ -144,7 +144,8 @@ public final class StatefulFunctionDataStreamBuilder {
    */
   public StatefulFunctionEgressStreams build(StreamExecutionEnvironment env) {
     final StatefulFunctionsConfig config =
-        Optional.fromNullable(this.config).or(() -> StatefulFunctionsConfig.fromEnvironment(env));
+        Optional.ofNullable(this.config)
+            .orElseGet(() -> StatefulFunctionsConfig.fromEnvironment(env));
 
     requestReplyFunctions.forEach(
         (type, spec) -> functionProviders.put(type, new SerializableHttpFunctionProvider(spec)));