1 files changed, 16 insertions, 55 deletions

diff --git a/src/google/protobuf/util/type_resolver_util.cc b/src/google/protobuf/util/type_resolver_util.cc
index 908634eb..a0996954 100644
--- a/src/google/protobuf/util/type_resolver_util.cc
+++ b/src/google/protobuf/util/type_resolver_util.cc
@@ -34,6 +34,7 @@
 #include <google/protobuf/wrappers.pb.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/util/internal/utility.h>
 #include <google/protobuf/util/type_resolver.h>
 #include <google/protobuf/stubs/strutil.h>
 #include <google/protobuf/stubs/status.h>
@@ -53,8 +54,7 @@ using util::Status;
 using util::error::INVALID_ARGUMENT;
 using util::error::NOT_FOUND;
 
-bool SplitTypeUrl(const string& type_url,
-                  string* url_prefix,
+bool SplitTypeUrl(const string& type_url, string* url_prefix,
                   string* message_name) {
   size_t pos = type_url.find_last_of("/");
   if (pos == string::npos) {
@@ -65,60 +65,19 @@ bool SplitTypeUrl(const string& type_url,
   return true;
 }
 
-// This code is originally defined in
-// //google/protobuf/util/converter/utility.h. Copied here due to component
-// dependency.
-// TODO(xiaofeng): Remove this when converter code is in components.
-string ToCamelCase(const StringPiece input) {
-  bool capitalize_next = false;
-  bool was_cap = true;
-  bool is_cap = false;
-  bool first_word = true;
-  string result;
-  result.reserve(input.size());
-
-  for (size_t i = 0; i < input.size(); ++i, was_cap = is_cap) {
-    is_cap = ascii_isupper(input[i]);
-    if (input[i] == '_') {
-      capitalize_next = true;
-      if (!result.empty()) first_word = false;
-      continue;
-    } else if (first_word) {
-      // Consider when the current character B is capitalized,
-      // first word ends when:
-      // 1) following a lowercase:   "...aB..."
-      // 2) followed by a lowercase: "...ABc..."
-      if (!result.empty() && is_cap &&
-          (!was_cap || (i + 1 < input.size() && ascii_islower(input[i + 1])))) {
-        first_word = false;
-      } else {
-        result.push_back(ascii_tolower(input[i]));
-        continue;
-      }
-    } else if (capitalize_next) {
-      capitalize_next = false;
-      if (ascii_islower(input[i])) {
-        result.push_back(ascii_toupper(input[i]));
-        continue;
-      }
-    }
-    result.push_back(input[i]);
-  }
-  return result;
-}
-
 class DescriptorPoolTypeResolver : public TypeResolver {
  public:
   DescriptorPoolTypeResolver(const string& url_prefix,
                              const DescriptorPool* pool)
-      : url_prefix_(url_prefix), pool_(pool) {
-  }
+      : url_prefix_(url_prefix), pool_(pool) {}
 
   Status ResolveMessageType(const string& type_url, Type* type) {
     string url_prefix, message_name;
     if (!SplitTypeUrl(type_url, &url_prefix, &message_name) ||
         url_prefix != url_prefix_) {
-      return Status(INVALID_ARGUMENT, "Failed to parse type url: " + type_url);
+      return Status(INVALID_ARGUMENT,
+                    StrCat("Invalid type URL, type URLs must be of the form '",
+                           url_prefix_, "/<typename>', got: ", type_url));
     }
     if (url_prefix != url_prefix_) {
       return Status(INVALID_ARGUMENT,
@@ -126,7 +85,8 @@ class DescriptorPoolTypeResolver : public TypeResolver {
     }
     const Descriptor* descriptor = pool_->FindMessageTypeByName(message_name);
     if (descriptor == NULL) {
-      return Status(NOT_FOUND, "Cannot found the type: " + message_name);
+      return Status(NOT_FOUND,
+                    "Invalid type URL, unknown type: " + message_name);
     }
     ConvertDescriptor(descriptor, type);
     return Status();
@@ -136,7 +96,9 @@ class DescriptorPoolTypeResolver : public TypeResolver {
     string url_prefix, type_name;
     if (!SplitTypeUrl(type_url, &url_prefix, &type_name) ||
         url_prefix != url_prefix_) {
-      return Status(INVALID_ARGUMENT, "Failed to parse type url: " + type_url);
+      return Status(INVALID_ARGUMENT,
+                    StrCat("Invalid type URL, type URLs must be of the form '",
+                           url_prefix_, "/<typename>', got: ", type_url));
     }
     if (url_prefix != url_prefix_) {
       return Status(INVALID_ARGUMENT,
@@ -144,7 +106,7 @@ class DescriptorPoolTypeResolver : public TypeResolver {
     }
     const EnumDescriptor* descriptor = pool_->FindEnumTypeByName(type_name);
     if (descriptor == NULL) {
-      return Status(NOT_FOUND, "Cannot found the type: " + type_name);
+      return Status(NOT_FOUND, "Invalid type URL, unknown type: " + type_name);
     }
     ConvertEnumDescriptor(descriptor, enum_type);
     return Status();
@@ -197,7 +159,7 @@ class DescriptorPoolTypeResolver : public TypeResolver {
     }
     field->set_number(descriptor->number());
     field->set_name(descriptor->name());
-    field->set_json_name(ToCamelCase(descriptor->name()));
+    field->set_json_name(converter::ToCamelCase(descriptor->name()));
     if (descriptor->type() == FieldDescriptor::TYPE_MESSAGE) {
       field->set_type_url(GetTypeUrl(descriptor->message_type()));
     } else if (descriptor->type() == FieldDescriptor::TYPE_ENUM) {
@@ -221,8 +183,7 @@ class DescriptorPoolTypeResolver : public TypeResolver {
         descriptor->file()->name());
     for (int i = 0; i < descriptor->value_count(); ++i) {
       const EnumValueDescriptor* value_descriptor = descriptor->value(i);
-      EnumValue* value =
-          enum_type->mutable_enumvalue()->Add();
+      EnumValue* value = enum_type->mutable_enumvalue()->Add();
       value->set_name(value_descriptor->name());
       value->set_number(value_descriptor->number());
 
@@ -245,8 +206,8 @@ class DescriptorPoolTypeResolver : public TypeResolver {
 
 }  // namespace
 
-TypeResolver* NewTypeResolverForDescriptorPool(
-    const string& url_prefix, const DescriptorPool* pool) {
+TypeResolver* NewTypeResolverForDescriptorPool(const string& url_prefix,
+                                               const DescriptorPool* pool) {
   return new DescriptorPoolTypeResolver(url_prefix, pool);
 }