Skip to content

Commit b75a434

Browse files
FabianTerhorstGrover-c13
authored andcommitted
add lombok to more objects (#212)
* add lombok to more objects * add lombok to GoogleAuthJson * add lombok to Team
1 parent 1a44e76 commit b75a434

File tree

6 files changed

+47
-124
lines changed

6 files changed

+47
-124
lines changed

src/main/java/com/pokegoapi/api/inventory/Item.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717

1818
import POGOProtos.Inventory.Item.ItemDataOuterClass;
1919
import POGOProtos.Inventory.Item.ItemIdOuterClass.ItemId;
20+
import lombok.Getter;
21+
import lombok.Setter;
2022

2123
public class Item {
2224
private ItemDataOuterClass.ItemData proto;
25+
@Getter
26+
@Setter
2327
private int count;
2428

2529
public Item(ItemDataOuterClass.ItemData proto) {
@@ -31,14 +35,6 @@ public ItemId getItemId() {
3135
return proto.getItemId();
3236
}
3337

34-
public int getCount() {
35-
return count;
36-
}
37-
38-
public void setCount(int count) {
39-
this.count = count;
40-
}
41-
4238
public boolean isUnseen() {
4339
return proto.getUnseen();
4440
}

src/main/java/com/pokegoapi/api/player/Team.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@
1515

1616
package com.pokegoapi.api.player;
1717

18+
import lombok.Getter;
19+
1820
public enum Team {
1921
// VALUES CONFIRMED
2022
TEAM_NONE(0),
2123
TEAM_MYSTIC(1),
2224
TEAM_VALOR(2),
2325
TEAM_INSTINCT(3);
2426

27+
@Getter
2528
private int value;
2629

2730
private Team(int value) {
2831
this.value = value;
2932
}
30-
31-
public int getValue() {
32-
return value;
33-
}
3433
}

src/main/java/com/pokegoapi/auth/GoogleAuthJson.java

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,28 @@
1717

1818
import com.squareup.moshi.Json;
1919

20+
import lombok.Getter;
21+
import lombok.Setter;
22+
2023
public class GoogleAuthJson {
24+
@Getter
25+
@Setter
2126
@Json(name = "device_code")
2227
String deviceCode;
28+
@Getter
29+
@Setter
2330
@Json(name = "user_code")
2431
String userCode;
32+
@Getter
33+
@Setter
2534
@Json(name = "verification_url")
2635
String verificationUrl;
36+
@Getter
37+
@Setter
2738
@Json(name = "expires_in")
2839
int expiresIn;
40+
@Getter
41+
@Setter
2942
@Json(name = "interval")
3043
int interval;
31-
32-
public String getDeviceCode() {
33-
return deviceCode;
34-
}
35-
36-
public void setDeviceCode(String deviceCode) {
37-
this.deviceCode = deviceCode;
38-
}
39-
40-
public String getUserCode() {
41-
return userCode;
42-
}
43-
44-
public void setUserCode(String userCode) {
45-
this.userCode = userCode;
46-
}
47-
48-
public String getVerificationUrl() {
49-
return verificationUrl;
50-
}
51-
52-
public void setVerificationUrl(String verificationUrl) {
53-
this.verificationUrl = verificationUrl;
54-
}
55-
56-
public int getExpiresIn() {
57-
return expiresIn;
58-
}
59-
60-
public void setExpiresIn(int expiresIn) {
61-
this.expiresIn = expiresIn;
62-
}
63-
64-
public int getInterval() {
65-
return interval;
66-
}
67-
68-
public void setInterval(int interval) {
69-
this.interval = interval;
70-
}
7144
}

src/main/java/com/pokegoapi/auth/GoogleAuthTokenJson.java

Lines changed: 15 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -17,64 +17,31 @@
1717

1818
import com.squareup.moshi.Json;
1919

20+
import lombok.Getter;
21+
import lombok.Setter;
22+
2023
public class GoogleAuthTokenJson {
24+
@Getter
25+
@Setter
2126
private String error;
27+
@Getter
28+
@Setter
2229
@Json(name = "access_token")
2330
private String accessToken;
31+
@Getter
32+
@Setter
2433
@Json(name = "token_type")
2534
private String tokenType;
35+
@Getter
36+
@Setter
2637
@Json(name = "expires_in")
2738
private int expiresIn;
39+
@Getter
40+
@Setter
2841
@Json(name = "refresh_token")
2942
private String refreshToken;
43+
@Getter
44+
@Setter
3045
@Json(name = "id_token")
3146
private String idToken;
32-
33-
public String getError() {
34-
return error;
35-
}
36-
37-
public void setError(String error) {
38-
this.error = error;
39-
}
40-
41-
public String getAccessToken() {
42-
return accessToken;
43-
}
44-
45-
public void setAccessToken(String accessToken) {
46-
this.accessToken = accessToken;
47-
}
48-
49-
public String getTokenType() {
50-
return tokenType;
51-
}
52-
53-
public void setTokenType(String tokenType) {
54-
this.tokenType = tokenType;
55-
}
56-
57-
public int getExpiresIn() {
58-
return expiresIn;
59-
}
60-
61-
public void setExpiresIn(int expiresIn) {
62-
this.expiresIn = expiresIn;
63-
}
64-
65-
public String getRefreshToken() {
66-
return refreshToken;
67-
}
68-
69-
public void setRefreshToken(String refreshToken) {
70-
this.refreshToken = refreshToken;
71-
}
72-
73-
public String getIdToken() {
74-
return idToken;
75-
}
76-
77-
public void setIdToken(String idToken) {
78-
this.idToken = idToken;
79-
}
8047
}

src/main/java/com/pokegoapi/auth/PtcAuthJson.java

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,15 @@
1515

1616
package com.pokegoapi.auth;
1717

18+
import lombok.Getter;
19+
import lombok.Setter;
20+
1821
public class PtcAuthJson {
1922

23+
@Getter
24+
@Setter
2025
private String lt;
26+
@Getter
27+
@Setter
2128
private String execution;
22-
23-
public String getLt() {
24-
return lt;
25-
}
26-
27-
public void setLt(String lt) {
28-
this.lt = lt;
29-
}
30-
31-
public String getExecution() {
32-
return execution;
33-
}
34-
35-
public void setExecution(String execution) {
36-
this.execution = execution;
37-
}
3829
}

src/main/java/com/pokegoapi/auth/PtcError.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515

1616
package com.pokegoapi.auth;
1717

18+
import lombok.Getter;
19+
import lombok.Setter;
20+
1821
public class PtcError {
1922

23+
@Getter
24+
@Setter
2025
private String error;
21-
22-
public String getError() {
23-
return error;
24-
}
25-
26-
public void setError(String error) {
27-
this.error = error;
28-
}
2926
}

0 commit comments

Comments
 (0)