From 11f56752ce2992c61e51650e2130541eec803e64 Mon Sep 17 00:00:00 2001 From: Iceman Date: Fri, 10 Apr 2026 17:20:26 +0900 Subject: [PATCH 1/2] Use complete String type name --- Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift | 4 ++-- .../JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift index b711f9b7..5db100b9 100644 --- a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift +++ b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift @@ -545,7 +545,7 @@ extension FFMSwift2JavaGenerator { func printClassConstants(printer: inout CodePrinter) { printer.print( """ - static final String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)"; + static final java.lang.String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)"; static final Arena LIBRARY_ARENA = Arena.ofAuto(); """ ) @@ -584,7 +584,7 @@ extension FFMSwift2JavaGenerator { printer.print( """ @Override - public String toString() { + public java.lang.String toString() { return getClass().getSimpleName() + "(" + SwiftRuntime.nameOfSwiftType($swiftType().$memorySegment(), true) diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift index ffe9971c..c2e2a706 100644 --- a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift +++ b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift @@ -111,7 +111,7 @@ extension JNISwift2JavaGenerator { printModuleClass(&printer) { printer in printer.print( """ - static final String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)"; + static final java.lang.String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)"; """ ) @@ -219,7 +219,7 @@ extension JNISwift2JavaGenerator { printNominal(&printer, decl) { printer in printer.print( """ - static final String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)"; + static final java.lang.String LIB_NAME = "\(config.nativeLibraryName ?? swiftModuleName)"; """ ) @@ -373,11 +373,11 @@ extension JNISwift2JavaGenerator { printer.print( """ - public String toString() { + public java.lang.String toString() { return SwiftObjects.toString(this.$memoryAddress(), this.$typeMetadataAddress()); } - public String toDebugString() { + public java.lang.String toDebugString() { return SwiftObjects.toDebugString(this.$memoryAddress(), this.$typeMetadataAddress()); } """ From 57b946ceb5ea60c223c615506c9bfc7c1656b318 Mon Sep 17 00:00:00 2001 From: Iceman Date: Fri, 10 Apr 2026 17:22:40 +0900 Subject: [PATCH 2/2] Fix test cases --- Tests/JExtractSwiftTests/JNI/JNIClassTests.swift | 2 +- Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift | 2 +- Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift | 4 ++-- Tests/JExtractSwiftTests/JNI/JNIStructTests.swift | 4 ++-- Tests/JExtractSwiftTests/JNI/JNIToStringTests.swift | 4 ++-- Tests/JExtractSwiftTests/SendableTests.swift | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift b/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift index 05d764ea..34626e00 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift @@ -63,7 +63,7 @@ struct JNIClassTests { """, """ public final class MyClass implements JNISwiftInstance { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; @SuppressWarnings("unused") private static final boolean INITIALIZED_LIBS = initializeLibs(); diff --git a/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift b/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift index 153d1fa5..584926f1 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift @@ -47,7 +47,7 @@ struct JNIEnumTests { """, """ public final class MyEnum implements JNISwiftInstance { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; @SuppressWarnings("unused") private static final boolean INITIALIZED_LIBS = initializeLibs(); diff --git a/Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift b/Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift index 40e47b47..9d319890 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift @@ -57,7 +57,7 @@ struct JNIModuleTests { import org.swift.swiftkit.core.annotations.*; public final class SwiftModule { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; static { System.loadLibrary(SwiftLibraries.LIB_NAME_SWIFT_JAVA); @@ -292,7 +292,7 @@ struct JNIModuleTests { .java, expectedChunks: [ """ - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; """ ], notExpectedChunks: [ diff --git a/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift b/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift index 411bd377..6414afd2 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift @@ -57,7 +57,7 @@ struct JNIStructTests { expectedChunks: [ """ public final class MyStruct implements JNISwiftInstance { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; @SuppressWarnings("unused") private static final boolean INITIALIZED_LIBS = initializeLibs(); @@ -221,7 +221,7 @@ struct JNIStructTests { expectedChunks: [ """ public final class MyStruct implements JNISwiftInstance { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; """ ], notExpectedChunks: [ diff --git a/Tests/JExtractSwiftTests/JNI/JNIToStringTests.swift b/Tests/JExtractSwiftTests/JNI/JNIToStringTests.swift index 4b0437b9..aefab653 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIToStringTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIToStringTests.swift @@ -32,7 +32,7 @@ struct JNIToStringTests { detectChunkByInitialLines: 1, expectedChunks: [ """ - public String toString() { + public java.lang.String toString() { return SwiftObjects.toString(this.$memoryAddress(), this.$typeMetadataAddress()); } """ @@ -49,7 +49,7 @@ struct JNIToStringTests { detectChunkByInitialLines: 1, expectedChunks: [ """ - public String toDebugString() { + public java.lang.String toDebugString() { return SwiftObjects.toDebugString(this.$memoryAddress(), this.$typeMetadataAddress()); } """ diff --git a/Tests/JExtractSwiftTests/SendableTests.swift b/Tests/JExtractSwiftTests/SendableTests.swift index 5041a244..c28b0225 100644 --- a/Tests/JExtractSwiftTests/SendableTests.swift +++ b/Tests/JExtractSwiftTests/SendableTests.swift @@ -32,7 +32,7 @@ final class SendableTests { """ @ThreadSafe // Sendable public final class SendableStruct extends FFMSwiftInstance implements SwiftValue { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; static final Arena LIBRARY_ARENA = Arena.ofAuto(); """ ] @@ -50,7 +50,7 @@ final class SendableTests { """ @ThreadSafe // Sendable public final class SendableStruct implements JNISwiftInstance { - static final String LIB_NAME = "SwiftModule"; + static final java.lang.String LIB_NAME = "SwiftModule"; """ ] )