Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions src/main/java/com/pokegoapi/api/inventory/Item.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@

import POGOProtos.Inventory.Item.ItemDataOuterClass;
import POGOProtos.Inventory.Item.ItemIdOuterClass.ItemId;
import lombok.Getter;
import lombok.Setter;

public class Item {
private ItemDataOuterClass.ItemData proto;
@Getter
@Setter
private int count;

public Item(ItemDataOuterClass.ItemData proto) {
Expand All @@ -31,14 +35,6 @@ public ItemId getItemId() {
return proto.getItemId();
}

public int getCount() {
return count;
}

public void setCount(int count) {
this.count = count;
}

public boolean isUnseen() {
return proto.getUnseen();
}
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/pokegoapi/api/player/Team.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@

package com.pokegoapi.api.player;

import lombok.Getter;

public enum Team {
// VALUES CONFIRMED
TEAM_NONE(0),
TEAM_MYSTIC(1),
TEAM_VALOR(2),
TEAM_INSTINCT(3);

@Getter
private int value;

private Team(int value) {
this.value = value;
}

public int getValue() {
return value;
}
}
53 changes: 13 additions & 40 deletions src/main/java/com/pokegoapi/auth/GoogleAuthJson.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,55 +17,28 @@

import com.squareup.moshi.Json;

import lombok.Getter;
import lombok.Setter;

public class GoogleAuthJson {
@Getter
@Setter
@Json(name = "device_code")
String deviceCode;
@Getter
@Setter
@Json(name = "user_code")
String userCode;
@Getter
@Setter
@Json(name = "verification_url")
String verificationUrl;
@Getter
@Setter
@Json(name = "expires_in")
int expiresIn;
@Getter
@Setter
@Json(name = "interval")
int interval;

public String getDeviceCode() {
return deviceCode;
}

public void setDeviceCode(String deviceCode) {
this.deviceCode = deviceCode;
}

public String getUserCode() {
return userCode;
}

public void setUserCode(String userCode) {
this.userCode = userCode;
}

public String getVerificationUrl() {
return verificationUrl;
}

public void setVerificationUrl(String verificationUrl) {
this.verificationUrl = verificationUrl;
}

public int getExpiresIn() {
return expiresIn;
}

public void setExpiresIn(int expiresIn) {
this.expiresIn = expiresIn;
}

public int getInterval() {
return interval;
}

public void setInterval(int interval) {
this.interval = interval;
}
}
63 changes: 15 additions & 48 deletions src/main/java/com/pokegoapi/auth/GoogleAuthTokenJson.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,64 +17,31 @@

import com.squareup.moshi.Json;

import lombok.Getter;
import lombok.Setter;

public class GoogleAuthTokenJson {
@Getter
@Setter
private String error;
@Getter
@Setter
@Json(name = "access_token")
private String accessToken;
@Getter
@Setter
@Json(name = "token_type")
private String tokenType;
@Getter
@Setter
@Json(name = "expires_in")
private int expiresIn;
@Getter
@Setter
@Json(name = "refresh_token")
private String refreshToken;
@Getter
@Setter
@Json(name = "id_token")
private String idToken;

public String getError() {
return error;
}

public void setError(String error) {
this.error = error;
}

public String getAccessToken() {
return accessToken;
}

public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}

public String getTokenType() {
return tokenType;
}

public void setTokenType(String tokenType) {
this.tokenType = tokenType;
}

public int getExpiresIn() {
return expiresIn;
}

public void setExpiresIn(int expiresIn) {
this.expiresIn = expiresIn;
}

public String getRefreshToken() {
return refreshToken;
}

public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}

public String getIdToken() {
return idToken;
}

public void setIdToken(String idToken) {
this.idToken = idToken;
}
}
23 changes: 7 additions & 16 deletions src/main/java/com/pokegoapi/auth/PtcAuthJson.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,15 @@

package com.pokegoapi.auth;

import lombok.Getter;
import lombok.Setter;

public class PtcAuthJson {

@Getter
@Setter
private String lt;
@Getter
@Setter
private String execution;

public String getLt() {
return lt;
}

public void setLt(String lt) {
this.lt = lt;
}

public String getExecution() {
return execution;
}

public void setExecution(String execution) {
this.execution = execution;
}
}
13 changes: 5 additions & 8 deletions src/main/java/com/pokegoapi/auth/PtcError.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@

package com.pokegoapi.auth;

import lombok.Getter;
import lombok.Setter;

public class PtcError {

@Getter
@Setter
private String error;

public String getError() {
return error;
}

public void setError(String error) {
this.error = error;
}
}