Skip to content

Commit 0e87401

Browse files
colemancdacolemancda
committed
Updated java.net.* generated code
1 parent 5e8d41a commit 0e87401

10 files changed

+145
-147
lines changed

‎Sources/AndroidJavaNet/ContentHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ open class ContentHandler: JavaObject {
1111
open func getContent(_ arg0: URLConnection?) throws -> JavaObject!
1212

1313
@JavaMethod
14-
open func getContent(_ arg0: URLConnection?, _ arg1: [JavaClass?]) throws -> JavaObject!
14+
open func getContent(_ arg0: URLConnection?, _ arg1: [JavaClass<JavaObject>?]) throws -> JavaObject!
1515
}

‎Sources/AndroidJavaNet/DatagramSocket.swift

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,103 +7,103 @@ import JavaRuntime
77
@JavaClass("java.net.DatagramSocket", implements: Closeable.self)
88
open class DatagramSocket: JavaObject {
99
@JavaMethod
10-
@_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) throws
10+
@_nonoverride public convenience init(_ arg0: Int32, _ arg1: InetAddress?, environment: JNIEnvironment? = nil) throws
1111

1212
@JavaMethod
1313
@_nonoverride public convenience init(environment: JNIEnvironment? = nil) throws
1414

1515
@JavaMethod
16-
@_nonoverride public convenience init(_ arg0: Int32, _ arg1: InetAddress?, environment: JNIEnvironment? = nil) throws
16+
@_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) throws
1717

1818
@JavaMethod
1919
@_nonoverride public convenience init(_ arg0: SocketAddress?, environment: JNIEnvironment? = nil) throws
2020

2121
@JavaMethod
22-
open func isClosed() -> Bool
22+
open func connect(_ arg0: SocketAddress?) throws
2323

2424
@JavaMethod
25-
open func isBound() -> Bool
25+
open func connect(_ arg0: InetAddress?, _ arg1: Int32)
2626

2727
@JavaMethod
28-
open func getInetAddress() -> InetAddress!
28+
open func joinGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
2929

3030
@JavaMethod
31-
open func getLocalPort() -> Int32
31+
open func leaveGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
3232

3333
@JavaMethod
34-
open func setOption(_ arg0: SocketOption<JavaObject>?, _ arg1: JavaObject?) throws -> DatagramSocket!
34+
open func send(_ arg0: DatagramPacket?) throws
3535

3636
@JavaMethod
37-
open func getOption(_ arg0: SocketOption<JavaObject>?) throws -> JavaObject!
37+
open func disconnect()
3838

3939
@JavaMethod
40-
open func supportedOptions() -> JavaSet<SocketOption<JavaObject>>!
40+
open func isBound() -> Bool
4141

4242
@JavaMethod
43-
open func getLocalSocketAddress() -> SocketAddress!
43+
open func isConnected() -> Bool
4444

4545
@JavaMethod
46-
open func setSoTimeout(_ arg0: Int32) throws
46+
open func getInetAddress() -> InetAddress!
4747

4848
@JavaMethod
49-
open func getSoTimeout() throws -> Int32
49+
open func getRemoteSocketAddress() -> SocketAddress!
5050

5151
@JavaMethod
52-
open func setReuseAddress(_ arg0: Bool) throws
52+
open func getLocalSocketAddress() -> SocketAddress!
5353

5454
@JavaMethod
55-
open func getReuseAddress() throws -> Bool
55+
open func receive(_ arg0: DatagramPacket?) throws
5656

5757
@JavaMethod
58-
open func setReceiveBufferSize(_ arg0: Int32) throws
58+
open func getLocalAddress() -> InetAddress!
5959

6060
@JavaMethod
61-
open func getReceiveBufferSize() throws -> Int32
61+
open func getLocalPort() -> Int32
6262

6363
@JavaMethod
64-
open func connect(_ arg0: SocketAddress?) throws
64+
open func setSoTimeout(_ arg0: Int32) throws
6565

6666
@JavaMethod
67-
open func connect(_ arg0: InetAddress?, _ arg1: Int32)
67+
open func getSoTimeout() throws -> Int32
6868

6969
@JavaMethod
70-
open func send(_ arg0: DatagramPacket?) throws
70+
open func setSendBufferSize(_ arg0: Int32) throws
7171

7272
@JavaMethod
73-
open func disconnect()
73+
open func getSendBufferSize() throws -> Int32
7474

7575
@JavaMethod
76-
open func receive(_ arg0: DatagramPacket?) throws
76+
open func setReceiveBufferSize(_ arg0: Int32) throws
7777

7878
@JavaMethod
79-
open func joinGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
79+
open func getReceiveBufferSize() throws -> Int32
8080

8181
@JavaMethod
82-
open func leaveGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
82+
open func setReuseAddress(_ arg0: Bool) throws
8383

8484
@JavaMethod
85-
open func isConnected() -> Bool
85+
open func getReuseAddress() throws -> Bool
8686

8787
@JavaMethod
88-
open func getRemoteSocketAddress() -> SocketAddress!
88+
open func setBroadcast(_ arg0: Bool) throws
8989

9090
@JavaMethod
91-
open func getLocalAddress() -> InetAddress!
91+
open func setTrafficClass(_ arg0: Int32) throws
9292

9393
@JavaMethod
94-
open func setSendBufferSize(_ arg0: Int32) throws
94+
open func getTrafficClass() throws -> Int32
9595

9696
@JavaMethod
97-
open func getSendBufferSize() throws -> Int32
97+
open func isClosed() -> Bool
9898

9999
@JavaMethod
100-
open func setBroadcast(_ arg0: Bool) throws
100+
open func setOption(_ arg0: SocketOption<JavaObject>?, _ arg1: JavaObject?) throws -> DatagramSocket!
101101

102102
@JavaMethod
103-
open func setTrafficClass(_ arg0: Int32) throws
103+
open func getOption(_ arg0: SocketOption<JavaObject>?) throws -> JavaObject!
104104

105105
@JavaMethod
106-
open func getTrafficClass() throws -> Int32
106+
open func supportedOptions() -> JavaSet<SocketOption<JavaObject>>!
107107

108108
@JavaMethod
109109
open func close()

‎Sources/AndroidJavaNet/DatagramSocketImpl.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,52 @@ open class DatagramSocketImpl: JavaObject {
1010
@_nonoverride public convenience init(environment: JNIEnvironment? = nil)
1111

1212
@JavaMethod
13-
open func getLocalPort() -> Int32
13+
open func connect(_ arg0: InetAddress?, _ arg1: Int32) throws
1414

1515
@JavaMethod
16-
open func setOption(_ arg0: SocketOption<JavaObject>?, _ arg1: JavaObject?) throws
16+
open func setTTL(_ arg0: Int8) throws
1717

1818
@JavaMethod
19-
open func getOption(_ arg0: SocketOption<JavaObject>?) throws -> JavaObject!
19+
open func setTimeToLive(_ arg0: Int32) throws
2020

2121
@JavaMethod
22-
open func supportedOptions() -> JavaSet<SocketOption<JavaObject>>!
22+
open func getTTL() throws -> Int8
2323

2424
@JavaMethod
25-
open func connect(_ arg0: InetAddress?, _ arg1: Int32) throws
25+
open func joinGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
2626

2727
@JavaMethod
28-
open func send(_ arg0: DatagramPacket?) throws
28+
open func leaveGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
2929

3030
@JavaMethod
31-
open func disconnect()
31+
open func send(_ arg0: DatagramPacket?) throws
3232

3333
@JavaMethod
34-
open func peekData(_ arg0: DatagramPacket?) throws -> Int32
34+
open func disconnect()
3535

3636
@JavaMethod
3737
open func receive(_ arg0: DatagramPacket?) throws
3838

3939
@JavaMethod
40-
open func setTTL(_ arg0: Int8) throws
40+
open func getLocalPort() -> Int32
4141

4242
@JavaMethod
43-
open func getTTL() throws -> Int8
43+
open func setOption(_ arg0: SocketOption<JavaObject>?, _ arg1: JavaObject?) throws
4444

4545
@JavaMethod
46-
open func setTimeToLive(_ arg0: Int32) throws
46+
open func getOption(_ arg0: SocketOption<JavaObject>?) throws -> JavaObject!
4747

4848
@JavaMethod
49-
open func leave(_ arg0: InetAddress?) throws
49+
open func supportedOptions() -> JavaSet<SocketOption<JavaObject>>!
5050

5151
@JavaMethod
52-
open func joinGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
52+
open func getFileDescriptor() -> FileDescriptor!
5353

5454
@JavaMethod
55-
open func leaveGroup(_ arg0: SocketAddress?, _ arg1: NetworkInterface?) throws
55+
open func peekData(_ arg0: DatagramPacket?) throws -> Int32
5656

5757
@JavaMethod
58-
open func getFileDescriptor() -> FileDescriptor!
58+
open func leave(_ arg0: InetAddress?) throws
5959

6060
@JavaMethod
6161
open func join(_ arg0: InetAddress?) throws

‎Sources/AndroidJavaNet/MulticastSocket.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@ import JavaRuntime
44

55
@JavaClass("java.net.MulticastSocket")
66
open class MulticastSocket: DatagramSocket {
7-
@JavaMethod
8-
@_nonoverride public convenience init(_ arg0: SocketAddress?, environment: JNIEnvironment? = nil) throws
9-
107
@JavaMethod
118
@_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) throws
129

1310
@JavaMethod
14-
@_nonoverride public convenience init(environment: JNIEnvironment? = nil) throws
11+
@_nonoverride public convenience init(_ arg0: SocketAddress?, environment: JNIEnvironment? = nil) throws
1512

1613
@JavaMethod
17-
open func send(_ arg0: DatagramPacket?, _ arg1: Int8) throws
14+
@_nonoverride public convenience init(environment: JNIEnvironment? = nil) throws
1815

1916
@JavaMethod
2017
open func setTTL(_ arg0: Int8) throws
2118

2219
@JavaMethod
23-
open func getTTL() throws -> Int8
20+
open func setTimeToLive(_ arg0: Int32) throws
2421

2522
@JavaMethod
26-
open func setTimeToLive(_ arg0: Int32) throws
23+
open func getTTL() throws -> Int8
2724

2825
@JavaMethod
2926
open func joinGroup(_ arg0: InetAddress?) throws
@@ -55,6 +52,9 @@ open class MulticastSocket: DatagramSocket {
5552
@JavaMethod
5653
open func getLoopbackMode() throws -> Bool
5754

55+
@JavaMethod
56+
open func send(_ arg0: DatagramPacket?, _ arg1: Int8) throws
57+
5858
@JavaMethod
5959
open func getTimeToLive() throws -> Int32
6060
}

‎Sources/AndroidJavaNet/Proxy.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import JavaRuntime
55
@JavaClass("java.net.Proxy")
66
open class Proxy: JavaObject {
77
@JavaMethod
8-
@_nonoverride public convenience init(_ arg0: Proxy.`Type`?, _ arg1: SocketAddress?, environment: JNIEnvironment? = nil)
8+
@_nonoverride public convenience init(_ arg0: ProxyType?, _ arg1: SocketAddress?, environment: JNIEnvironment? = nil)
99

1010
@JavaMethod
11-
open func type() -> Proxy.`Type`!
11+
open func type() -> ProxyType!
1212

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

‎Sources/AndroidJavaNet/Proxy+`Type`.swift renamed to ‎Sources/AndroidJavaNet/ProxyType.swift

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,34 @@ import AndroidJavaLang
33
import JavaKit
44
import JavaRuntime
55

6-
extension Proxy {
7-
@JavaClass("java.net.Proxy$Type")
8-
open class Type: Enum {
9-
public enum TypeCases: Equatable {
10-
case DIRECT
11-
case HTTP
12-
case SOCKS
13-
}
6+
@JavaClass("java.net.Proxy$Type")
7+
open class ProxyType: Enum {
8+
public enum ProxyTypeCases: Equatable {
9+
case DIRECT
10+
case HTTP
11+
case SOCKS
12+
}
1413

15-
public var enumValue: TypeCases! {
16-
let classObj = self.javaClass
17-
if self.equals(classObj.DIRECT?.as(JavaObject.self)) {
18-
return TypeCases.DIRECT
19-
} else if self.equals(classObj.HTTP?.as(JavaObject.self)) {
20-
return TypeCases.HTTP
21-
} else if self.equals(classObj.SOCKS?.as(JavaObject.self)) {
22-
return TypeCases.SOCKS
23-
} else {
24-
return nil
25-
}
14+
public var enumValue: ProxyTypeCases! {
15+
let classObj = self.javaClass
16+
if self.equals(classObj.DIRECT?.as(JavaObject.self)) {
17+
return ProxyTypeCases.DIRECT
18+
} else if self.equals(classObj.HTTP?.as(JavaObject.self)) {
19+
return ProxyTypeCases.HTTP
20+
} else if self.equals(classObj.SOCKS?.as(JavaObject.self)) {
21+
return ProxyTypeCases.SOCKS
22+
} else {
23+
return nil
2624
}
25+
}
2726

28-
public convenience init(_ enumValue: TypeCases, environment: JNIEnvironment? = nil) {
27+
public convenience init(_ enumValue: ProxyTypeCases, environment: JNIEnvironment? = nil) {
2928
let _environment = if let environment {
3029
environment
3130
} else {
3231
try! JavaVirtualMachine.shared().environment()
3332
}
34-
let classObj = try! JavaClass<Type>(environment: _environment)
33+
let classObj = try! JavaClass<ProxyType>(environment: _environment)
3534
switch enumValue {
3635
case .DIRECT:
3736
if let DIRECT = classObj.DIRECT {
@@ -53,21 +52,27 @@ extension Proxy {
5352
}
5453
}
5554
}
55+
}
56+
extension ProxyType {
57+
@JavaClass("java.lang.Enum$EnumDesc")
58+
open class EnumDesc<E: AnyJavaObject>: JavaObject {
59+
@JavaMethod
60+
open override func toString() -> String
5661
}
5762
}
58-
extension JavaClass<Proxy.Type> {
63+
extension JavaClass<ProxyType> {
5964
@JavaStaticField(isFinal: true)
60-
public var DIRECT: Proxy.`Type`!
65+
public var DIRECT: ProxyType!
6166

6267
@JavaStaticField(isFinal: true)
63-
public var HTTP: Proxy.`Type`!
68+
public var HTTP: ProxyType!
6469

6570
@JavaStaticField(isFinal: true)
66-
public var SOCKS: Proxy.`Type`!
71+
public var SOCKS: ProxyType!
6772

6873
@JavaStaticMethod
69-
public func values() -> [Proxy.`Type`?]
74+
public func values() -> [ProxyType?]
7075

7176
@JavaStaticMethod
72-
public func valueOf(_ arg0: String) -> Proxy.`Type`!
77+
public func valueOf(_ arg0: String) -> ProxyType!
7378
}

0 commit comments

Comments
 (0)