Skip to content

Commit 070ae87

Browse files
committed
wip on enums so we can not crash in JavaDependencySampleApp
1 parent b3aa62f commit 070ae87

File tree

12 files changed

+44
-10
lines changed

12 files changed

+44
-10
lines changed

Samples/JavaDependencySampleApp/Sources/JavaCommonsCSV/swift-java.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"org.apache.commons.csv.CSVParser" : "CSVParser",
77
"org.apache.commons.csv.CSVRecord" : "CSVRecord"
88
},
9+
"classes-ignore" : {
10+
"org.apache.commons.csv.CSVFormat$Predefined" : "",
11+
},
912
"dependencies" : [
1013
"org.apache.commons:commons-csv:1.12.0"
1114
]

Sources/JavaStdlib/JavaLangReflect/TypeVariable+Extensions.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ extension TypeVariable: Hashable {
5555
}
5656

5757
}
58+
59+
extension TypeVariable {
60+
public var description: String {
61+
toString()
62+
}
63+
}

Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,24 @@ public struct ParameterizedType {
1616
@JavaMethod
1717
public func getTypeName() -> String
1818
}
19+
20+
extension ParameterizedType {
21+
22+
@JavaMethod
23+
public func toString() -> String
24+
25+
@JavaMethod
26+
public func getClass() -> JavaClass<JavaObject>!
27+
28+
@JavaMethod
29+
public func equals(_ arg0: JavaObject?) -> Bool
30+
31+
@JavaMethod
32+
public func hashCode() -> Int32
33+
}
34+
35+
extension ParameterizedType: CustomStringConvertible {
36+
public var description: String {
37+
toString()
38+
}
39+
}

Sources/JavaStdlib/JavaLangReflect/generated/TypeVariable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import SwiftJava
33
import CSwiftJavaJNI
44

55
@JavaInterface("java.lang.reflect.TypeVariable", extends: Type.self)
6-
public struct TypeVariable<D: AnyJavaObject> {
6+
public struct TypeVariable<D: AnyJavaObject>: CustomStringConvertible {
77
@JavaMethod
88
public func getGenericDeclaration() -> GenericDeclaration!
99

Sources/SwiftJava/Exceptions/Throwable+Error.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// Translate all Java Throwable instances in a Swift error.
1616
extension Throwable: Error, CustomStringConvertible {
1717
public var description: String {
18-
"\(getClass().getCanonicalName())(\(getMessage()))"
18+
return toString()
1919
}
2020
}
2121

Sources/SwiftJava/generated/CharSequence.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ public struct CharSequence {
99
@JavaMethod
1010
public func toString() -> String
1111

12+
@JavaMethod
13+
public func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32)
14+
1215
@JavaMethod
1316
public func charAt(_ arg0: Int32) -> UInt16
1417

Sources/SwiftJava/generated/JavaClass.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
6161
open func getClassLoader() -> JavaClassLoader!
6262

6363
@JavaMethod
64-
open func newInstance() throws -> JavaObject!
64+
open func newInstance() throws -> T!
6565

6666
@JavaMethod
6767
open func isMemberClass() -> Bool
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import CSwiftJavaJNI
3+
4+
@JavaClass("java.lang.Enum")
5+
open class JavaEnum<T: AnyJavaObject>: JavaObject {
6+
}

Sources/SwiftJava/generated/JavaOptional.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import CSwiftJavaJNI
44
@JavaClass("java.util.Optional")
55
open class JavaOptional<T: AnyJavaObject>: JavaObject {
66
@JavaMethod
7-
open func get() -> JavaObject!
7+
open func get() -> T!
88

99
@JavaMethod
1010
open override func equals(_ arg0: JavaObject?) -> Bool

Sources/SwiftJava/swift-java.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"java.lang.Long" : "JavaLong",
1717
"java.lang.Number" : "JavaNumber",
1818
"java.lang.Object" : "JavaObject",
19+
"java.lang.Enum" : "JavaEnum",
1920
"java.lang.RuntimeException" : "RuntimeException",
2021
"java.lang.Short" : "JavaShort",
2122
"java.lang.String" : "JavaString",

0 commit comments

Comments
 (0)