feast-dev
diff --git a/‎java/serving-client/src/main/java/dev/feast/FeastClient.java‎
Lines changed: 37 additions & 4 deletions b/‎java/serving-client/src/main/java/dev/feast/FeastClient.java‎
Lines changed: 37 additions & 4 deletions
diff --git a/‎java/serving-client/src/test/java/dev/feast/FeastClientTest.java‎
Lines changed: 2 additions & 1 deletion b/‎java/serving-client/src/test/java/dev/feast/FeastClientTest.java‎
Lines changed: 2 additions & 1 deletion
@@ -58,20 +58,47 @@ public class FeastClient implements AutoCloseable {
    * @param port port number of Feast serving GRPC server
    * @return {@link FeastClient}
    */
+  public static FeastClient create(String host, int port) {
+    // configure client with no security config.
+    return FeastClient.createSecure(host, port, SecurityConfig.newBuilder().build());
+  }
+
+  /**
+   * Create a client to access Feast Serving.
+   *
+   * @param host hostname or ip address of Feast serving GRPC server
+   * @param port port number of Feast serving GRPC server
+   * @param deadline GRPC deadline of Feast serving GRPC server {@link Deadline}
+   * @return {@link FeastClient}
+   */
   public static FeastClient create(String host, int port, Deadline deadline) {
     // configure client with no security config.
     return FeastClient.createSecure(host, port, SecurityConfig.newBuilder().build(), deadline);
   }
 
   /**
-   * Create a authenticated client that can access Feast serving with authentication enabled.
+   * Create an authenticated client that can access Feast serving with authentication enabled.
    *
    * @param host hostname or ip address of Feast serving GRPC server
    * @param port port number of Feast serving GRPC server
    * @param securityConfig security options to configure the Feast client. See {@link
    *     SecurityConfig} for options.
    * @return {@link FeastClient}
    */
+  public static FeastClient createSecure(String host, int port, SecurityConfig securityConfig) {
+    return createSecure(host, port, securityConfig, null);
+  }
+
+  /**
+   * Create an authenticated client that can access Feast serving with authentication enabled.
+   *
+   * @param host hostname or ip address of Feast serving GRPC server
+   * @param port port number of Feast serving GRPC server
+   * @param securityConfig security options to configure the Feast client. See {@link
+   *     SecurityConfig} for options.
+   * @param deadline GRPC deadline of Feast serving GRPC server {@link Deadline}
+   * @return {@link FeastClient}
+   */
   public static FeastClient createSecure(String host, int port, SecurityConfig securityConfig, Deadline deadline) {
     // Configure client TLS
     ManagedChannel channel = null;
@@ -99,7 +126,7 @@ public static FeastClient createSecure(String host, int port, SecurityConfig sec
       channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext().build();
     }
 
-    return new FeastClient(channel, securityConfig.getCredentials(), deadline);
+    return new FeastClient(channel, securityConfig.getCredentials(), Optional.ofNullable(deadline));
   }
 
   /**
@@ -202,7 +229,11 @@ public List<Row> getOnlineFeatures(List<String> featureRefs, List<Row> rows, Str
     return getOnlineFeatures(featureRefs, rows);
   }
 
-  protected FeastClient(ManagedChannel channel, Optional<CallCredentials> credentials, Deadline deadline) {
+  protected FeastClient(ManagedChannel channel, Optional<CallCredentials> credentials) {
+    this(channel, credentials, Optional.empty());
+  }
+
+  protected FeastClient(ManagedChannel channel, Optional<CallCredentials> credentials, Optional<Deadline> deadline) {
     this.channel = channel;
     TracingClientInterceptor tracingInterceptor =
         TracingClientInterceptor.newBuilder().withTracer(GlobalTracer.get()).build();
@@ -214,7 +245,9 @@ protected FeastClient(ManagedChannel channel, Optional<CallCredentials> credenti
       servingStub = servingStub.withCallCredentials(credentials.get());
     }
 
-    servingStub = servingStub.withDeadline(deadline);
+    if (deadline.isPresent()) {
+      servingStub = servingStub.withDeadline(deadline.get());
+    }
 
     this.stub = servingStub;
   }
 
@@ -46,6 +46,7 @@
 
 public class FeastClientTest {
   private final String AUTH_TOKEN = "test token";
+  private final Deadline DEADLINE = Deadline.after(200, TimeUnit.MILLISECONDS);
 
   @Rule public GrpcCleanupRule grpcRule;
   private AtomicBoolean isAuthenticated;
@@ -87,7 +88,7 @@ public void setup() throws Exception {
     ManagedChannel channel =
         this.grpcRule.register(
             InProcessChannelBuilder.forName(serverName).directExecutor().build());
-    this.client = new FeastClient(channel, Optional.empty(), Deadline.after(200, TimeUnit.MILLISECONDS));
+    this.client = new FeastClient(channel, Optional.empty(), Optional.of(DEADLINE));
   }
 
   @Test