Skip to content

Commit 9f1cf99

Browse files
author
Alexey Khokhlov
committed
4.0.1
1 parent c9300e1 commit 9f1cf99

52 files changed

Lines changed: 4082 additions & 11049 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ProtocolBuffers-Swift.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ProtocolBuffers-Swift"
3-
s.version = "3.0.28"
3+
s.version = "4.0.1"
44
s.summary = "Protocol Buffers for Swift"
55
s.homepage = "http://protobuf.io#swift"
66
s.license = "Apache 2.0"

‎Source/AbstractMessage.swift‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public enum ProtocolBuffersError: Error {
3535
public protocol ProtocolBuffersMessage:ProtocolBuffersMessageInit {
3636
var unknownFields:UnknownFieldSet{get}
3737
func serializedSize() -> Int32
38-
func isInitialized() -> Bool
38+
func isInitialized() throws
3939
func writeTo(codedOutputStream:CodedOutputStream) throws
4040
func writeTo(outputStream:OutputStream) throws
4141
func data() throws -> Data
@@ -53,7 +53,7 @@ public protocol ProtocolBuffersMessage:ProtocolBuffersMessageInit {
5353
public protocol ProtocolBuffersMessageBuilder {
5454
var unknownFields:UnknownFieldSet{get set}
5555
func clear() -> Self
56-
func isInitialized()-> Bool
56+
func isInitialized() throws
5757
func build() throws -> AbstractProtocolBuffersMessage
5858
func merge(unknownField:UnknownFieldSet) throws -> Self
5959
func mergeFrom(codedInputStream:CodedInputStream) throws -> Self
@@ -90,8 +90,7 @@ open class AbstractProtocolBuffersMessage:Hashable, ProtocolBuffersMessage {
9090
catch {}
9191
return Data(bytes: stream.buffer.buffer, count: Int(ser_size))
9292
}
93-
open func isInitialized() -> Bool {
94-
return false
93+
open func isInitialized() throws {
9594
}
9695
open func serializedSize() -> Int32 {
9796
return 0
@@ -173,8 +172,7 @@ open class AbstractProtocolBuffersMessageBuilder:ProtocolBuffersMessageBuilder {
173172
return self
174173
}
175174

176-
open func isInitialized() -> Bool {
177-
return false
175+
open func isInitialized() throws {
178176
}
179177
@discardableResult
180178
open func mergeFrom(codedInputStream:CodedInputStream) throws -> Self {

‎Source/ExtendableMessage.swift‎

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -44,38 +44,28 @@ open class ExtendableMessage : GeneratedMessage
4444
}
4545
//
4646

47-
public func isInitialized(object:Any) -> Bool
47+
public func isInitialized(object:Any) throws
4848
{
4949
switch object
5050
{
5151
case let array as Array<Any>:
52-
for child in array
53-
{
54-
if (!isInitialized(object: child))
55-
{
56-
return false
57-
}
52+
for child in array {
53+
try isInitialized(object: child)
5854
}
5955
case let array as Array<GeneratedMessage>:
60-
for child in array
61-
{
62-
if (!isInitialized(object: child))
63-
{
64-
return false
65-
}
56+
for child in array {
57+
try isInitialized(object: child)
6658
}
6759
case let message as GeneratedMessage:
68-
return message.isInitialized()
60+
try message.isInitialized()
6961
default:
70-
return true
62+
return
7163
}
72-
73-
return true
7464
}
7565

76-
open func extensionsAreInitialized() -> Bool {
66+
open func extensionsAreInitialized() throws {
7767
let arr = Array(extensionMap.values)
78-
return isInitialized(object:arr)
68+
try isInitialized(object:arr)
7969
}
8070

8171
internal func ensureExtensionIsRegistered(extensions:ConcreateExtensionField)
@@ -291,31 +281,21 @@ open class ExtendableMessageBuilder:GeneratedMessageBuilder
291281
}
292282

293283

294-
override open func checkInitialized() throws
295-
{
284+
override open func checkInitialized() throws {
296285
let result = internalGetResult
297-
if (!result.isInitialized())
298-
{
299-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
300-
}
286+
try result.isInitialized()
301287
}
302288

303-
override open func checkInitializedParsed() throws
304-
{
289+
override open func checkInitializedParsed() throws {
305290
let result = internalGetResult
306-
if (!result.isInitialized())
307-
{
308-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
309-
}
291+
try result.isInitialized()
310292
}
311293

312-
override open func isInitialized() -> Bool
313-
{
314-
return internalGetResult.isInitialized()
294+
override open func isInitialized() throws {
295+
try internalGetResult.isInitialized()
315296
}
316297
@discardableResult
317-
override open func merge(unknownField: UnknownFieldSet) throws -> Self
318-
{
298+
override open func merge(unknownField: UnknownFieldSet) throws -> Self {
319299
let result:GeneratedMessage = internalGetResult
320300
result.unknownFields = try UnknownFieldSet.builderWithUnknownFields(copyFrom: result.unknownFields).merge(unknownFields: unknownField).build()
321301
return self

‎Source/GeneratedMessage.swift‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public protocol GeneratedMessageProtocol: ProtocolBuffersMessage {
2828
subscript(key: String) -> Any? { get }
2929
}
3030

31+
3132
public protocol GeneratedEnum:RawRepresentable, CustomDebugStringConvertible, CustomStringConvertible, Hashable {
3233
func toString() -> String
3334
static func fromString(_ str:String) throws -> Self
@@ -90,28 +91,18 @@ open class GeneratedMessageBuilder:AbstractProtocolBuffersMessageBuilder
9091
}
9192

9293
}
93-
public func checkInitialized() throws
94-
{
94+
public func checkInitialized() throws {
9595
let result = internalGetResult
96-
97-
guard result.isInitialized() else
98-
{
99-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
100-
}
96+
try result.isInitialized()
10197
}
10298

103-
public func checkInitializedParsed() throws
104-
{
99+
public func checkInitializedParsed() throws {
105100
let result = internalGetResult
106-
guard result.isInitialized() else
107-
{
108-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
109-
}
101+
try result.isInitialized()
110102
}
111103

112-
override open func isInitialized() -> Bool
113-
{
114-
return internalGetResult.isInitialized()
104+
override open func isInitialized() throws {
105+
try internalGetResult.isInitialized()
115106
}
116107
@discardableResult
117108
override open func merge(unknownField: UnknownFieldSet) throws -> Self

‎Source/Google.Protobuf.Any.proto.swift‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// Generated by the Protocol Buffers 3.4.0 compiler. DO NOT EDIT!
1+
/// Generated by the Protocol Buffers 3.5.0 compiler. DO NOT EDIT!
22
/// Protobuf-swift version: 4.0.0
33
/// Source file "any.proto"
44
/// Syntax "Proto3"
@@ -91,8 +91,7 @@ public extension Google.Protobuf {
9191
required public init() {
9292
super.init()
9393
}
94-
override public func isInitialized() -> Bool {
95-
return true
94+
override public func isInitialized() throws {
9695
}
9796
override public func writeTo(codedOutputStream: CodedOutputStream) throws {
9897
if hasTypeUrl {
@@ -139,10 +138,7 @@ public extension Google.Protobuf {
139138
return try Google.Protobuf.`Any`.Builder().mergeFrom(other:prototype)
140139
}
141140
override public func encode() throws -> Dictionary<String,Any> {
142-
guard isInitialized() else {
143-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
144-
}
145-
141+
try isInitialized()
146142
var jsonMap:Dictionary<String,Any> = Dictionary<String,Any>()
147143
if hasTypeUrl {
148144
jsonMap["typeUrl"] = typeUrl

‎Source/Google.Protobuf.Api.proto.swift‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// Generated by the Protocol Buffers 3.4.0 compiler. DO NOT EDIT!
1+
/// Generated by the Protocol Buffers 3.5.0 compiler. DO NOT EDIT!
22
/// Protobuf-swift version: 4.0.0
33
/// Source file "api.proto"
44
/// Syntax "Proto3"
@@ -75,8 +75,7 @@ public extension Google.Protobuf {
7575
required public init() {
7676
super.init()
7777
}
78-
override public func isInitialized() -> Bool {
79-
return true
78+
override public func isInitialized() throws {
8079
}
8180
override public func writeTo(codedOutputStream: CodedOutputStream) throws {
8281
if hasName {
@@ -143,10 +142,7 @@ public extension Google.Protobuf {
143142
return try Google.Protobuf.Api.Builder().mergeFrom(other:prototype)
144143
}
145144
override public func encode() throws -> Dictionary<String,Any> {
146-
guard isInitialized() else {
147-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
148-
}
149-
145+
try isInitialized()
150146
var jsonMap:Dictionary<String,Any> = Dictionary<String,Any>()
151147
if hasName {
152148
jsonMap["name"] = name
@@ -599,8 +595,7 @@ public extension Google.Protobuf {
599595
required public init() {
600596
super.init()
601597
}
602-
override public func isInitialized() -> Bool {
603-
return true
598+
override public func isInitialized() throws {
604599
}
605600
override public func writeTo(codedOutputStream: CodedOutputStream) throws {
606601
if hasName {
@@ -671,10 +666,7 @@ public extension Google.Protobuf {
671666
return try Google.Protobuf.Method.Builder().mergeFrom(other:prototype)
672667
}
673668
override public func encode() throws -> Dictionary<String,Any> {
674-
guard isInitialized() else {
675-
throw ProtocolBuffersError.invalidProtocolBuffer("Uninitialized Message")
676-
}
677-
669+
try isInitialized()
678670
var jsonMap:Dictionary<String,Any> = Dictionary<String,Any>()
679671
if hasName {
680672
jsonMap["name"] = name

0 commit comments

Comments
 (0)