fix merge conflict

Signed-off-by: Keran Yang <[email protected]>
numaproj · Feb 15, 2024 · 8cc3eff · 8cc3eff
1 parent a85201e
commit 8cc3eff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/io/numaproj/numaflow/sessionreducer/Constants.java b/src/main/java/io/numaproj/numaflow/sessionreducer/Constants.java
@@ -5,6 +5,8 @@ class Constants {
 
     public static final String DEFAULT_SOCKET_PATH = "/var/run/numaflow/sessionreduce.sock";
 
+    public static final String DEFAULT_SERVER_INFO_FILE_PATH = "/var/run/numaflow/sessionreducer-server-info";
+
     public static final String EOF = "EOF";
 
     public static final String SUCCESS = "SUCCESS";

diff --git a/src/main/java/io/numaproj/numaflow/sessionreducer/GRPCConfig.java b/src/main/java/io/numaproj/numaflow/sessionreducer/GRPCConfig.java
@@ -1,6 +1,5 @@
 package io.numaproj.numaflow.sessionreducer;
 
-import io.numaproj.numaflow.info.ServerInfoAccessor;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -19,7 +18,7 @@ public class GRPCConfig {
      */
     static GRPCConfig defaultGrpcConfig() {
         return GRPCConfig.newBuilder()
-                .infoFilePath(ServerInfoAccessor.DEFAULT_SERVER_INFO_FILE_PATH)
+                .infoFilePath(Constants.DEFAULT_SERVER_INFO_FILE_PATH)
                 .maxMessageSize(Constants.DEFAULT_MESSAGE_SIZE)
                 .socketPath(Constants.DEFAULT_SOCKET_PATH).build();
     }

diff --git a/src/test/java/io/numaproj/numaflow/sessionreducer/GRPCConfigTest.java b/src/test/java/io/numaproj/numaflow/sessionreducer/GRPCConfigTest.java
@@ -1,6 +1,5 @@
 package io.numaproj.numaflow.sessionreducer;
 
-import io.numaproj.numaflow.info.ServerInfoAccessor;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -11,7 +10,7 @@ public void testDefaultGrpcConfig() {
         GRPCConfig grpcConfig = GRPCConfig.defaultGrpcConfig();
         Assert.assertNotNull(grpcConfig);
         Assert.assertEquals(
-                ServerInfoAccessor.DEFAULT_SERVER_INFO_FILE_PATH,
+                Constants.DEFAULT_SERVER_INFO_FILE_PATH,
                 grpcConfig.getInfoFilePath());
         Assert.assertEquals(
                 Constants.DEFAULT_MESSAGE_SIZE,