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
2 changes: 1 addition & 1 deletion Sources/SwiftJavaJNICore/JavaAnnotation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//

/// Describes a Java annotation (e.g. `@Deprecated` or `@Unsigned`)
public struct JavaAnnotation: Equatable, Hashable {
public struct JavaAnnotation: Equatable, Hashable, Sendable {
public let type: JavaType
public let arguments: [String]

Expand Down
36 changes: 20 additions & 16 deletions Sources/SwiftJavaJNICore/JavaType+JavaSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,30 @@ extension JavaType: CustomStringConvertible {
/// Description of the Java type as it would appear in Java source.
public var description: String {
switch self {
case .boolean: "boolean"
case .byte: "byte"
case .char: "char"
case .short: "short"
case .int: "int"
case .long: "long"
case .float: "float"
case .double: "double"
case .void: "void"
case .array(let elementType): "\(elementType.description)[]"
case .boolean: return "boolean"
case .byte: return "byte"
case .char: return "char"
case .short: return "short"
case .int: return "int"
case .long: return "long"
case .float: return "float"
case .double: return "double"
case .void: return "void"
case .array(let elementType): return "\(elementType.description)[]"
case .class(let package, let name, let typeParameters):
if let package {
let packageClause: String =
if let package {
"\(package)."
} else {
""
}
let genericClause: String =
if !typeParameters.isEmpty {
"\(package).\(name)<\(typeParameters.map(\.description).joined(separator: ", "))>"
"<\(typeParameters.map(\.description).joined(separator: ", "))>"
} else {
"\(package).\(name)"
""
}
} else {
name
}
return "\(packageClause)\(name)\(genericClause)"
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftJavaJNICore/JavaType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/// Describes the Java type system.
///
/// Some types may need to be annotated when in parameter position,
public enum JavaType: Equatable, Hashable {
public enum JavaType: Equatable, Hashable, Sendable {
case boolean
case byte(parameterAnnotations: [JavaAnnotation])
case char(parameterAnnotations: [JavaAnnotation])
Expand Down
46 changes: 46 additions & 0 deletions Tests/SwiftJavaJNICoreTests/JavaTypeTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//===----------------------------------------------------------------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2026 Apple Inc. and the Swift.org project authors
// Licensed under Apache License v2.0
//
// See LICENSE.txt for license information
// See CONTRIBUTORS.txt for the list of Swift.org project authors
//
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//

import SwiftJavaJNICore
import Testing

@Suite
struct JavaTypeTests {
@Test(
arguments: [
(.int, "int"),
(.array(.long), "long[]"),
(.char(parameterAnnotations: [.unsigned]), "char"),
(
.class(
package: nil,
name: "Tuple",
typeParameters: [.class(package: nil, name: "Integer"), .class(package: nil, name: "String")]
),
"Tuple<Integer, String>"
),
(
.class(
package: "java.util",
name: "List",
typeParameters: [.class(package: "java.lang", name: "String")]
),
"java.util.List<java.lang.String>"
),
] as [(JavaType, String)]
)
func description(javaType: JavaType, expected: String) throws {
#expect(javaType.description == expected)
}
}
Loading