Skip to content

JavaClass macro: stop generating javaThis and javaEnvironment members #127

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
merged 1 commit into from
Oct 28, 2024
+8 −30
Merged

JavaClass macro: stop generating javaThis and javaEnvironment members #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions Sources/JavaKit/AnyJavaObject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,19 @@ public protocol AnyJavaObject {

/// The Swift instance that keeps the Java holder alive.
var javaHolder: JavaObjectHolder { get }
}

extension AnyJavaObject {
/// Retrieve the underlying Java object.
var javaThis: jobject { get }
public var javaThis: jobject {
javaHolder.object!
}

/// Retrieve the environment in which this Java object resides.
var javaEnvironment: JNIEnvironment { get }
}
public var javaEnvironment: JNIEnvironment {
javaHolder.environment
}

extension AnyJavaObject {
/// The full Java class name, where each component is separated by a "/".
static var fullJavaClassNameWithSlashes: String {
let seq = fullJavaClassName.map { $0 == "." ? "/" as Character : $0 }
Expand Down
4 changes: 0 additions & 4 deletions Sources/JavaKit/Macros.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
member,
names: named(fullJavaClassName),
named(javaHolder),
named(javaThis),
named(javaEnvironment),
named(init(javaHolder:)),
named(JavaSuperclass),
named(`as`)
Expand Down Expand Up @@ -70,8 +68,6 @@ public macro JavaClass(
member,
names: named(fullJavaClassName),
named(javaHolder),
named(javaThis),
named(javaEnvironment),
named(init(javaHolder:)),
named(JavaSuperclass),
named(`as`)
Expand Down
14 changes: 0 additions & 14 deletions Sources/JavaKitMacros/JavaClassMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,6 @@ extension JavaClassMacro: MemberMacro {
public var javaHolder: JavaObjectHolder
"""

let javaThisMember: DeclSyntax = """
public var javaThis: jobject {
javaHolder.object!
}
"""

let javaEnvironmentMember: DeclSyntax = """
public var javaEnvironment: JNIEnvironment {
javaHolder.environment
}
"""

let initMember: DeclSyntax = """
public init(javaHolder: JavaObjectHolder) {
self.javaHolder = javaHolder
Expand All @@ -98,8 +86,6 @@ extension JavaClassMacro: MemberMacro {
fullJavaClassNameMember,
superclassTypealias,
javaHolderMember,
javaThisMember,
javaEnvironmentMember,
initMember,
nonOptionalAs,
]
Expand Down
8 changes: 0 additions & 8 deletions Tests/JavaKitMacroTests/JavaClassMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,6 @@ class JavaKitMacroTests: XCTestCase {

public var javaHolder: JavaObjectHolder

public var javaThis: jobject {
javaHolder.object!
}

public var javaEnvironment: JNIEnvironment {
javaHolder.environment
}

public init(javaHolder: JavaObjectHolder) {
self.javaHolder = javaHolder
}
Expand Down