Handle java_library being remapped with map_kind

java/gazelle/generate.go

@@ -181,8 +181,13 @@ func (l javaLang) GenerateRules(args language.GenerateArgs) language.GenerateRes
 		return true
 	})
 
+	javaLibraryKind := "java_library"
+	if kindMap, ok := args.Config.KindMap["java_library"]; ok {
+		javaLibraryKind = kindMap.KindName
+	}
+
 	if productionJavaFiles.Len() > 0 {
-		l.generateJavaLibrary(args.File, args.Rel, filepath.Base(args.Rel), productionJavaFiles.SortedSlice(), allPackageNames, nonLocalProductionJavaImports, nonLocalJavaExports, false, &res)
+		l.generateJavaLibrary(args.File, args.Rel, filepath.Base(args.Rel), productionJavaFiles.SortedSlice(), allPackageNames, nonLocalProductionJavaImports, nonLocalJavaExports, false, javaLibraryKind, &res)
 	}
 
 	for _, m := range allMains.SortedSlice() {
@@ -204,7 +209,7 @@ func (l javaLang) GenerateRules(args language.GenerateArgs) language.GenerateRes
 				testJavaImportsWithHelpers.Add(tf.pkg)
 				srcs = append(srcs, tf.pathRelativeToBazelWorkspaceRoot)
 			}
-			l.generateJavaLibrary(args.File, args.Rel, filepath.Base(args.Rel), srcs, packages, testJavaImports, nonLocalJavaExports, true, &res)
+			l.generateJavaLibrary(args.File, args.Rel, filepath.Base(args.Rel), srcs, packages, testJavaImports, nonLocalJavaExports, true, javaLibraryKind, &res)
 		}
 	}
 
@@ -406,7 +411,7 @@ func accumulateJavaFile(cfg *javaconfig.Config, testJavaFiles, testHelperJavaFil
 	}
 }
 
-func (l javaLang) generateJavaLibrary(file *rule.File, pathToPackageRelativeToBazelWorkspace string, name string, srcsRelativeToBazelWorkspace []string, packages, imports *sorted_set.SortedSet[types.PackageName], exports *sorted_set.SortedSet[types.PackageName], testonly bool, res *language.GenerateResult) {
+func (l javaLang) generateJavaLibrary(file *rule.File, pathToPackageRelativeToBazelWorkspace string, name string, srcsRelativeToBazelWorkspace []string, packages, imports *sorted_set.SortedSet[types.PackageName], exports *sorted_set.SortedSet[types.PackageName], testonly bool, javaLibraryRuleKind string, res *language.GenerateResult) {
 	const ruleKind = "java_library"
 	r := rule.NewRule(ruleKind, name)
 
@@ -416,7 +421,8 @@ func (l javaLang) generateJavaLibrary(file *rule.File, pathToPackageRelativeToBa
 	}
 	sort.Strings(srcs)
 
-	runtimeDeps := l.collectRuntimeDeps(ruleKind, name, file)
+	// This is so we would default ALL runtime_deps to "keep" mode
+	runtimeDeps := l.collectRuntimeDeps(javaLibraryRuleKind, name, file)
 	if runtimeDeps.Len() > 0 {
 		r.SetAttr("runtime_deps", labelsToStrings(runtimeDeps.SortedSlice()))
 	}

java/gazelle/testdata/lib_with_runtime_deps_and_map_kind/expectedStderr.txt

@@ -0,0 +1 @@
+12:00AM WRN java/gazelle/private/maven/resolver.go:XXX > not loading maven dependencies error="open %WORKSPACEPATH%/maven_install.json: no such file or directory" _c=maven-resolver

java/gazelle/testdata/lib_with_runtime_deps_and_map_kind/src/main/java/com/example/hello/BUILD.in

@@ -0,0 +1,10 @@
+load("//libs/bazel/java:rules_java.bzl", "generic_java_library")
+
+# gazelle:map_kind java_library generic_java_library //libs/bazel/java:rules_java.bzl
+
+generic_java_library(
+    name = "hello",
+    srcs = ["Hello.java"],
+    visibility = ["//:__subpackages__"],
+    runtime_deps = ["//foo/bar"],
+)

java/gazelle/testdata/lib_with_runtime_deps_and_map_kind/src/main/java/com/example/hello/BUILD.out

@@ -0,0 +1,10 @@
+load("//libs/bazel/java:rules_java.bzl", "generic_java_library")
+
+# gazelle:map_kind java_library generic_java_library //libs/bazel/java:rules_java.bzl
+
+generic_java_library(
+    name = "hello",
+    srcs = ["Hello.java"],
+    visibility = ["//:__subpackages__"],
+    runtime_deps = ["//foo/bar"],
+)

java/gazelle/testdata/lib_with_runtime_deps_and_map_kind/src/main/java/com/example/hello/Hello.java

@@ -0,0 +1,7 @@
+package com.example.hello;
+
+public class Hello {
+    public static void sayHi() {
+        System.out.println("Hi!");
+    }
+}