Clean up Java Starlark rules.

PiperOrigin-RevId: 316696801

3 files changed, 21 insertions, 24 deletions

diff --git a/java_src/tools/jar_jar.bzl b/java_src/tools/jar_jar.bzl
index facc78c6d..418b8d6fa 100644
--- a/java_src/tools/jar_jar.bzl
+++ b/java_src/tools/jar_jar.bzl
@@ -9,7 +9,7 @@
 # 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.
-"""Skylark rules for jarjar. See https://github.com/pantsbuild/jarjar
+"""starlark rules for jarjar. See https://github.com/pantsbuild/jarjar
 """
 
 def _jar_jar_impl(ctx):
diff --git a/java_src/tools/java_single_jar.bzl b/java_src/tools/java_single_jar.bzl
index 40904a3de..bc4244d63 100644
--- a/java_src/tools/java_single_jar.bzl
+++ b/java_src/tools/java_single_jar.bzl
@@ -20,12 +20,10 @@ def _java_single_jar(ctx):
     _check_non_empty(ctx.attr.root_packages, "root_packages")
 
     inputs = depset()
-    source_jars = []
-    for dep in ctx.attr.deps:
-        inputs = depset(transitive = [inputs, dep[JavaInfo].transitive_runtime_deps])
-        source_jars += dep[JavaInfo].transitive_source_jars.to_list()
     if ctx.attr.source_jar:
-        inputs = depset(direct = source_jars)
+        inputs = depset(transitive = [dep[JavaInfo].transitive_source_jars for dep in ctx.attr.deps])
+    else:
+        inputs = depset(transitive = [dep[JavaInfo].transitive_runtime_deps for dep in ctx.attr.deps])
 
     args = ctx.actions.args()
     args.add_all("--sources", inputs)
diff --git a/java_src/tools/javadoc.bzl b/java_src/tools/javadoc.bzl
index 7ee12936a..d4565134b 100644
--- a/java_src/tools/javadoc.bzl
+++ b/java_src/tools/javadoc.bzl
@@ -10,7 +10,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-""" Definition of javadoc_library. """
+"""
+Generates a Javadoc jar path/to/target/<name>.jar.
+
+Arguments:
+  srcs: source files to process. This might contain .java files or gen_rule that
+      generates source jars.
+  deps: targets that contain references to other types referenced in Javadoc. This can be the
+      java_library/android_library target(s) for the same sources
+  root_packages: Java packages to include in generated Javadoc. Any subpackages not listed in
+      exclude_packages will be included as well
+  exclude_packages: Java packages to exclude from generated Javadoc
+  android_api_level: If Android APIs are used, the API level to compile against to generate
+      Javadoc
+  doctitle: title for Javadoc's index.html. See javadoc -doctitle
+  bottom_text: text passed to javadoc's `-bottom` flag
+  external_javadoc_links: a list of URLs that are passed to Javadoc's `-linkoffline` flag
+"""
 
 def _check_non_empty(value, name):
     if not value:
@@ -104,20 +120,3 @@ javadoc_library = rule(
     outputs = {"jar": "%{name}.jar"},
     implementation = _javadoc_library,
 )
-"""
-Generates a Javadoc jar path/to/target/<name>.jar.
-
-Arguments:
-  srcs: source files to process. This might contain .java files or gen_rule that
-      generates source jars.
-  deps: targets that contain references to other types referenced in Javadoc. This can be the
-      java_library/android_library target(s) for the same sources
-  root_packages: Java packages to include in generated Javadoc. Any subpackages not listed in
-      exclude_packages will be included as well
-  exclude_packages: Java packages to exclude from generated Javadoc
-  android_api_level: If Android APIs are used, the API level to compile against to generate
-      Javadoc
-  doctitle: title for Javadoc's index.html. See javadoc -doctitle
-  bottom_text: text passed to javadoc's `-bottom` flag
-  external_javadoc_links: a list of URLs that are passed to Javadoc's `-linkoffline` flag
-"""