Minor cleanups to the JavaKit module and samples (#111)

* Rename JavaClass.init(in:) to JavaClass.init(environment:).

Every other API uses the argument label "environment" for the JNI
environment, so be consistent. Additionally, make it an optional
parameter and query the running JVM to get the environment if we don't
already have one.

* Remove the unnecessary ArrayList bits from the JavaKit sample app

* Import the various java.lang.* class wrappers over primitive types

* JavaKit: Autogenerate JavaClass rather than hand-rolling it

* Clean up and fix samples

Author: DougGregor

Samples/JavaKitSampleApp/Sources/JavaKitExample/Java2Swift.config

@@ -1,6 +1,5 @@
 {
   "classes" : {
-    "java.util.ArrayList" : "ArrayList",
     "com.example.swift.HelloSwift" : "HelloSwift",
     "com.example.swift.HelloSubclass" : "HelloSubclass",
     "com.example.swift.JavaKitSampleMain" : "JavaKitSampleMain"

Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift

@@ -79,9 +79,3 @@ extension HelloSwift: HelloSwiftNativeMethods {
     throw SwiftWrappedError.message(message)
   }
 }
-
-func removeLast(arrayList: ArrayList<JavaClass<HelloSwift>>) {
-  if let lastObject = arrayList.getLast() {
-    _ = arrayList.remove(lastObject)
-  }
-}

Samples/JavaProbablyPrime/Package.swift

@@ -26,6 +26,7 @@ let package = Package(
     .executableTarget(
       name: "JavaProbablyPrime",
       dependencies: [
+        .product(name: "JavaKitCollection", package: "swift-java"),
         .product(name: "JavaKit", package: "swift-java"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
       ],

Samples/JavaProbablyPrime/README.md

@@ -9,5 +9,4 @@ swift run JavaProbablyPrime <very big number>
 The package itself demonstrates how to:
 
 * Use the Java2Swift build tool plugin to wrap the `java.math.BigInteger` type in Swift.
-* Create a `JavaVirtualMachine` instance in a Swift command-line program.
 * Create an instance of `BigInteger` in Swift and use its `isProbablyPrime`.

Samples/JavaProbablyPrime/Sources/JavaProbablyPrime/prime.swift

@@ -24,10 +24,7 @@ struct ProbablyPrime: ParsableCommand {
   var certainty: Int32 = 10
 
   func run() throws {
-    let javaVirtualMachine = try JavaVirtualMachine.shared()
-    let jniEnvironment = try javaVirtualMachine.environment()
-
-    let bigInt = BigInteger(number, environment: jniEnvironment)
+    let bigInt = BigInteger(number)
     if bigInt.isProbablePrime(certainty) {
       print("\(number) is probably prime")
     } else {

Samples/JavaSieve/Sources/JavaMath/Java2Swift.config

@@ -3,7 +3,6 @@
     "java.math.BigDecimal" : "BigDecimal",
     "java.math.BigInteger" : "BigInteger",
     "java.math.MathContext" : "MathContext",
-    "java.math.RoundingMode" : "RoundingMode",
-    "java.lang.Integer" : "JavaInteger",
+    "java.math.RoundingMode" : "RoundingMode"
   }
 }

Samples/JavaSieve/Sources/JavaSieve/main.swift

@@ -13,11 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 import JavaKit
-import JavaKitVM
 
 let jvm = try JavaVirtualMachine.shared(classPath: ["QuadraticSieve-1.0.jar"])
 do {
-  let sieveClass = try JavaClass<SieveOfEratosthenes>(in: jvm.environment())
+  let sieveClass = try JavaClass<SieveOfEratosthenes>(environment: jvm.environment())
   for prime in sieveClass.findPrimes(100)! {
     print("Found prime: \(prime.intValue())")
   }

Sources/Java2Swift/JavaToSwift.swift

@@ -210,7 +210,7 @@ struct JavaToSwift: ParsableCommand {
       environment: environment
     )
     #else
-    let classLoader = try JavaClass<ClassLoader>(in: environment)
+    let classLoader = try JavaClass<ClassLoader>(environment: environment)
       .getSystemClassLoader()!
     #endif
     var javaClasses: [JavaClass<JavaObject>] = []

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -581,7 +581,7 @@ extension JavaTranslator {
       } else {
         try! JavaVirtualMachine.shared().environment()
       }
-      let classObj = try! JavaClass<Self>(in: _environment)
+      let classObj = try! JavaClass<Self>(environment: _environment)
       switch enumValue {
     \(raw: enumFields.map {
       return """

Sources/JavaKit/Java2Swift.config

@@ -1,9 +1,20 @@
 {
   "classes" : {
+    "java.lang.Boolean" : "JavaBoolean",
+    "java.lang.Byte" : "JavaByte",
+    "java.lang.Character" : "JavaCharacter",
+    "java.lang.Class" : "JavaClass",
+    "java.lang.Double" : "JavaDouble",
     "java.lang.Error" : "JavaError",
     "java.lang.Exception" : "Exception",
+    "java.lang.Float" : "JavaFloat",
+    "java.lang.Integer" : "JavaInteger",
+    "java.lang.Long" : "JavaLong",
+    "java.lang.Number" : "JavaNumber",
     "java.lang.Object" : "JavaObject",
     "java.lang.RuntimeException" : "RuntimeException",
-    "java.lang.Throwable" : "Throwable"
+    "java.lang.Short" : "JavaShort",
+    "java.lang.Throwable" : "Throwable",
+    "java.lang.Void" : "JavaVoid"
   }
 }