Fix building

Author: jrosen081

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -253,14 +253,14 @@ extension JavaTranslator {
             staticFields.append(field)
 
             if field.isEnumConstant() {
-              return "public static let \(raw: field.getName()) = try! JavaClass<Self>(environment: JavaVirtualMachine.environment()).\(raw: field.getName())"
+              return "public static let \(raw: field.getName()) = try! JavaClass<Self>(in: JavaVirtualMachine.shared().environment()).\(raw: field.getName())!"
             } else {
               return nil
             }
           }
 
           do {
-            return try translateField(field, isOptional: true)
+            return try translateField(field)
           } catch {
             logUntranslated("Unable to translate '\(fullName)' static field '\(field.getName())': \(error)")
             return nil
@@ -365,7 +365,7 @@ extension JavaTranslator {
         // Translate each static field.
         do {
           // Enum constants are guaranteed to not be optional
-          return try translateField(field, isOptional: !field.isEnumConstant())
+          return try translateField(field)
         } catch {
           logUntranslated("Unable to translate '\(fullName)' field '\(field.getName())': \(error)")
           return nil
@@ -455,8 +455,8 @@ extension JavaTranslator {
       """
   }
 
-  package func translateField(_ javaField: Field, isOptional: Bool) throws -> DeclSyntax {
-    let typeName = try getSwiftTypeNameAsString(javaField.getGenericType()!, outerOptional: isOptional)
+  package func translateField(_ javaField: Field) throws -> DeclSyntax {
+    let typeName = try getSwiftTypeNameAsString(javaField.getGenericType()!, outerOptional: true)
     let fieldAttribute: AttributeSyntax = javaField.isStatic ? "@JavaStaticField" : "@JavaField";
     return """
       \(fieldAttribute)

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -58,10 +58,10 @@ class Java2SwiftTests: XCTestCase {
       swiftTypeName: "Month",
       expectedChunks: [
         "import JavaKit",
-        "public static let APRIL = try! JavaClass<Self>(environment: JavaVirtualMachine.environment()).APRIL",
+        "public static let APRIL = try! JavaClass<Self>(in: JavaVirtualMachine.shared().environment()).APRIL!",
         """
           @JavaStaticField
-          public var APRIL: Month
+          public var APRIL: Month?
         """
       ])
   }
@@ -103,6 +103,7 @@ func assertTranslatedClass<JavaClassType: AnyJavaObject>(
     """
 
   for expectedChunk in expectedChunks {
+    print(swiftFileText)
     if swiftFileText.contains(expectedChunk) {
       continue
     }