Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions Sources/SwiftJavaToolLib/JavaClassTranslator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,16 @@ extension JavaClassTranslator {
if parameterizedType.isEqualTo(typeParam.as(Type.self)) {
return true
}

// Also check if the type param is used as a type argument inside a parameterized parameter type
if let parameterizedParamType = parameterizedType.as(ParameterizedType.self) {
for actualTypeParam in parameterizedParamType.getActualTypeArguments() {
guard let actualTypeParam else { continue }
if actualTypeParam.isEqualTo(typeParam.as(Type.self)) {
return true
}
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,5 +408,40 @@ final class GenericsWrapJavaTests: XCTestCase {
]
)
}


func testWrapJavaGenericMethod_parameterizedParameterType() async throws {
let classpathURL = try await compileJava(
"""
package com.example;

class Resolver<T> { }
class Serializer<T> { }

class Store {
public <ValueType> Store
bootstrapStore(
String name,
Resolver<ValueType> resolver,
Serializer<ValueType> serializer
) { return null; }
}
""")

try assertWrapJavaOutput(
javaClassNames: [
"com.example.Resolver",
"com.example.Serializer",
"com.example.Store"
],
classpath: [classpathURL],
expectedChunks: [
"""
@JavaMethod
open func bootstrapStore<ValueType: AnyJavaObject>(_ arg0: String, _ arg1: Resolver<ValueType>?, _ arg2: Serializer<ValueType>?) -> Store!
""",
]
)
}

}
Loading