Skip to content

Fix to add override prefixes #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wanbok wants to merge 1 commit into
base: Swift3.0---Version-45
Choose a base branch
from
Open

Fix to add override prefixes #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PGoApi/Classes/protos/Pogoprotos.Data.Badge.PogoprotosDataBadge.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public extension Pogoprotos.Data.Badge {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Badge.BadgeCaptureReward.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Badge.BadgeCaptureReward.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Badge.BadgeCaptureReward.Builder()
if let jsonValueCaptureRewardMultiplier = jsonMap["captureRewardMultiplier"] as? NSNumber {
resultDecodedBuilder.captureRewardMultiplier = jsonValueCaptureRewardMultiplier.floatValue
Expand Down
10 changes: 5 additions & 5 deletions PGoApi/Classes/protos/Pogoprotos.Data.Battle.PogoprotosDataBattle.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ public extension Pogoprotos.Data.Battle {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleAction.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleAction.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Battle.BattleAction.Builder()
if let jsonValueType = jsonMap["type"] as? String {
resultDecodedBuilder.type = try Pogoprotos.Data.Battle.BattleActionType.fromString(str: jsonValueType)
Expand Down Expand Up @@ -1601,7 +1601,7 @@ public extension Pogoprotos.Data.Battle {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleLog.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleLog.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Battle.BattleLog.Builder()
if let jsonValueState = jsonMap["state"] as? String {
resultDecodedBuilder.state = try Pogoprotos.Data.Battle.BattleState.fromString(str: jsonValueState)
Expand Down Expand Up @@ -2045,7 +2045,7 @@ public extension Pogoprotos.Data.Battle {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleParticipant.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleParticipant.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Battle.BattleParticipant.Builder()
if let jsonValueActivePokemon = jsonMap["activePokemon"] as? Dictionary<String,Any> {
resultDecodedBuilder.activePokemon = try Pogoprotos.Data.Battle.BattlePokemonInfo.Builder.decodeToBuilder(jsonMap:jsonValueActivePokemon).build()
Expand Down Expand Up @@ -2400,7 +2400,7 @@ public extension Pogoprotos.Data.Battle {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattlePokemonInfo.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattlePokemonInfo.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Battle.BattlePokemonInfo.Builder()
if let jsonValuePokemonData = jsonMap["pokemonData"] as? Dictionary<String,Any> {
resultDecodedBuilder.pokemonData = try Pogoprotos.Data.PokemonData.Builder.decodeToBuilder(jsonMap:jsonValuePokemonData).build()
Expand Down Expand Up @@ -2849,7 +2849,7 @@ public extension Pogoprotos.Data.Battle {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleResults.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Battle.BattleResults.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Battle.BattleResults.Builder()
if let jsonValueGymState = jsonMap["gymState"] as? Dictionary<String,Any> {
resultDecodedBuilder.gymState = try Pogoprotos.Data.Gym.GymState.Builder.decodeToBuilder(jsonMap:jsonValueGymState).build()
Expand Down
4 changes: 2 additions & 2 deletions PGoApi/Classes/protos/Pogoprotos.Data.Capture.PogoprotosDataCapture.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ public extension Pogoprotos.Data.Capture {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Capture.CaptureAward.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Capture.CaptureAward.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Capture.CaptureAward.Builder()
if let jsonValueActivityType = jsonMap["activityType"] as? Array<String> {
var jsonArrayActivityType:Array<Pogoprotos.Enums.ActivityType> = []
Expand Down Expand Up @@ -782,7 +782,7 @@ public extension Pogoprotos.Data.Capture {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Capture.CaptureProbability.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Capture.CaptureProbability.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Capture.CaptureProbability.Builder()
if let jsonValuePokeballType = jsonMap["pokeballType"] as? Array<String> {
var jsonArrayPokeballType:Array<Pogoprotos.Inventory.Item.ItemId> = []
Expand Down
4 changes: 2 additions & 2 deletions PGoApi/Classes/protos/Pogoprotos.Data.Gym.PogoprotosDataGym.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ public extension Pogoprotos.Data.Gym {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Gym.GymMembership.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Gym.GymMembership.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Gym.GymMembership.Builder()
if let jsonValuePokemonData = jsonMap["pokemonData"] as? Dictionary<String,Any> {
resultDecodedBuilder.pokemonData = try Pogoprotos.Data.PokemonData.Builder.decodeToBuilder(jsonMap:jsonValuePokemonData).build()
Expand Down Expand Up @@ -788,7 +788,7 @@ public extension Pogoprotos.Data.Gym {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Gym.GymState.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Gym.GymState.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Gym.GymState.Builder()
if let jsonValueFortData = jsonMap["fortData"] as? Dictionary<String,Any> {
resultDecodedBuilder.fortData = try Pogoprotos.Map.Fort.FortData.Builder.decodeToBuilder(jsonMap:jsonValueFortData).build()
Expand Down
8 changes: 4 additions & 4 deletions PGoApi/Classes/protos/Pogoprotos.Data.Logs.PogoprotosDataLogs.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public extension Pogoprotos.Data.Logs {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.ActionLogEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.ActionLogEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Logs.ActionLogEntry.Builder()
if let jsonValueTimestampMs = jsonMap["timestampMs"] as? String {
resultDecodedBuilder.timestampMs = Int64(jsonValueTimestampMs)!
Expand Down Expand Up @@ -1014,7 +1014,7 @@ public extension Pogoprotos.Data.Logs {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.BuddyPokemonLogEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.BuddyPokemonLogEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Logs.BuddyPokemonLogEntry.Builder()
if let jsonValueResult = jsonMap["result"] as? String {
resultDecodedBuilder.result = try Pogoprotos.Data.Logs.BuddyPokemonLogEntry.Result.fromString(str: jsonValueResult)
Expand Down Expand Up @@ -1407,7 +1407,7 @@ public extension Pogoprotos.Data.Logs {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.CatchPokemonLogEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.CatchPokemonLogEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Logs.CatchPokemonLogEntry.Builder()
if let jsonValueResult = jsonMap["result"] as? String {
resultDecodedBuilder.result = try Pogoprotos.Data.Logs.CatchPokemonLogEntry.Result.fromString(str: jsonValueResult)
Expand Down Expand Up @@ -1793,7 +1793,7 @@ public extension Pogoprotos.Data.Logs {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.FortSearchLogEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Logs.FortSearchLogEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Logs.FortSearchLogEntry.Builder()
if let jsonValueResult = jsonMap["result"] as? String {
resultDecodedBuilder.result = try Pogoprotos.Data.Logs.FortSearchLogEntry.Result.fromString(str: jsonValueResult)
Expand Down
18 changes: 9 additions & 9 deletions PGoApi/Classes/protos/Pogoprotos.Data.Player.PogoprotosDataPlayer.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.ContactSettings.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.ContactSettings.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.ContactSettings.Builder()
if let jsonValueSendMarketingEmails = jsonMap["sendMarketingEmails"] as? Bool {
resultDecodedBuilder.sendMarketingEmails = jsonValueSendMarketingEmails
Expand Down Expand Up @@ -627,7 +627,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.Currency.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.Currency.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.Currency.Builder()
if let jsonValueName = jsonMap["name"] as? String {
resultDecodedBuilder.name = jsonValueName
Expand Down Expand Up @@ -875,7 +875,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.DailyBonus.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.DailyBonus.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.DailyBonus.Builder()
if let jsonValueNextCollectedTimestampMs = jsonMap["nextCollectedTimestampMs"] as? String {
resultDecodedBuilder.nextCollectedTimestampMs = Int64(jsonValueNextCollectedTimestampMs)!
Expand Down Expand Up @@ -1174,7 +1174,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.EquippedBadge.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.EquippedBadge.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.EquippedBadge.Builder()
if let jsonValueBadgeType = jsonMap["badgeType"] as? String {
resultDecodedBuilder.badgeType = try Pogoprotos.Enums.BadgeType.fromString(str: jsonValueBadgeType)
Expand Down Expand Up @@ -1758,7 +1758,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerAvatar.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerAvatar.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.PlayerAvatar.Builder()
if let jsonValueSkin = jsonMap["skin"] as? NSNumber {
resultDecodedBuilder.skin = jsonValueSkin.int32Value
Expand Down Expand Up @@ -1980,7 +1980,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerCamera.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerCamera.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.PlayerCamera.Builder()
if let jsonValueIsDefaultCamera = jsonMap["isDefaultCamera"] as? Bool {
resultDecodedBuilder.isDefaultCamera = jsonValueIsDefaultCamera
Expand Down Expand Up @@ -2178,7 +2178,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerCurrency.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerCurrency.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.PlayerCurrency.Builder()
if let jsonValueGems = jsonMap["gems"] as? NSNumber {
resultDecodedBuilder.gems = jsonValueGems.int32Value
Expand Down Expand Up @@ -2510,7 +2510,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerPublicProfile.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerPublicProfile.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.PlayerPublicProfile.Builder()
if let jsonValueName = jsonMap["name"] as? String {
resultDecodedBuilder.name = jsonValueName
Expand Down Expand Up @@ -3763,7 +3763,7 @@ public extension Pogoprotos.Data.Player {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerStats.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.Player.PlayerStats.Builder {
let resultDecodedBuilder = Pogoprotos.Data.Player.PlayerStats.Builder()
if let jsonValueLevel = jsonMap["level"] as? NSNumber {
resultDecodedBuilder.level = jsonValueLevel.int32Value
Expand Down
18 changes: 9 additions & 9 deletions PGoApi/Classes/protos/Pogoprotos.Data.PogoprotosData.proto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.AssetDigestEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.AssetDigestEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.AssetDigestEntry.Builder()
if let jsonValueAssetId = jsonMap["assetId"] as? String {
resultDecodedBuilder.assetId = jsonValueAssetId
Expand Down Expand Up @@ -905,7 +905,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.BackgroundToken.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.BackgroundToken.Builder {
let resultDecodedBuilder = Pogoprotos.Data.BackgroundToken.Builder()
if let jsonValueToken = jsonMap["token"] as? String {
resultDecodedBuilder.token = Data(base64Encoded:jsonValueToken, options: Data.Base64DecodingOptions(rawValue:0))!
Expand Down Expand Up @@ -1203,7 +1203,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.BuddyPokemon.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.BuddyPokemon.Builder {
let resultDecodedBuilder = Pogoprotos.Data.BuddyPokemon.Builder()
if let jsonValueId = jsonMap["id"] as? String {
resultDecodedBuilder.id = UInt64(jsonValueId)!
Expand Down Expand Up @@ -1407,7 +1407,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.ClientVersion.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.ClientVersion.Builder {
let resultDecodedBuilder = Pogoprotos.Data.ClientVersion.Builder()
if let jsonValueMinVersion = jsonMap["minVersion"] as? String {
resultDecodedBuilder.minVersion = jsonValueMinVersion
Expand Down Expand Up @@ -1746,7 +1746,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.DownloadUrlEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.DownloadUrlEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.DownloadUrlEntry.Builder()
if let jsonValueAssetId = jsonMap["assetId"] as? String {
resultDecodedBuilder.assetId = jsonValueAssetId
Expand Down Expand Up @@ -2145,7 +2145,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PlayerBadge.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PlayerBadge.Builder {
let resultDecodedBuilder = Pogoprotos.Data.PlayerBadge.Builder()
if let jsonValueBadgeType = jsonMap["badgeType"] as? String {
resultDecodedBuilder.badgeType = try Pogoprotos.Enums.BadgeType.fromString(str: jsonValueBadgeType)
Expand Down Expand Up @@ -3191,7 +3191,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PlayerData.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PlayerData.Builder {
let resultDecodedBuilder = Pogoprotos.Data.PlayerData.Builder()
if let jsonValueCreationTimestampMs = jsonMap["creationTimestampMs"] as? String {
resultDecodedBuilder.creationTimestampMs = Int64(jsonValueCreationTimestampMs)!
Expand Down Expand Up @@ -3636,7 +3636,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PokedexEntry.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PokedexEntry.Builder {
let resultDecodedBuilder = Pogoprotos.Data.PokedexEntry.Builder()
if let jsonValuePokemonId = jsonMap["pokemonId"] as? String {
resultDecodedBuilder.pokemonId = try Pogoprotos.Enums.PokemonId.fromString(str: jsonValuePokemonId)
Expand Down Expand Up @@ -5413,7 +5413,7 @@ public extension Pogoprotos.Data {
}
}
}
class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PokemonData.Builder {
override class public func decodeToBuilder(jsonMap:Dictionary<String,Any>) throws -> Pogoprotos.Data.PokemonData.Builder {
let resultDecodedBuilder = Pogoprotos.Data.PokemonData.Builder()
if let jsonValueId = jsonMap["id"] as? String {
resultDecodedBuilder.id = UInt64(jsonValueId)!
Expand Down
Loading