Make @SkylarkCallable.name mandatory.

RELNOTES: None.
PiperOrigin-RevId: 201748802

2 files changed, 3 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
index 6d38c43c3f..884fe299e7 100644
--- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
+++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
@@ -30,7 +30,6 @@ import com.google.devtools.build.lib.syntax.FuncallExpression;
 import com.google.devtools.build.lib.syntax.Runtime;
 import com.google.devtools.build.lib.util.Classpath;
 import com.google.devtools.build.lib.util.Classpath.ClassPathException;
-import com.google.devtools.build.lib.util.StringUtilities;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayDeque;
@@ -234,11 +233,8 @@ final class SkylarkDocumentationCollector {
 
   private static String getFullyQualifiedName(
       String objectName, Method method, SkylarkCallable callable) {
-    String objectDotExpressionPrefix =
-      objectName.isEmpty() ? "" : objectName + ".";
-    String methodName = callable.name().isEmpty()
-        ? StringUtilities.toPythonStyleFunctionName(method.getName())
-        : callable.name();
+    String objectDotExpressionPrefix = objectName.isEmpty() ? "" : objectName + ".";
+    String methodName = callable.name();
     return objectDotExpressionPrefix + methodName;
   }
 }
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java
index 614d155325..eeff9fa73e 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java
@@ -17,7 +17,6 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.skylarkinterface.Param;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
-import com.google.devtools.build.lib.util.StringUtilities;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,9 +35,7 @@ public final class SkylarkJavaMethodDoc extends SkylarkMethodDoc {
 
   public SkylarkJavaMethodDoc(String moduleName, Method method, SkylarkCallable callable) {
     this.moduleName = moduleName;
-    this.name = callable.name().isEmpty()
-        ? StringUtilities.toPythonStyleFunctionName(method.getName())
-        : callable.name();
+    this.name = callable.name();
     this.method = method;
     this.callable = callable;
     this.params =