resolving conflicts

Signed-off-by: Yashash H L <[email protected]>
numaproj · Apr 15, 2024 · ab36cea · ab36cea
1 parent a19d240
commit ab36cea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...ain/java/io/numaproj/numaflow/examples/mapstream/flatmapstream/FlatMapStreamFunction.java b/...ain/java/io/numaproj/numaflow/examples/mapstream/flatmapstream/FlatMapStreamFunction.java
@@ -1,10 +1,6 @@
 package io.numaproj.numaflow.examples.mapstream.flatmapstream;
 
-import io.numaproj.numaflow.mapstreamer.Datum;
-import io.numaproj.numaflow.mapstreamer.MapStreamer;
-import io.numaproj.numaflow.mapstreamer.Message;
-import io.numaproj.numaflow.mapstreamer.OutputObserver;
-import io.numaproj.numaflow.mapstreamer.Server;
+import io.numaproj.numaflow.mapstreamer.*;
 
 
 /**

diff --git a/examples/src/test/java/io/numaproj/numaflow/examples/server/ServerTest.java b/examples/src/test/java/io/numaproj/numaflow/examples/server/ServerTest.java
@@ -15,13 +15,13 @@
 import io.numaproj.numaflow.sinker.ResponseList;
 import io.numaproj.numaflow.sinker.SinkerTestKit;
 import io.numaproj.numaflow.sourcer.SourcerTestKit;
+import io.numaproj.numaflow.sourcetransformer.SourceTransformerTestKit;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
-import io.numaproj.numaflow.sourcetransformer.SourceTransformerTestKit;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -253,7 +253,9 @@ public void testSourceTransformerServerInvocation() {
                 .eventTime(Instant.ofEpochMilli(1640995200000L))
                 .value("test".getBytes())
                 .build();
-        io.numaproj.numaflow.sourcetransformer.MessageList result = client.sendRequest(new String[]{}, datum);
+        io.numaproj.numaflow.sourcetransformer.MessageList result = client.sendRequest(
+                new String[]{},
+                datum);
 
         List<io.numaproj.numaflow.sourcetransformer.Message> messages = result.getMessages();
         Assertions.assertEquals(1, messages.size());