Skip to content

Commit 7a9ecb8

Browse files
authored
Add JavaIO and CSV example (#234)
* [javakit] Generate some java.io types * [javakit] exception description should include type, otherwise hard to act on * [sample] extend dependency example to consume commons csv as an example * add missing license in empty file * [javakit] correct the description/toString of Throwable * Discard changes to Samples/JavaKitSampleApp/Sources/JavaKitExample/com/example/swift/HelloSwift.java * Discard changes to Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift
1 parent 00df828 commit 7a9ecb8

34 files changed

+897
-106
lines changed

Package.swift

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ let package = Package(
7676
targets: ["JavaKitNetwork"]
7777
),
7878

79+
.library(
80+
name: "JavaKitIO",
81+
targets: ["JavaKitIO"]
82+
),
83+
7984
.library(
8085
name: "JavaKitReflection",
8186
targets: ["JavaKitReflection"]
@@ -241,6 +246,15 @@ let package = Package(
241246
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
242247
]
243248
),
249+
.target(
250+
name: "JavaKitIO",
251+
dependencies: ["JavaKit", "JavaKitCollection"],
252+
exclude: ["swift-java.config"],
253+
swiftSettings: [
254+
.swiftLanguageMode(.v5),
255+
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
256+
]
257+
),
244258
.target(
245259
name: "JavaKitReflection",
246260
dependencies: ["JavaKit", "JavaKitCollection"],
@@ -448,6 +462,6 @@ let package = Package(
448462
swiftSettings: [
449463
.swiftLanguageMode(.v5)
450464
]
451-
)
465+
),
452466
]
453467
)

Samples/JavaDependencySampleApp/Package.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ let package = Package(
8686
.product(name: "JavaKit", package: "swift-java"),
8787
.product(name: "JavaKitFunction", package: "swift-java"),
8888
.product(name: "JavaKitCollection", package: "swift-java"),
89+
.product(name: "JavaKitIO", package: "swift-java"),
90+
.product(name: "JavaKitNetwork", package: "swift-java"),
8991
],
9092
exclude: ["swift-java.config"],
9193
swiftSettings: [
@@ -98,5 +100,7 @@ let package = Package(
98100
]
99101
),
100102

103+
.target(name: "JavaExample"),
104+
101105
]
102106
)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"classes" : {
33
"org.apache.commons.io.FilenameUtils" : "FilenameUtils",
4-
"org.apache.commons.io.IOCase" : "IOCase"
4+
"org.apache.commons.io.IOCase" : "IOCase",
5+
"org.apache.commons.csv.CSVFormat" : "CSVFormat",
6+
"org.apache.commons.csv.CSVParser" : "CSVParser",
7+
"org.apache.commons.csv.CSVRecord" : "CSVRecord"
58
},
69
"dependencies" : [
710
"org.apache.commons:commons-csv:1.12.0"

Samples/JavaDependencySampleApp/Sources/JavaDependencySample/main.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import JavaKit
1616
import JavaKitFunction
17+
import JavaKitIO
1718
import JavaKitConfigurationShared
1819
import Foundation
1920

@@ -42,4 +43,13 @@ let ext = try! FilenameUtilsClass.getExtension(path)
4243
print("org.apache.commons.io.FilenameUtils.getExtension = \(ext)")
4344
precondition(ext == "exe")
4445

46+
let CSVFormatClass = try JavaClass<CSVFormat>()
47+
48+
let reader = StringReader("hello,example")
49+
for record in try CSVFormatClass.RFC4180.parse(reader)!.getRecords()! {
50+
for field in record.toList()! {
51+
print("Field: \(field)")
52+
}
53+
}
54+
4555
print("Done.")
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// This source file is part of the Swift.org open source project
4+
//
5+
// Copyright (c) YEARS Apple Inc. and the Swift.org project authors
6+
// Licensed under Apache License v2.0
7+
//
8+
// See LICENSE.txt for license information
9+
// See CONTRIBUTORS.txt for the list of Swift.org project authors
10+
//
11+
// SPDX-License-Identifier: Apache-2.0
12+
//
13+
//===----------------------------------------------------------------------===//

Sources/Java2Swift/JavaToSwift+FetchDependencies.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ extension JavaToSwift {
4040
print("[info][swift-java] Resolved classpath for \(deps.count) dependencies of '\(moduleName)', classpath entries: \(classpathEntries.count), ", terminator: "")
4141
print("done.".green)
4242

43+
for entry in classpathEntries {
44+
print("[info][swift-java] Classpath entry: \(entry)")
45+
}
46+
4347
return ResolvedDependencyClasspath(for: dependencies, classpath: dependenciesClasspath)
4448
}
4549

@@ -133,6 +137,8 @@ extension JavaToSwift {
133137
// The file contents are just plain
134138
let contents = resolvedClasspath.classpath
135139

140+
print("[debug][swift-java] Resolved dependency: \(classpath)")
141+
136142
// Write the file
137143
try writeContents(
138144
contents,

Sources/JavaKit/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-
return getMessage()
18+
return toString()
1919
}
2020
}
2121

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import JavaRuntime
3+
4+
@JavaInterface("java.lang.Appendable")
5+
public struct Appendable {
6+
@JavaMethod
7+
public func append(_ arg0: CharSequence?) throws -> Appendable!
8+
9+
@JavaMethod
10+
public func append(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32) throws -> Appendable!
11+
12+
@JavaMethod
13+
public func append(_ arg0: UInt16) throws -> Appendable!
14+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import JavaRuntime
3+
4+
@JavaInterface("java.lang.CharSequence")
5+
public struct CharSequence {
6+
@JavaMethod
7+
public func length() -> Int32
8+
9+
@JavaMethod
10+
public func toString() -> String
11+
12+
@JavaMethod
13+
public func charAt(_ arg0: Int32) -> UInt16
14+
15+
@JavaMethod
16+
public func isEmpty() -> Bool
17+
18+
@JavaMethod
19+
public func subSequence(_ arg0: Int32, _ arg1: Int32) -> CharSequence!
20+
}
21+
extension JavaClass<CharSequence> {
22+
@JavaStaticMethod
23+
public func compare(_ arg0: CharSequence?, _ arg1: CharSequence?) -> Int32
24+
}

Sources/JavaKit/generated/JavaInteger.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import JavaRuntime
33

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

Sources/JavaKit/generated/JavaLong.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,18 @@ extension JavaClass<JavaLong> {
167167
@JavaStaticMethod
168168
public func rotateRight(_ arg0: Int64, _ arg1: Int32) -> Int64
169169

170+
@JavaStaticMethod
171+
public func parseLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
172+
170173
@JavaStaticMethod
171174
public func parseLong(_ arg0: String, _ arg1: Int32) throws -> Int64
172175

173176
@JavaStaticMethod
174177
public func parseLong(_ arg0: String) throws -> Int64
175178

179+
@JavaStaticMethod
180+
public func parseUnsignedLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
181+
176182
@JavaStaticMethod
177183
public func parseUnsignedLong(_ arg0: String, _ arg1: Int32) throws -> Int64
178184

Sources/JavaKit/generated/JavaString.swift

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

4-
@JavaClass("java.lang.String")
4+
@JavaClass("java.lang.String", implements: CharSequence.self)
55
open class JavaString: JavaObject {
66
@JavaMethod
77
@_nonoverride public convenience init(_ arg0: [Int8], _ arg1: String, environment: JNIEnvironment? = nil) throws
@@ -52,16 +52,16 @@ open class JavaString: JavaObject {
5252
open func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32)
5353

5454
@JavaMethod
55-
open func compareTo(_ arg0: JavaObject?) -> Int32
55+
open func compareTo(_ arg0: String) -> Int32
5656

5757
@JavaMethod
58-
open func compareTo(_ arg0: String) -> Int32
58+
open func compareTo(_ arg0: JavaObject?) -> Int32
5959

6060
@JavaMethod
61-
open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32
61+
open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32
6262

6363
@JavaMethod
64-
open func indexOf(_ arg0: String) -> Int32
64+
open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32
6565

6666
@JavaMethod
6767
open func indexOf(_ arg0: Int32) -> Int32
@@ -73,7 +73,7 @@ open class JavaString: JavaObject {
7373
open func indexOf(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32) -> Int32
7474

7575
@JavaMethod
76-
open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32
76+
open func indexOf(_ arg0: String) -> Int32
7777

7878
@JavaMethod
7979
open func charAt(_ arg0: Int32) -> UInt16
@@ -90,48 +90,54 @@ open class JavaString: JavaObject {
9090
@JavaMethod
9191
open func offsetByCodePoints(_ arg0: Int32, _ arg1: Int32) -> Int32
9292

93-
@JavaMethod
94-
open func getBytes() -> [Int8]
95-
9693
@JavaMethod
9794
open func getBytes(_ arg0: String) throws -> [Int8]
9895

9996
@JavaMethod
10097
open func getBytes(_ arg0: Int32, _ arg1: Int32, _ arg2: [Int8], _ arg3: Int32)
10198

10299
@JavaMethod
103-
open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool
100+
open func getBytes() -> [Int8]
101+
102+
@JavaMethod
103+
open func contentEquals(_ arg0: CharSequence?) -> Bool
104104

105105
@JavaMethod
106106
open func regionMatches(_ arg0: Int32, _ arg1: String, _ arg2: Int32, _ arg3: Int32) -> Bool
107107

108+
@JavaMethod
109+
open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool
110+
108111
@JavaMethod
109112
open func startsWith(_ arg0: String) -> Bool
110113

111114
@JavaMethod
112115
open func startsWith(_ arg0: String, _ arg1: Int32) -> Bool
113116

114117
@JavaMethod
115-
open func lastIndexOf(_ arg0: String) -> Int32
118+
open func lastIndexOf(_ arg0: Int32) -> Int32
116119

117120
@JavaMethod
118-
open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32
121+
open func lastIndexOf(_ arg0: String) -> Int32
119122

120123
@JavaMethod
121124
open func lastIndexOf(_ arg0: String, _ arg1: Int32) -> Int32
122125

123126
@JavaMethod
124-
open func lastIndexOf(_ arg0: Int32) -> Int32
127+
open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32
125128

126129
@JavaMethod
127-
open func substring(_ arg0: Int32) -> String
130+
open func substring(_ arg0: Int32, _ arg1: Int32) -> String
128131

129132
@JavaMethod
130-
open func substring(_ arg0: Int32, _ arg1: Int32) -> String
133+
open func substring(_ arg0: Int32) -> String
131134

132135
@JavaMethod
133136
open func isEmpty() -> Bool
134137

138+
@JavaMethod
139+
open func replace(_ arg0: CharSequence?, _ arg1: CharSequence?) -> String
140+
135141
@JavaMethod
136142
open func replace(_ arg0: UInt16, _ arg1: UInt16) -> String
137143

@@ -189,9 +195,15 @@ open class JavaString: JavaObject {
189195
@JavaMethod
190196
open func endsWith(_ arg0: String) -> Bool
191197

198+
@JavaMethod
199+
open func subSequence(_ arg0: Int32, _ arg1: Int32) -> CharSequence!
200+
192201
@JavaMethod
193202
open func concat(_ arg0: String) -> String
194203

204+
@JavaMethod
205+
open func contains(_ arg0: CharSequence?) -> Bool
206+
195207
@JavaMethod
196208
open func indent(_ arg0: Int32) -> String
197209

@@ -215,39 +227,42 @@ open class JavaString: JavaObject {
215227
}
216228
}
217229
extension JavaClass<JavaString> {
230+
@JavaStaticMethod
231+
public func valueOf(_ arg0: JavaObject?) -> String
232+
218233
@JavaStaticMethod
219234
public func valueOf(_ arg0: Int64) -> String
220235

221236
@JavaStaticMethod
222-
public func valueOf(_ arg0: [UInt16]) -> String
237+
public func valueOf(_ arg0: Int32) -> String
223238

224239
@JavaStaticMethod
225-
public func valueOf(_ arg0: JavaObject?) -> String
240+
public func valueOf(_ arg0: UInt16) -> String
226241

227242
@JavaStaticMethod
228243
public func valueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String
229244

230245
@JavaStaticMethod
231-
public func valueOf(_ arg0: Float) -> String
246+
public func valueOf(_ arg0: Bool) -> String
232247

233248
@JavaStaticMethod
234249
public func valueOf(_ arg0: Double) -> String
235250

236251
@JavaStaticMethod
237-
public func valueOf(_ arg0: UInt16) -> String
252+
public func valueOf(_ arg0: [UInt16]) -> String
238253

239254
@JavaStaticMethod
240-
public func valueOf(_ arg0: Bool) -> String
255+
public func valueOf(_ arg0: Float) -> String
241256

242257
@JavaStaticMethod
243-
public func valueOf(_ arg0: Int32) -> String
258+
public func join(_ arg0: CharSequence?, _ arg1: [CharSequence?]) -> String
244259

245260
@JavaStaticMethod
246261
public func format(_ arg0: String, _ arg1: [JavaObject?]) -> String
247262

248263
@JavaStaticMethod
249-
public func copyValueOf(_ arg0: [UInt16]) -> String
264+
public func copyValueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String
250265

251266
@JavaStaticMethod
252-
public func copyValueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String
267+
public func copyValueOf(_ arg0: [UInt16]) -> String
253268
}

Sources/JavaKit/swift-java.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"java.lang.String" : "JavaString",
2020
"java.lang.Throwable" : "Throwable",
2121
"java.lang.Void" : "JavaVoid",
22+
"java.lang.CharSequence": "CharSequence",
23+
"java.lang.Appendable": "Appendable",
2224
"java.util.Optional": "JavaOptional",
2325
"java.util.OptionalDouble": "JavaOptionalDouble",
2426
"java.util.OptionalInt": "JavaOptionalInt",

0 commit comments

Comments
 (0)