core: move the builders to the respective class and mark the constructors protected

Author: tharakadesilva

api/src/main/java/io/grpc/InternalStatus.java

@@ -44,7 +44,7 @@ private InternalStatus() {}
   @Internal
   public static final StatusRuntimeException asRuntimeException(Status status,
       @Nullable Metadata trailers, boolean fillInStackTrace) {
-    return new StatusRuntimeExceptionBuilder()
+    return new StatusRuntimeException.Builder()
         .setStatus(status)
         .setTrailers(trailers)
         .setFillInStackTrace(fillInStackTrace)

api/src/main/java/io/grpc/Status.java

@@ -522,30 +522,30 @@ public boolean isOk() {
    * to recover this {@link Status} instance when the returned exception is in the causal chain.
    */
   public StatusRuntimeException asRuntimeException() {
-    return new StatusRuntimeExceptionBuilder().setStatus(this).build();
+    return new StatusRuntimeException.Builder().setStatus(this).build();
   }
 
   /**
    * Same as {@link #asRuntimeException()} but includes the provided trailers in the returned
    * exception.
    */
   public StatusRuntimeException asRuntimeException(@Nullable Metadata trailers) {
-    return new StatusRuntimeExceptionBuilder().setStatus(this).setTrailers(trailers).build();
+    return new StatusRuntimeException.Builder().setStatus(this).setTrailers(trailers).build();
   }
 
   /**
    * Convert this {@link Status} to an {@link Exception}. Use {@link #fromThrowable}
    * to recover this {@link Status} instance when the returned exception is in the causal chain.
    */
   public StatusException asException() {
-    return new StatusExceptionBuilder().setStatus(this).build();
+    return new StatusException.Builder().setStatus(this).build();
   }
 
   /**
    * Same as {@link #asException()} but includes the provided trailers in the returned exception.
    */
   public StatusException asException(@Nullable Metadata trailers) {
-    return new StatusExceptionBuilder().setStatus(this).setTrailers(trailers).build();
+    return new StatusException.Builder().setStatus(this).setTrailers(trailers).build();
   }
 
   /** A string representation of the status useful for debugging. */

api/src/main/java/io/grpc/StatusException.java

@@ -35,7 +35,7 @@ public class StatusException extends Exception {
    *
    * @since 1.0.0
    */
-  StatusException(Status status, @Nullable Metadata trailers, boolean fillInStackTrace) {
+  protected StatusException(Status status, @Nullable Metadata trailers, boolean fillInStackTrace) {
     super(Status.formatThrowableMessage(status), status.getCause());
     this.status = status;
     this.trailers = trailers;
@@ -69,4 +69,57 @@ public final Status getStatus() {
   public final Metadata getTrailers() {
     return trailers;
   }
+
+  /**
+   * Builder for creating a {@link StatusException}.
+   *
+   * @since 1.62.0
+   */
+  public static class Builder {
+    private Status status;
+    private Metadata trailers = null;
+    private boolean fillInStackTrace = true;
+
+    /**
+     * Sets the status.
+     *
+     * @since 1.62.0
+     */
+    public Builder setStatus(final Status status) {
+      this.status = status;
+      return this;
+    }
+
+    /**
+     * Sets the trailers.
+     *
+     * @since 1.62.0
+     */
+    public Builder setTrailers(final Metadata trailers) {
+      this.trailers = trailers;
+      return this;
+    }
+
+    /**
+     * Sets whether to fill in the stack trace.
+     *
+     * @since 1.62.0
+     */
+    public Builder setFillInStackTrace(final boolean fillInStackTrace) {
+      this.fillInStackTrace = fillInStackTrace;
+      return this;
+    }
+
+    /**
+     * Builds the exception.
+     *
+     * @since 1.62.0
+     */
+    public StatusException build() {
+      final StatusException statusException =
+          new StatusException(status, trailers, fillInStackTrace);
+      statusException.fillInStackTrace();
+      return statusException;
+    }
+  }
 }

api/src/main/java/io/grpc/StatusExceptionBuilder.java

@@ -37,7 +37,8 @@ public class StatusRuntimeException extends RuntimeException {
    *
    * @since 1.0.0
    */
-  StatusRuntimeException(Status status, @Nullable Metadata trailers, boolean fillInStackTrace) {
+  protected StatusRuntimeException(Status status, @Nullable Metadata trailers,
+                                   boolean fillInStackTrace) {
     super(Status.formatThrowableMessage(status), status.getCause());
     this.status = status;
     this.trailers = trailers;
@@ -72,4 +73,57 @@ public final Status getStatus() {
   public final Metadata getTrailers() {
     return trailers;
   }
+
+  /**
+   * Builder for creating a {@link StatusRuntimeException}.
+   *
+   * @since 1.62.0
+   */
+  public static class Builder {
+    private Status status;
+    private Metadata trailers = null;
+    private boolean fillInStackTrace = true;
+
+    /**
+     * Sets the status.
+     *
+     * @since 1.62.0
+     */
+    public Builder setStatus(final Status status) {
+      this.status = status;
+      return this;
+    }
+
+    /**
+     * Sets the trailers.
+     *
+     * @since 1.62.0
+     */
+    public Builder setTrailers(final Metadata trailers) {
+      this.trailers = trailers;
+      return this;
+    }
+
+    /**
+     * Sets whether to fill in the stack trace.
+     *
+     * @since 1.62.0
+     */
+    public Builder setFillInStackTrace(final boolean fillInStackTrace) {
+      this.fillInStackTrace = fillInStackTrace;
+      return this;
+    }
+
+    /**
+     * Builds the exception.
+     *
+     * @since 1.62.0
+     */
+    public StatusRuntimeException build() {
+      final StatusRuntimeException statusRuntimeException =
+          new StatusRuntimeException(status, trailers, fillInStackTrace);
+      statusRuntimeException.fillInStackTrace();
+      return statusRuntimeException;
+    }
+  }
 }

api/src/main/java/io/grpc/StatusRuntimeException.java

@@ -31,7 +31,7 @@ public class StatusExceptionTest {
   @Test
   public void internalCtorRemovesStack() {
     StackTraceElement[] trace =
-        new StatusExceptionBuilder().setStatus(Status.CANCELLED).setTrailers(null)
+        new StatusException.Builder().setStatus(Status.CANCELLED).setTrailers(null)
             .setFillInStackTrace(false).build().getStackTrace();
 
     assertThat(trace).isEmpty();
@@ -40,7 +40,7 @@ public void internalCtorRemovesStack() {
   @Test
   public void normalCtorKeepsStack() {
     StackTraceElement[] trace =
-        new StatusExceptionBuilder().setStatus(Status.CANCELLED).setTrailers(null)
+        new StatusException.Builder().setStatus(Status.CANCELLED).setTrailers(null)
             .build().getStackTrace();
 
     assertThat(trace).isNotEmpty();
@@ -49,7 +49,7 @@ public void normalCtorKeepsStack() {
   @Test
   public void extendPreservesStack() {
     StackTraceElement[] trace =
-        new StatusExceptionBuilder().setStatus(Status.CANCELLED).build().getStackTrace();
+        new StatusException.Builder().setStatus(Status.CANCELLED).build().getStackTrace();
 
     assertThat(trace).isNotEmpty();
   }

api/src/main/java/io/grpc/StatusRuntimeExceptionBuilder.java

@@ -31,7 +31,7 @@ public class StatusRuntimeExceptionTest {
   @Test
   public void internalCtorRemovesStack() {
     StackTraceElement[] trace =
-        new StatusRuntimeExceptionBuilder().setStatus(Status.CANCELLED).setTrailers(null)
+        new StatusRuntimeException.Builder().setStatus(Status.CANCELLED).setTrailers(null)
             .setFillInStackTrace(false).build().getStackTrace();
 
     assertThat(trace).isEmpty();
@@ -40,7 +40,7 @@ public void internalCtorRemovesStack() {
   @Test
   public void normalCtorKeepsStack() {
     StackTraceElement[] trace =
-        new StatusRuntimeExceptionBuilder().setStatus(Status.CANCELLED).setTrailers(null)
+        new StatusRuntimeException.Builder().setStatus(Status.CANCELLED).setTrailers(null)
             .build().getStackTrace();
 
     assertThat(trace).isNotEmpty();
@@ -49,7 +49,7 @@ public void normalCtorKeepsStack() {
   @Test
   public void extendPreservesStack() {
     StackTraceElement[] trace =
-        new StatusRuntimeExceptionBuilder().setStatus(Status.CANCELLED).build().getStackTrace();
+        new StatusRuntimeException.Builder().setStatus(Status.CANCELLED).build().getStackTrace();
 
     assertThat(trace).isNotEmpty();
   }

api/src/test/java/io/grpc/StatusExceptionTest.java

@@ -34,7 +34,7 @@
 import io.grpc.InternalStatus;
 import io.grpc.Metadata;
 import io.grpc.Status;
-import io.grpc.StatusRuntimeExceptionBuilder;
+import io.grpc.StatusRuntimeException;
 import io.grpc.internal.AbstractServerStream.TransportState;
 import io.grpc.internal.MessageFramerTest.ByteWritableBuffer;
 import java.io.ByteArrayInputStream;
@@ -127,7 +127,7 @@ public void messagesAvailable(StreamListener.MessageProducer producer) {
       @Override
       public void halfClosed() {
         if (streamListenerMessageQueue.isEmpty()) {
-          throw new StatusRuntimeExceptionBuilder().setStatus(Status.INTERNAL.withDescription(
+          throw new StatusRuntimeException.Builder().setStatus(Status.INTERNAL.withDescription(
               "Half close without request")).build();
         }
       }