Move status util

5 files changed, 3 insertions, 161 deletions

diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 90b93fbe23..09cc06e169 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -38,12 +38,12 @@
 #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
 #include "src/core/ext/filters/client_channel/resolver_registry.h"
 #include "src/core/ext/filters/client_channel/retry_throttle.h"
-#include "src/core/ext/filters/client_channel/status_util.h"
 #include "src/core/ext/filters/client_channel/subchannel.h"
 #include "src/core/ext/filters/deadline/deadline_filter.h"
 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/connected_channel.h"
+#include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/inlined_vector.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
diff --git a/src/core/ext/filters/client_channel/method_params.cc b/src/core/ext/filters/client_channel/method_params.cc
index 374b87e170..1f116bb67d 100644
--- a/src/core/ext/filters/client_channel/method_params.cc
+++ b/src/core/ext/filters/client_channel/method_params.cc
@@ -26,7 +26,7 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/ext/filters/client_channel/method_params.h"
-#include "src/core/ext/filters/client_channel/status_util.h"
+#include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/memory.h"
 
diff --git a/src/core/ext/filters/client_channel/method_params.h b/src/core/ext/filters/client_channel/method_params.h
index 48ece29867..099924edf3 100644
--- a/src/core/ext/filters/client_channel/method_params.h
+++ b/src/core/ext/filters/client_channel/method_params.h
@@ -21,7 +21,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/status_util.h"
+#include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"  // for grpc_millis
diff --git a/src/core/ext/filters/client_channel/status_util.cc b/src/core/ext/filters/client_channel/status_util.cc
deleted file mode 100644
index 11f732ab44..0000000000
--- a/src/core/ext/filters/client_channel/status_util.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/filters/client_channel/status_util.h"
-
-#include "src/core/lib/gpr/useful.h"
-
-typedef struct {
-  const char* str;
-  grpc_status_code status;
-} status_string_entry;
-
-static const status_string_entry g_status_string_entries[] = {
-    {"OK", GRPC_STATUS_OK},
-    {"CANCELLED", GRPC_STATUS_CANCELLED},
-    {"UNKNOWN", GRPC_STATUS_UNKNOWN},
-    {"INVALID_ARGUMENT", GRPC_STATUS_INVALID_ARGUMENT},
-    {"DEADLINE_EXCEEDED", GRPC_STATUS_DEADLINE_EXCEEDED},
-    {"NOT_FOUND", GRPC_STATUS_NOT_FOUND},
-    {"ALREADY_EXISTS", GRPC_STATUS_ALREADY_EXISTS},
-    {"PERMISSION_DENIED", GRPC_STATUS_PERMISSION_DENIED},
-    {"UNAUTHENTICATED", GRPC_STATUS_UNAUTHENTICATED},
-    {"RESOURCE_EXHAUSTED", GRPC_STATUS_RESOURCE_EXHAUSTED},
-    {"FAILED_PRECONDITION", GRPC_STATUS_FAILED_PRECONDITION},
-    {"ABORTED", GRPC_STATUS_ABORTED},
-    {"OUT_OF_RANGE", GRPC_STATUS_OUT_OF_RANGE},
-    {"UNIMPLEMENTED", GRPC_STATUS_UNIMPLEMENTED},
-    {"INTERNAL", GRPC_STATUS_INTERNAL},
-    {"UNAVAILABLE", GRPC_STATUS_UNAVAILABLE},
-    {"DATA_LOSS", GRPC_STATUS_DATA_LOSS},
-};
-
-bool grpc_status_code_from_string(const char* status_str,
-                                  grpc_status_code* status) {
-  for (size_t i = 0; i < GPR_ARRAY_SIZE(g_status_string_entries); ++i) {
-    if (strcmp(status_str, g_status_string_entries[i].str) == 0) {
-      *status = g_status_string_entries[i].status;
-      return true;
-    }
-  }
-  return false;
-}
-
-const char* grpc_status_code_to_string(grpc_status_code status) {
-  switch (status) {
-    case GRPC_STATUS_OK:
-      return "OK";
-    case GRPC_STATUS_CANCELLED:
-      return "CANCELLED";
-    case GRPC_STATUS_UNKNOWN:
-      return "UNKNOWN";
-    case GRPC_STATUS_INVALID_ARGUMENT:
-      return "INVALID_ARGUMENT";
-    case GRPC_STATUS_DEADLINE_EXCEEDED:
-      return "DEADLINE_EXCEEDED";
-    case GRPC_STATUS_NOT_FOUND:
-      return "NOT_FOUND";
-    case GRPC_STATUS_ALREADY_EXISTS:
-      return "ALREADY_EXISTS";
-    case GRPC_STATUS_PERMISSION_DENIED:
-      return "PERMISSION_DENIED";
-    case GRPC_STATUS_UNAUTHENTICATED:
-      return "UNAUTHENTICATED";
-    case GRPC_STATUS_RESOURCE_EXHAUSTED:
-      return "RESOURCE_EXHAUSTED";
-    case GRPC_STATUS_FAILED_PRECONDITION:
-      return "FAILED_PRECONDITION";
-    case GRPC_STATUS_ABORTED:
-      return "ABORTED";
-    case GRPC_STATUS_OUT_OF_RANGE:
-      return "OUT_OF_RANGE";
-    case GRPC_STATUS_UNIMPLEMENTED:
-      return "UNIMPLEMENTED";
-    case GRPC_STATUS_INTERNAL:
-      return "INTERNAL";
-    case GRPC_STATUS_UNAVAILABLE:
-      return "UNAVAILABLE";
-    case GRPC_STATUS_DATA_LOSS:
-      return "DATA_LOSS";
-    default:
-      return "UNKNOWN";
-  }
-}
diff --git a/src/core/ext/filters/client_channel/status_util.h b/src/core/ext/filters/client_channel/status_util.h
deleted file mode 100644
index e018709730..0000000000
--- a/src/core/ext/filters/client_channel/status_util.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_STATUS_UTIL_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_STATUS_UTIL_H
-
-#include <grpc/support/port_platform.h>
-
-#include <grpc/status.h>
-
-#include <stdbool.h>
-#include <string.h>
-
-/// If \a status_str is a valid status string, sets \a status to the
-/// corresponding status value and returns true.
-bool grpc_status_code_from_string(const char* status_str,
-                                  grpc_status_code* status);
-
-/// Returns the string form of \a status, or "UNKNOWN" if invalid.
-const char* grpc_status_code_to_string(grpc_status_code status);
-
-namespace grpc_core {
-namespace internal {
-
-/// A set of grpc_status_code values.
-class StatusCodeSet {
- public:
-  bool Empty() const { return status_code_mask_ == 0; }
-
-  void Add(grpc_status_code status) { status_code_mask_ |= (1 << status); }
-
-  bool Contains(grpc_status_code status) const {
-    return status_code_mask_ & (1 << status);
-  }
-
- private:
-  int status_code_mask_ = 0;  // A bitfield of status codes in the set.
-};
-
-}  // namespace internal
-}  // namespace grpc_core
-
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_STATUS_UTIL_H */