Move from the "canonical" Java class name to the class name

The canonical class name uses "." rather than "$" for the nested
class distinction, so we can no longer tell where the package ends.
Use the "normal" name which uses $ for nested classes.

Author: DougGregor

Sources/Java2Swift/JavaToSwift.swift

@@ -247,7 +247,7 @@ struct JavaToSwift: ParsableCommand {
       try writeContents(
         swiftFileText,
         to: swiftFileName,
-        description: "Java class '\(javaClass.getCanonicalName())' translation"
+        description: "Java class '\(javaClass.getName())' translation"
       )
     }
   }

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -191,14 +191,14 @@ extension JavaTranslator {
   /// can produce multiple declarations, such as a separate extension of
   /// JavaClass to house static methods.
   package func translateClass(_ javaClass: JavaClass<JavaObject>) -> [DeclSyntax] {
-    let fullName = javaClass.getCanonicalName()
+    let fullName = javaClass.getName()
     let swiftTypeName = try! getSwiftTypeNameFromJavaClassName(fullName)
 
     // Superclass.
     let extends: String
     if !javaClass.isInterface(),
       let superclass = javaClass.getSuperclass(),
-      superclass.getCanonicalName() != "java.lang.Object"
+      superclass.getName() != "java.lang.Object"
     {
       do {
         extends = ", extends: \(try getSwiftTypeName(superclass).swiftName).self"
@@ -278,7 +278,7 @@ extension JavaTranslator {
           do {
             let implementedInSwift = constructor.isNative &&
               constructor.getDeclaringClass()!.equals(javaClass.as(JavaObject.self)!) &&
-              swiftNativeImplementations.contains(javaClass.getCanonicalName())
+              swiftNativeImplementations.contains(javaClass.getName())
 
             let translated = try translateConstructor(
               constructor,
@@ -312,7 +312,7 @@ extension JavaTranslator {
 
           let implementedInSwift = method.isNative &&
             method.getDeclaringClass()!.equals(javaClass.as(JavaObject.self)!) &&
-            swiftNativeImplementations.contains(javaClass.getCanonicalName())
+            swiftNativeImplementations.contains(javaClass.getName())
 
           // Translate the method if we can.
           do {
@@ -438,7 +438,7 @@ extension JavaTranslator {
     // Members that are native and will instead go into a NativeMethods
     // protocol.
     var nativeMembers: [DeclSyntax] = []
-    if swiftNativeImplementations.contains(javaClass.getCanonicalName()) {
+    if swiftNativeImplementations.contains(javaClass.getName()) {
       nativeMembers.append(
         contentsOf: javaClass.getDeclaredMethods().compactMap {
           $0.flatMap { method in

Sources/JavaKit/Optional+JavaObject.swift

@@ -37,7 +37,7 @@ extension Optional: JavaValue where Wrapped: AnyJavaObject {
   }
 
   public static var javaType: JavaType {
-    JavaType(canonicalClassName: Wrapped.fullJavaClassName)
+    JavaType(className: Wrapped.fullJavaClassName)
   }
 
   public static func jniMethodCall(

Sources/JavaTypes/JavaType+JavaSource.swift

@@ -32,7 +32,7 @@ extension JavaType {
       self = try JavaType(mangledName: name)
 
     case let className:
-      self = JavaType(canonicalClassName: className)
+      self = JavaType(className: className)
     }
   }
 }

Sources/JavaTypes/JavaType.swift

@@ -31,9 +31,9 @@ public enum JavaType: Equatable, Hashable {
   /// A Java array.
   indirect case array(JavaType)
 
-  /// Given a canonical class name such as "java.lang.Object", split it into
+  /// Given a class name such as "java.lang.Object", split it into
   /// its package and class name to form a class instance.
-  public init(canonicalClassName name: some StringProtocol) {
+  public init(className name: some StringProtocol) {
     if let lastDot = name.lastIndex(of: ".") {
       self = .class(
         package: String(name[..<lastDot]),

Sources/JavaTypes/Mangling.swift

@@ -125,7 +125,7 @@ extension JavaType {
       string = string[string.index(after: semicolonIndex)...]
 
       return JavaType(
-        canonicalClassName: canonicalNameWithSlashes.replacingSlashesWithPeriods()
+        className: canonicalNameWithSlashes.replacingSlashesWithPeriods()
       )
 
     default: