all: add Status messages to all statuses

3 files changed, 15 insertions, 10 deletions

diff --git a/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java b/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java
index e689b6e99..eb986f833 100644
--- a/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java
+++ b/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java
@@ -188,7 +188,10 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
             listServices(request);
             break;
           default:
-            sendErrorResponse(request, Status.UNIMPLEMENTED, "");
+            sendErrorResponse(
+                request,
+                Status.Code.UNIMPLEMENTED,
+                "not implemented " + request.getMessageRequestCase());
         }
         request = null;
         if (closeAfterSend) {
@@ -219,7 +222,7 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
       if (fd != null) {
         serverCallStreamObserver.onNext(createServerReflectionResponse(request, fd));
       } else {
-        sendErrorResponse(request, Status.NOT_FOUND, "File not found.");
+        sendErrorResponse(request, Status.Code.NOT_FOUND, "File not found.");
       }
     }
 
@@ -229,7 +232,7 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
       if (fd != null) {
         serverCallStreamObserver.onNext(createServerReflectionResponse(request, fd));
       } else {
-        sendErrorResponse(request, Status.NOT_FOUND, "Symbol not found.");
+        sendErrorResponse(request, Status.Code.NOT_FOUND, "Symbol not found.");
       }
     }
 
@@ -242,7 +245,7 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
       if (fd != null) {
         serverCallStreamObserver.onNext(createServerReflectionResponse(request, fd));
       } else {
-        sendErrorResponse(request, Status.NOT_FOUND, "Extension not found.");
+        sendErrorResponse(request, Status.Code.NOT_FOUND, "Extension not found.");
       }
     }
 
@@ -261,7 +264,7 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
                 .setAllExtensionNumbersResponse(builder)
                 .build());
       } else {
-        sendErrorResponse(request, Status.NOT_FOUND, "Type not found.");
+        sendErrorResponse(request, Status.Code.NOT_FOUND, "Type not found.");
       }
     }
 
@@ -278,14 +281,15 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
               .build());
     }
 
-    private void sendErrorResponse(ServerReflectionRequest request, Status status, String message) {
+    private void sendErrorResponse(
+        ServerReflectionRequest request, Status.Code code, String message) {
       ServerReflectionResponse response =
           ServerReflectionResponse.newBuilder()
               .setValidHost(request.getHost())
               .setOriginalRequest(request)
               .setErrorResponse(
                   ErrorResponse.newBuilder()
-                      .setErrorCode(status.getCode().value())
+                      .setErrorCode(code.value())
                       .setErrorMessage(message))
               .build();
       serverCallStreamObserver.onNext(response);
diff --git a/services/src/main/java/io/grpc/services/HealthServiceImpl.java b/services/src/main/java/io/grpc/services/HealthServiceImpl.java
index 5b4f3d23a..429a541e8 100644
--- a/services/src/main/java/io/grpc/services/HealthServiceImpl.java
+++ b/services/src/main/java/io/grpc/services/HealthServiceImpl.java
@@ -41,7 +41,8 @@ final class HealthServiceImpl extends HealthGrpc.HealthImplBase {
       StreamObserver<HealthCheckResponse> responseObserver) {
     ServingStatus status = getStatus(request.getService());
     if (status == null) {
-      responseObserver.onError(new StatusException(Status.NOT_FOUND));
+      responseObserver.onError(new StatusException(
+          Status.NOT_FOUND.withDescription("unknown service " + request.getService())));
     } else {
       HealthCheckResponse response = HealthCheckResponse.newBuilder().setStatus(status).build();
       responseObserver.onNext(response);
diff --git a/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java b/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java
index 5f180b067..d1a3fd97c 100644
--- a/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java
+++ b/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java
@@ -86,7 +86,7 @@ public class HealthStatusManagerTest {
     //verify
     ArgumentCaptor<StatusException> exception = ArgumentCaptor.forClass(StatusException.class);
     verify(observer, times(1)).onError(exception.capture());
-    assertEquals(Status.NOT_FOUND, exception.getValue().getStatus());
+    assertEquals(Status.Code.NOT_FOUND, exception.getValue().getStatus().getCode());
 
     verify(observer, never()).onCompleted();
   }
@@ -107,7 +107,7 @@ public class HealthStatusManagerTest {
     //verify
     ArgumentCaptor<StatusException> exception = ArgumentCaptor.forClass(StatusException.class);
     verify(observer, times(1)).onError(exception.capture());
-    assertEquals(Status.NOT_FOUND, exception.getValue().getStatus());
+    assertEquals(Status.Code.NOT_FOUND, exception.getValue().getStatus().getCode());
 
     verify(observer, never()).onCompleted();
   }