Merge pull request #23601 from karthikravis/fold-errors

Move ErrorDetails from ::grpc_impl to ::grpc

BUILD

@@ -408,7 +408,6 @@ grpc_cc_library(
     hdrs = [
         "include/grpc++/support/error_details.h",
         "include/grpcpp/support/error_details.h",
-        "include/grpcpp/support/error_details_impl.h",
     ],
     language = "c++",
     standalone = True,

CMakeLists.txt

@@ -2990,7 +2990,6 @@ target_link_libraries(grpc++_error_details
 foreach(_hdr
   include/grpc++/support/error_details.h
   include/grpcpp/support/error_details.h
-  include/grpcpp/support/error_details_impl.h
 )
   string(REPLACE "include/" "" _path ${_hdr})
   get_filename_component(_path ${_path} PATH)

Makefile

@@ -5121,7 +5121,6 @@ LIBGRPC++_ERROR_DETAILS_SRC = \
 PUBLIC_HEADERS_CXX += \
     include/grpc++/support/error_details.h \
     include/grpcpp/support/error_details.h \
-    include/grpcpp/support/error_details_impl.h \
 
 LIBGRPC++_ERROR_DETAILS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_ERROR_DETAILS_SRC))))
 

include/grpcpp/support/error_details.h

@@ -19,7 +19,7 @@
 #ifndef GRPCPP_SUPPORT_ERROR_DETAILS_H
 #define GRPCPP_SUPPORT_ERROR_DETAILS_H
 
-#include <grpcpp/support/error_details_impl.h>
+#include <grpcpp/support/status.h>
 
 namespace google {
 namespace rpc {
@@ -29,15 +29,19 @@ class Status;
 
 namespace grpc {
 
-static inline Status ExtractErrorDetails(const Status& from,
-                                         ::google::rpc::Status* to) {
-  return ::grpc_impl::ExtractErrorDetails(from, to);
-}
-
-static inline Status SetErrorDetails(const ::google::rpc::Status& from,
-                                     Status* to) {
-  return ::grpc_impl::SetErrorDetails(from, to);
-}
+/// Map a \a grpc::Status to a \a google::rpc::Status.
+/// The given \a to object will be cleared.
+/// On success, returns status with OK.
+/// Returns status with \a INVALID_ARGUMENT, if failed to deserialize.
+/// Returns status with \a FAILED_PRECONDITION, if \a to is nullptr.
+grpc::Status ExtractErrorDetails(const grpc::Status& from,
+                                 ::google::rpc::Status* to);
+
+/// Map \a google::rpc::Status to a \a grpc::Status.
+/// Returns OK on success.
+/// Returns status with \a FAILED_PRECONDITION if \a to is nullptr.
+grpc::Status SetErrorDetails(const ::google::rpc::Status& from,
+                             grpc::Status* to);
 
 }  // namespace grpc
 

src/cpp/util/error_details.cc

@@ -20,7 +20,7 @@
 
 #include "src/proto/grpc/status/status.pb.h"
 
-namespace grpc_impl {
+namespace grpc {
 
 grpc::Status ExtractErrorDetails(const grpc::Status& from,
                                  ::google::rpc::Status* to) {
@@ -47,4 +47,4 @@ grpc::Status SetErrorDetails(const ::google::rpc::Status& from,
   return grpc::Status::OK;
 }
 
-}  // namespace grpc_impl
+}  // namespace grpc