Pull getUnqualifiedName into a static helper function

Change-Id: Iacef70723df560273fef94aacb85c7f6a4819bc3

Author: trollyxia

google-cloud-bigtable/clirr-ignored-differences.xml

@@ -355,6 +355,12 @@
         <className>com/google/cloud/bigtable/data/v2/models/sql/SqlType</className>
         <method>*enumOf(*)</method>
     </difference>
+    <difference>
+        <!-- InternalApi was added -->
+        <differenceType>7012</differenceType>
+        <className>com/google/cloud/bigtable/data/v2/models/sql/SqlType</className>
+        <method>*getUnqualifiedName*</method>
+    </difference>
     <difference>
         <!-- InternalApi was updated -->
         <differenceType>7004</differenceType>

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/sql/SqlType.java

@@ -272,6 +272,22 @@ static <T extends ProtocolMessageEnum> SqlType.Enum<T> enumOf(Function<Integer,
     return Type.Enum.create(method);
   }
 
+  /**
+   * Extracts the unqualified name from a fully qualified proto message or enum name. For example,
+   * "my.package.MyMessage" becomes "MyMessage".
+   *
+   * <p>This is considered an internal implementation detail and not meant to be used by
+   * applications.
+   */
+  @InternalApi
+  static String getUnqualifiedName(String fullName) {
+    if (fullName == null || fullName.isEmpty()) {
+      return "";
+    }
+    int lastDotIndex = fullName.lastIndexOf('.');
+    return (lastDotIndex == -1) ? fullName : fullName.substring(lastDotIndex + 1);
+  }
+
   /**
    * Creates a {@link SqlType} from the protobuf representation of Types.
    *
@@ -327,16 +343,6 @@ static SqlType<?> fromProto(com.google.bigtable.v2.Type proto) {
    */
   @InternalApi
   static boolean typesMatch(SqlType<?> left, SqlType<?> right) {
-    Function<String, String> getUnqualifiedMessageName =
-        fullMessageName -> {
-          if (fullMessageName == null || fullMessageName.isEmpty()) {
-            return "";
-          }
-          int lastDotIndex = fullMessageName.lastIndexOf('.');
-          return (lastDotIndex == -1)
-              ? fullMessageName
-              : fullMessageName.substring(lastDotIndex + 1);
-        };
     switch (left.getCode()) {
       case BYTES:
       case STRING:
@@ -359,9 +365,8 @@ static boolean typesMatch(SqlType<?> left, SqlType<?> right) {
             return left.equals(right);
           }
           // Compares mixed SchemalessProto and Proto
-          return getUnqualifiedMessageName
-              .apply(((SqlType.Proto) left).getMessageName())
-              .equals(getUnqualifiedMessageName.apply(((SqlType.Proto) right).getMessageName()));
+          return getUnqualifiedName(((SqlType.Proto) left).getMessageName())
+              .equals(getUnqualifiedName(((SqlType.Proto) right).getMessageName()));
         }
       case ENUM:
         {
@@ -375,9 +380,8 @@ static boolean typesMatch(SqlType<?> left, SqlType<?> right) {
             return left.equals(right);
           }
           // Compares mixed SchemalessEnum and Enum
-          return getUnqualifiedMessageName
-              .apply(((SqlType.Enum) left).getEnumName())
-              .equals(getUnqualifiedMessageName.apply(((SqlType.Enum) right).getEnumName()));
+          return getUnqualifiedName(((SqlType.Enum) left).getEnumName())
+              .equals(getUnqualifiedName(((SqlType.Enum) right).getEnumName()));
         }
       case STRUCT:
         // Don't validate fields since the field types will be validated on