Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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
57 changes: 57 additions & 0 deletions Sources/Java2SwiftLib/JavaTranslator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ extension JavaTranslator {
package static let defaultTranslatedClasses: [String: (swiftType: String, swiftModule: String?, isOptional: Bool)] = [
"java.lang.Class": ("JavaClass", "JavaKit", true),
"java.lang.String": ("String", "JavaKit", false),
"java.lang.Object": ("JavaObject", "JavaKit", true)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this change shouldn't be necessary. java.lang.Object is already listed in Java2Swift.config for the JavaKit target, so the only way this could be needed is if something is missing a JavaKit dependency.

]
}

Expand Down Expand Up @@ -234,11 +235,16 @@ extension JavaTranslator {

// Fields
var staticFields: [Field] = []
var enumConstants: [Field] = []
members.append(
contentsOf: javaClass.getFields().compactMap {
$0.flatMap { field in
if field.isStatic {
staticFields.append(field)

if field.isEnumConstant() {
enumConstants.append(field)
}
return nil
}

Expand All @@ -252,6 +258,13 @@ extension JavaTranslator {
}
)

if !enumConstants.isEmpty {
let enumName = "\(swiftTypeName)Cases"
members.append(
contentsOf: translateToEnumValue(name: enumName, enumFields: enumConstants)
)
}

// Constructors
members.append(
contentsOf: javaClass.getConstructors().compactMap {
Expand Down Expand Up @@ -447,6 +460,50 @@ extension JavaTranslator {
"""
}

package func translateToEnumValue(name: String, enumFields: [Field]) -> [DeclSyntax] {
let extensionSyntax: DeclSyntax = """
public enum \(raw: name): Equatable {
\(raw: enumFields.map { "case \($0.getName())" }.joined(separator: "\n"))
}
"""

let mappingSyntax: DeclSyntax = """
public var enumValue: \(raw: name)? {
let classObj = self.javaClass
\(raw: enumFields.map {
// The equals method takes a java object, so we need to cast it here
"""
if self.equals(classObj.\($0.getName())?.as(JavaObject.self)) {
return \(name).\($0.getName())
}
"""
}.joined(separator: " else ")) else {
return nil
}
}
"""

let initSyntax: DeclSyntax = """
public init(_ enumValue: \(raw: name), environment: JNIEnvironment) {
let classObj = try! JavaClass<Self>(in: environment)
switch enumValue {
\(raw: enumFields.map {
return """
case .\($0.getName()):
if let \($0.getName()) = classObj.\($0.getName()) {
self = \($0.getName())
} else {
fatalError("Enum value \($0.getName()) was unexpectedly nil, please re-run Java2Swift on the most updated Java class")
}
"""
}.joined(separator: "\n"))
}
}
"""

return [extensionSyntax, mappingSyntax, initSyntax]
}

// Translate a Java parameter list into Swift parameters.
private func translateParameters(_ parameters: [Parameter?]) throws -> [FunctionParameterSyntax] {
return try parameters.compactMap { javaParameter in
Expand Down
35 changes: 35 additions & 0 deletions Tests/Java2SwiftTests/Java2SwiftTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ var jvm: JavaVirtualMachine {
}
}

@JavaClass("java.time.Month")
public struct JavaMonth {

}

class Java2SwiftTests: XCTestCase {
func testJavaLangObjectMapping() throws {
try assertTranslatedClass(
Expand All @@ -47,6 +52,36 @@ class Java2SwiftTests: XCTestCase {
)
}

func testEnum() async throws {
try assertTranslatedClass(
JavaMonth.self,
swiftTypeName: "Month",
expectedChunks: [
"import JavaKit",
"enum MonthCases: Equatable",
"case APRIL",
"public var enumValue: MonthCases?",
"""
} else if self.equals(classObj.APRIL?.as(JavaObject.self)) {
return MonthCases.APRIL
}
""",
"public init(_ enumValue: MonthCases, environment: JNIEnvironment) {",
"""
case .APRIL:
if let APRIL = classObj.APRIL {
self = APRIL
} else {
fatalError("Enum value APRIL was unexpectedly nil, please re-run Java2Swift on the most updated Java class")
}
""",
"""
@JavaStaticField
public var APRIL: Month?
"""
])
}

func testGenericCollections() throws {
try assertTranslatedClass(
MyArrayList<JavaObject>.self,
Expand Down