Update enum values to the new setup

Author: jrosen081

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -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)
   ]
 }
 
@@ -234,17 +235,17 @@ 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() {
-              return "public static let \(raw: field.getName()) = try! JavaClass<Self>(in: JavaVirtualMachine.shared().environment()).\(raw: field.getName())!"
-            } else {
-              return nil
+              enumConstants.append(field)
             }
+            return nil
           }
 
           do {
@@ -257,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 {
@@ -453,6 +461,31 @@ 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)? {
+        \(raw: enumFields.map {
+          // The equals method takes a java object, so we need to cast it here
+          """
+          if self.equals(self.javaClass.\($0.getName())?.as(JavaObject.self)) {
+                return \(name).\($0.getName())
+          }
+          """
+        }.joined(separator: " else ")) else {
+          return nil
+        }
+      }
+    """
+
+    return [extensionSyntax, mappingSyntax]
+  }
+
   // Translate a Java parameter list into Swift parameters.
   private func translateParameters(_ parameters: [Parameter?]) throws -> [FunctionParameterSyntax] {
     return try parameters.compactMap { javaParameter in

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -58,7 +58,14 @@ class Java2SwiftTests: XCTestCase {
       swiftTypeName: "Month",
       expectedChunks: [
         "import JavaKit",
-        "public static let APRIL = try! JavaClass<Self>(in: JavaVirtualMachine.shared().environment()).APRIL!",
+        "enum MonthCases: Equatable",
+        "case APRIL",
+        "public var enumValue: MonthCases?",
+        """
+            } else if self.equals(self.javaClass.APRIL?.as(JavaObject.self)) {
+              return MonthCases.APRIL
+            }
+        """,
         """
           @JavaStaticField
           public var APRIL: Month?