Skip to content

jextract: Use fully qualified java.lang.String to avoid shadowing #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 2 commits into from
Apr 10, 2026
Merged

jextract: Use fully qualified java.lang.String to avoid shadowing #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11f5675
Use complete String type name
sidepelican Apr 10, 2026
57b946c
Fix test cases
sidepelican Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
"""
)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
"""
)

Expand Down Expand Up @@ -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)";
"""
)

Expand Down Expand Up @@ -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());
}
"""
Expand Down
2 changes: 1 addition & 1 deletion Tests/JExtractSwiftTests/JNI/JNIClassTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -292,7 +292,7 @@ struct JNIModuleTests {
.java,
expectedChunks: [
"""
static final String LIB_NAME = "SwiftModule";
static final java.lang.String LIB_NAME = "SwiftModule";
"""
],
notExpectedChunks: [
Expand Down
4 changes: 2 additions & 2 deletions Tests/JExtractSwiftTests/JNI/JNIStructTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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: [
Expand Down
4 changes: 2 additions & 2 deletions Tests/JExtractSwiftTests/JNI/JNIToStringTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct JNIToStringTests {
detectChunkByInitialLines: 1,
expectedChunks: [
"""
public String toString() {
public java.lang.String toString() {
return SwiftObjects.toString(this.$memoryAddress(), this.$typeMetadataAddress());
}
"""
Expand All @@ -49,7 +49,7 @@ struct JNIToStringTests {
detectChunkByInitialLines: 1,
expectedChunks: [
"""
public String toDebugString() {
public java.lang.String toDebugString() {
return SwiftObjects.toDebugString(this.$memoryAddress(), this.$typeMetadataAddress());
}
"""
Expand Down
4 changes: 2 additions & 2 deletions Tests/JExtractSwiftTests/SendableTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
"""
]
Expand All @@ -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";
"""
]
)
Expand Down
Loading