Skip to content

Add Fields to Java2Swift Tool #55

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

Jump to bottom
Merged
merged 5 commits into from
Oct 9, 2024
Merged

Add Fields to Java2Swift Tool #55

merged 5 commits into from
Oct 9, 2024
+207 −1

Conversation

@jrosen081
Copy link
Contributor

@jrosen081 jrosen081 commented Oct 9, 2024

Closes #22

This PR adds support for exporting java fields into swift. The way I was able to test this was applying the following diff and then running the following commands (I can also add automated tests for this, but wasn't sure what the plan for automated tests for this tool are):

--- a/Samples/JavaKitSampleApp/src/main/java/com/example/swift/HelloSubclass.java
+++ b/Samples/JavaKitSampleApp/src/main/java/com/example/swift/HelloSubclass.java
@@ -15,7 +15,7 @@
 package com.example.swift;
 
 public class HelloSubclass extends HelloSwift {
-    private String greeting;
+    public String greeting;
 
     public HelloSubclass(String greeting) {
         this.greeting = greeting;
diff --git a/Samples/JavaKitSampleApp/src/main/java/com/example/swift/HelloSwift.java b/Samples/JavaKitSampleApp/src/main/java/com/example/swift/HelloSwift.java
index b4c87f7..3c89e2c 100644
--- a/Samples/JavaKitSampleApp/src/main/java/com/example/swift/HelloSwift.java
+++ b/Samples/JavaKitSampleApp/src/main/java/com/example/swift/HelloSwift.java
@@ -17,7 +17,8 @@ package com.example.swift;
 public class HelloSwift {
     private double value;
     private static double initialValue = 3.14159;
-    private String name = "Java";
+    public String name = "Java";
+    public static String staticName = "Static Java";
 
     static {
         System.loadLibrary("JavaKitExample");

And running the following commands from the base folder of the repo:

cd Samples/JavaKitSampleApp/src/main/java/com/example/swift/
javac -d ./build *.java
cd build/
jar -cf jar.jar *
swift run Java2Swift com.example.swift.HelloSubclass -o ./ --module-name Java2SwiftTest
cat HelloSubclass.swift

This prints out the following swift code (notice the 2 @JavaField annotations and not the static field, yet)

// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime

@JavaClass("com.example.swift.HelloSubclass")
public struct HelloSubclass {
  @JavaField
  public var greeting: String

  @JavaField
  public var name: String

  @JavaMethod
  public init(_ arg0: String, environment: JNIEnvironment)

  @JavaMethod
  public func greet(_ arg0: String)

  @JavaMethod
  public func sayHello(_ arg0: Int32, _ arg1: Int32) -> Int32

  @JavaMethod
  public func throwMessage(_ arg0: String) throws

  @JavaMethod
  public func throwMessageFromSwift(_ arg0: String) throws -> String

  @JavaMethod
  public func toString() -> String

  @JavaMethod
  public func hashCode() -> Int32

  @JavaMethod
  public func notify()

  @JavaMethod
  public func notifyAll()

  @JavaMethod
  public func wait(_ arg0: Int64) throws

  @JavaMethod
  public func wait(_ arg0: Int64, _ arg1: Int32) throws

  @JavaMethod
  public func wait() throws
}

@jrosen081 jrosen081 mentioned this pull request Oct 9, 2024
Closed
DougGregor
DougGregor approved these changes Oct 9, 2024
View reviewed changes
Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

This looks great. The only real missing piece is how we test it... the testing of the Java2Swift path is not great right now, since we basically rely on regenerating its own sources (and not breaking) as "proof" that it didn't break. And unfortunately, none of the classes from the JDK that we build wrappers for include any public fields, so we don't see the effect of this change anywhere in the diff.

ktoso
ktoso approved these changes Oct 9, 2024
View reviewed changes
Copy link
Collaborator

@ktoso ktoso left a comment

Choose a reason for hiding this comment

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

LGTM, though we won't have CI test this change tbh. Building Java2Swift (make) fails right now afair, but it's a nice step.

@DougGregor
Copy link
Member

DougGregor commented Oct 9, 2024 •
edited
Loading

I just had a wild/silly idea for unit testing this. What if we hook into

https://docs.oracle.com/javase/6/docs/api/javax/tools/JavaCompiler.html

in the unit tests so we can compile some Java code expressed as a string literal in Swift, then send that through Java2Swift and "diff" the expected output? If we wire it up correctly, it should make unit-testing changes to Java2Swift straightforward.

@ktoso
Copy link
Collaborator

ktoso commented Oct 9, 2024

Sure, why not I guess, anything that gets us some test coverage tbh :)

@ktoso ktoso merged commit 5ba87f6 into swiftlang:main Oct 9, 2024
9 checks passed
@jrosen081 jrosen081 mentioned this pull request Oct 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ktoso ktoso ktoso approved these changes

@DougGregor DougGregor DougGregor approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Generate @JavaField in Swift for the public fields of a Java class

3 participants

@jrosen081 @DougGregor @ktoso