Skip to content

Commit 149ab11

Browse files
ktosoktoso
committed
SwiftJava: regenerate and add JavaType and JavaParameterizedType
1 parent 7c965ac commit 149ab11

File tree

10 files changed

+79
-61
lines changed

10 files changed

+79
-61
lines changed

‎Sources/SwiftJava/generated/JavaClass.swift‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
22
import CSwiftJavaJNI
33

4-
@JavaClass("java.lang.Class")
4+
@JavaClass("java.lang.Class", implements: JavaReflectType.self)
55
open class JavaClass<T: AnyJavaObject>: JavaObject {
66
@JavaMethod
77
open func getName() -> String
@@ -30,9 +30,6 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
3030
@JavaMethod
3131
open func isHidden() -> Bool
3232

33-
@JavaMethod
34-
open func getGenericSuperclass() -> JavaType
35-
3633
@JavaMethod
3734
open func getSuperclass() -> JavaClass<JavaObject>!
3835

@@ -55,13 +52,16 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
5552
open func isRecord() -> Bool
5653

5754
@JavaMethod
58-
open func getClassLoader() -> JavaClassLoader!
55+
open func isSealed() -> Bool
5956

6057
@JavaMethod
61-
open func newInstance() throws -> JavaObject!
58+
open func getInterfaces() -> [JavaClass<JavaObject>?]
6259

6360
@JavaMethod
64-
open func getInterfaces() -> [JavaClass<JavaObject>?]
61+
open func getClassLoader() -> JavaClassLoader!
62+
63+
@JavaMethod
64+
open func newInstance() throws -> JavaObject!
6565

6666
@JavaMethod
6767
open func isMemberClass() -> Bool
@@ -73,7 +73,7 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
7373
open func isAnonymousClass() -> Bool
7474

7575
@JavaMethod
76-
open func getEnclosingClass() throws -> JavaClass<JavaObject>!
76+
open func getEnclosingClass() -> JavaClass<JavaObject>!
7777

7878
@JavaMethod
7979
open func arrayType() -> JavaClass<JavaObject>!
@@ -84,6 +84,9 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
8484
@JavaMethod
8585
open func getCanonicalName() -> String
8686

87+
@JavaMethod
88+
open func getDeclaredClasses() -> [JavaClass<JavaObject>?]
89+
8790
@JavaMethod
8891
open func getPackageName() -> String
8992

@@ -105,21 +108,24 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
105108
@JavaMethod
106109
open func isSynthetic() -> Bool
107110

111+
@JavaMethod
112+
open func getGenericSuperclass() -> JavaReflectType!
113+
114+
@JavaMethod
115+
open func getGenericInterfaces() -> [JavaReflectType?]
116+
108117
@JavaMethod
109118
open func getSigners() -> [JavaObject?]
110119

111120
@JavaMethod
112-
open func getDeclaringClass() throws -> JavaClass<JavaObject>!
121+
open func getDeclaringClass() -> JavaClass<JavaObject>!
113122

114123
@JavaMethod
115124
open func getTypeName() -> String
116125

117126
@JavaMethod
118127
open func getClasses() -> [JavaClass<JavaObject>?]
119128

120-
@JavaMethod
121-
open func getDeclaredClasses() throws -> [JavaClass<JavaObject>?]
122-
123129
@JavaMethod
124130
open func getEnumConstants() -> [JavaObject?]
125131

@@ -131,16 +137,13 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
131137

132138
@JavaMethod
133139
open func getNestMembers() -> [JavaClass<JavaObject>?]
134-
135-
@JavaMethod
136-
open func isSealed() -> Bool
137140
}
138141
extension JavaClass {
139142
@JavaStaticMethod
140-
public func forName<T: AnyJavaObject>(_ arg0: String, _ arg1: Bool, _ arg2: JavaClassLoader?) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>
143+
public func forName<T: AnyJavaObject>(_ arg0: String) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>
141144

142145
@JavaStaticMethod
143-
public func forName<T: AnyJavaObject>(_ arg0: String) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>
146+
public func forName<T: AnyJavaObject>(_ arg0: String, _ arg1: Bool, _ arg2: JavaClassLoader?) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>
144147

145148
@JavaStaticMethod
146149
public func forPrimitiveName<T: AnyJavaObject>(_ arg0: String) -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>

‎Sources/SwiftJava/generated/JavaClassLoader.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ open class JavaClassLoader: JavaObject {
77
open func getName() -> String
88

99
@JavaMethod
10-
open func loadClass(_ arg0: String, _ arg1: Bool) throws -> JavaClass<JavaObject>!
10+
open func loadClass(_ arg0: String) throws -> JavaClass<JavaObject>!
1111

1212
@JavaMethod
13-
open func loadClass(_ arg0: String) throws -> JavaClass<JavaObject>!
13+
open func loadClass(_ arg0: String, _ arg1: Bool) throws -> JavaClass<JavaObject>!
1414

1515
@JavaMethod
1616
open func setSigners(_ arg0: JavaClass<JavaObject>?, _ arg1: [JavaObject?])
@@ -22,10 +22,10 @@ open class JavaClassLoader: JavaObject {
2222
open func findLoadedClass(_ arg0: String) -> JavaClass<JavaObject>!
2323

2424
@JavaMethod
25-
open func findClass(_ arg0: String) throws -> JavaClass<JavaObject>!
25+
open func findClass(_ arg0: String, _ arg1: String) -> JavaClass<JavaObject>!
2626

2727
@JavaMethod
28-
open func findClass(_ arg0: String, _ arg1: String) -> JavaClass<JavaObject>!
28+
open func findClass(_ arg0: String) throws -> JavaClass<JavaObject>!
2929

3030
@JavaMethod
3131
open func resolveClass(_ arg0: JavaClass<JavaObject>?)

‎Sources/SwiftJava/generated/JavaInteger.swift‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import CSwiftJavaJNI
33

44
@JavaClass("java.lang.Integer")
55
open class JavaInteger: JavaNumber {
6-
76
@JavaMethod
87
@_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil)
98

@@ -121,10 +120,10 @@ extension JavaClass<JavaInteger> {
121120
public func valueOf(_ arg0: String) throws -> JavaInteger!
122121

123122
@JavaStaticMethod
124-
public func valueOf(_ arg0: String, _ arg1: Int32) throws -> JavaInteger!
123+
public func valueOf(_ arg0: Int32) -> JavaInteger!
125124

126125
@JavaStaticMethod
127-
public func valueOf(_ arg0: Int32) -> JavaInteger!
126+
public func valueOf(_ arg0: String, _ arg1: Int32) throws -> JavaInteger!
128127

129128
@JavaStaticMethod
130129
public func toHexString(_ arg0: Int32) -> String
@@ -133,31 +132,37 @@ extension JavaClass<JavaInteger> {
133132
public func decode(_ arg0: String) throws -> JavaInteger!
134133

135134
@JavaStaticMethod
136-
public func parseInt(_ arg0: String) throws -> Int32
135+
public func parseInt(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int32
137136

138137
@JavaStaticMethod
139138
public func parseInt(_ arg0: String, _ arg1: Int32) throws -> Int32
140139

141140
@JavaStaticMethod
142-
public func toUnsignedLong(_ arg0: Int32) -> Int64
141+
public func parseInt(_ arg0: String) throws -> Int32
143142

144143
@JavaStaticMethod
145-
public func sum(_ arg0: Int32, _ arg1: Int32) -> Int32
144+
public func highestOneBit(_ arg0: Int32) -> Int32
146145

147146
@JavaStaticMethod
148-
public func toUnsignedString(_ arg0: Int32, _ arg1: Int32) -> String
147+
public func toUnsignedLong(_ arg0: Int32) -> Int64
148+
149+
@JavaStaticMethod
150+
public func sum(_ arg0: Int32, _ arg1: Int32) -> Int32
149151

150152
@JavaStaticMethod
151153
public func toUnsignedString(_ arg0: Int32) -> String
152154

153155
@JavaStaticMethod
154-
public func parseUnsignedInt(_ arg0: String) throws -> Int32
156+
public func toUnsignedString(_ arg0: Int32, _ arg1: Int32) -> String
155157

156158
@JavaStaticMethod
157159
public func parseUnsignedInt(_ arg0: String, _ arg1: Int32) throws -> Int32
158160

159161
@JavaStaticMethod
160-
public func getInteger(_ arg0: String, _ arg1: JavaInteger?) -> JavaInteger!
162+
public func parseUnsignedInt(_ arg0: String) throws -> Int32
163+
164+
@JavaStaticMethod
165+
public func parseUnsignedInt(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int32
161166

162167
@JavaStaticMethod
163168
public func getInteger(_ arg0: String, _ arg1: Int32) -> JavaInteger!
@@ -166,13 +171,13 @@ extension JavaClass<JavaInteger> {
166171
public func getInteger(_ arg0: String) -> JavaInteger!
167172

168173
@JavaStaticMethod
169-
public func toOctalString(_ arg0: Int32) -> String
174+
public func getInteger(_ arg0: String, _ arg1: JavaInteger?) -> JavaInteger!
170175

171176
@JavaStaticMethod
172-
public func toBinaryString(_ arg0: Int32) -> String
177+
public func toOctalString(_ arg0: Int32) -> String
173178

174179
@JavaStaticMethod
175-
public func highestOneBit(_ arg0: Int32) -> Int32
180+
public func toBinaryString(_ arg0: Int32) -> String
176181

177182
@JavaStaticMethod
178183
public func lowestOneBit(_ arg0: Int32) -> Int32

‎Sources/SwiftJava/generated/JavaLong.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ extension JavaClass<JavaLong> {
126126
public func compare(_ arg0: Int64, _ arg1: Int64) -> Int32
127127

128128
@JavaStaticMethod
129-
public func valueOf(_ arg0: String) throws -> JavaLong!
129+
public func valueOf(_ arg0: Int64) -> JavaLong!
130130

131131
@JavaStaticMethod
132-
public func valueOf(_ arg0: Int64) -> JavaLong!
132+
public func valueOf(_ arg0: String) throws -> JavaLong!
133133

134134
@JavaStaticMethod
135135
public func valueOf(_ arg0: String, _ arg1: Int32) throws -> JavaLong!
@@ -140,6 +140,9 @@ extension JavaClass<JavaLong> {
140140
@JavaStaticMethod
141141
public func decode(_ arg0: String) throws -> JavaLong!
142142

143+
@JavaStaticMethod
144+
public func highestOneBit(_ arg0: Int64) -> Int64
145+
143146
@JavaStaticMethod
144147
public func sum(_ arg0: Int64, _ arg1: Int64) -> Int64
145148

@@ -155,9 +158,6 @@ extension JavaClass<JavaLong> {
155158
@JavaStaticMethod
156159
public func toBinaryString(_ arg0: Int64) -> String
157160

158-
@JavaStaticMethod
159-
public func highestOneBit(_ arg0: Int64) -> Int64
160-
161161
@JavaStaticMethod
162162
public func lowestOneBit(_ arg0: Int64) -> Int64
163163

@@ -168,20 +168,20 @@ extension JavaClass<JavaLong> {
168168
public func rotateRight(_ arg0: Int64, _ arg1: Int32) -> Int64
169169

170170
@JavaStaticMethod
171-
public func parseLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
171+
public func parseLong(_ arg0: String) throws -> Int64
172172

173173
@JavaStaticMethod
174174
public func parseLong(_ arg0: String, _ arg1: Int32) throws -> Int64
175175

176176
@JavaStaticMethod
177-
public func parseLong(_ arg0: String) throws -> Int64
177+
public func parseLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
178178

179179
@JavaStaticMethod
180-
public func parseUnsignedLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
180+
public func parseUnsignedLong(_ arg0: String) throws -> Int64
181181

182182
@JavaStaticMethod
183183
public func parseUnsignedLong(_ arg0: String, _ arg1: Int32) throws -> Int64
184184

185185
@JavaStaticMethod
186-
public func parseUnsignedLong(_ arg0: String) throws -> Int64
186+
public func parseUnsignedLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
187187
}

‎Sources/SwiftJava/generated/JavaReflectParameterizedType.swift‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
22
import CSwiftJavaJNI
33

4-
@JavaClass("java.reflect.Type")
5-
open class JavaReflectParameterizedType: JavaObject {
4+
@JavaInterface("java.lang.reflect.ParameterizedType", extends: JavaReflectType.self)
5+
public struct JavaReflectParameterizedType {
66
@JavaMethod
7-
open func getTypeName() -> String
8-
}
7+
public func getOwnerType() -> JavaReflectType!
8+
9+
@JavaMethod
10+
public func getRawType() -> JavaReflectType!
11+
12+
@JavaMethod
13+
public func getActualTypeArguments() -> [JavaReflectType?]
14+
15+
@JavaMethod
16+
public func getTypeName() -> String
17+
}

‎Sources/SwiftJava/generated/JavaReflectType.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import CSwiftJavaJNI
3+
4+
@JavaInterface("java.lang.reflect.Type")
5+
public struct JavaReflectType {
6+
@JavaMethod
7+
public func getTypeName() -> String
8+
}

‎Sources/SwiftJava/generated/JavaType.swift‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Sources/SwiftJava/swift-java.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"java.lang.Byte" : "JavaByte",
66
"java.lang.Character" : "JavaCharacter",
77
"java.lang.Class" : "JavaClass",
8-
"java.lang.reflect.Type" : "JavaType",
9-
"java.lang.reflect.ParameterizedType" : "JavaParameterizedType",
8+
"java.lang.reflect.Type" : "JavaReflectType",
9+
"java.lang.reflect.ParameterizedType" : "JavaReflectParameterizedType",
1010
"java.lang.ClassLoader" : "JavaClassLoader",
1111
"java.lang.Double" : "JavaDouble",
1212
"java.lang.Error" : "JavaError",

‎Sources/SwiftJavaToolLib/JavaTranslator.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import SwiftBasicFormat
1919
import SwiftSyntax
2020
import SwiftJavaConfigurationShared
2121
import SwiftSyntaxBuilder
22+
import Foundation
2223

2324
/// Utility that translates Java classes into Swift source code to access
2425
/// those Java classes.

‎Tests/SwiftJavaToolLibTests/WrapJavaTests.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,11 @@ func assertWrapJavaOutput(
213213
}
214214

215215
XCTFail("Expected chunk: \n" +
216-
"\(expectedChunk.yellow)" +
217-
"\n" +
218-
"not found in:\n" +
219-
"\(swiftCompleteOutputText)",
220-
file: file, line: line)
216+
"\(expectedChunk.yellow)" +
217+
"\n" +
218+
"not found in:\n" +
219+
"\(swiftCompleteOutputText)",
220+
file: file, line: line)
221221
}
222222

223223
print(swiftCompleteOutputText)

0 commit comments

Comments
 (0)