Add Support for Field Accessors

Author: jrosen081

Makefile

@@ -55,7 +55,7 @@ generate-JavaKit: Java2Swift
 
 generate-JavaKitReflection: Java2Swift generate-JavaKit
 	mkdir -p Sources/JavaKitReflection/generated
-	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitReflection --manifests Sources/JavaKit/generated/JavaKit.swift2java -o Sources/JavaKitReflection/generated java.lang.reflect.Method java.lang.reflect.Type java.lang.reflect.Constructor java.lang.reflect.Parameter java.lang.reflect.ParameterizedType java.lang.reflect.Executable java.lang.reflect.AnnotatedType java.lang.reflect.TypeVariable java.lang.reflect.WildcardType java.lang.reflect.GenericArrayType java.lang.reflect.AccessibleObject java.lang.annotation.Annotation java.lang.reflect.GenericDeclaration
+	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitReflection --manifests Sources/JavaKit/generated/JavaKit.swift2java -o Sources/JavaKitReflection/generated java.lang.reflect.Method java.lang.reflect.Type java.lang.reflect.Constructor java.lang.reflect.Parameter java.lang.reflect.ParameterizedType java.lang.reflect.Executable java.lang.reflect.AnnotatedType java.lang.reflect.TypeVariable java.lang.reflect.WildcardType java.lang.reflect.GenericArrayType java.lang.reflect.AccessibleObject java.lang.annotation.Annotation java.lang.reflect.GenericDeclaration java.lang.reflect.Field
 
 generate-JavaKitJar: Java2Swift generate-JavaKit
 	mkdir -p Sources/JavaKitJar/generated

Sources/Java2Swift/JavaTranslator.swift

@@ -280,6 +280,25 @@ extension JavaTranslator {
         }
       }
     )
+      
+      var staticFields: [Field] = []
+      members.append(
+        contentsOf: javaClass.getFields().compactMap {
+            $0.flatMap { field in
+                if field.isStatic {
+                    staticFields.append(field)
+                    return nil
+                }
+                
+                do {
+                    return try translateField(field)
+                } catch {
+                    logUntranslated("Unable to translate '\(fullName)' field '\(field.getName())': \(error)")
+                    return nil
+                }
+            }
+        }
+      )
 
     // Map the generic parameters.
     let genericParameterClause: String
@@ -327,6 +346,8 @@ extension JavaTranslator {
 
     // Format the class declaration.
     classDecl = classDecl.formatted(using: format).cast(DeclSyntax.self)
+      
+    // TODO: Handle static fields in https://github.com/swiftlang/swift-java/issues/39
 
     if staticMethods.isEmpty {
       return [classDecl]
@@ -422,6 +443,15 @@ extension JavaTranslator {
       public func \(raw: javaMethod.getName())\(raw: genericParameterClause)(\(raw: parametersStr))\(raw: throwsStr)\(raw: resultTypeStr)\(raw: whereClause)
       """
   }
+    
+    func translateField(_ javaField: Field) throws -> DeclSyntax {
+        let typeName = try getSwiftTypeNameAsString(javaField.getGenericType()!, outerOptional: true)
+        let fieldAttribute: AttributeSyntax = "@JavaField";
+        return """
+        \(fieldAttribute)
+        public func \(raw: javaField.getName()): \(raw: typeName)
+        """
+    }
 
   // Translate a Java parameter list into Swift parameters.
   private func translateParameters(_ parameters: [Parameter?]) throws -> [FunctionParameterSyntax] {

Sources/JavaKitReflection/Field+Utilities.swift

@@ -0,0 +1,20 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 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
+//
+//===----------------------------------------------------------------------===//
+
+extension Field {
+    /// Whether this is a 'static' field.
+    public var isStatic: Bool {
+      return (getModifiers() & 0x08) != 0
+    }
+}

Sources/JavaKitReflection/JavaClass+Reflection.swift

@@ -28,6 +28,9 @@ extension JavaClass {
 
   @JavaMethod
   public func getMethods() -> [Method?]
+    
+  @JavaMethod
+  public func getFields() -> [Field?]
 
   @JavaMethod
   public func getConstructors() -> [Constructor<ObjectType>?]