Merge remote-tracking branch 'runelite/master'

http-api/src/main/java/net/runelite/http/api/account/OAuthResponse.java

@@ -25,29 +25,11 @@
 package net.runelite.http.api.account;
 
 import java.util.UUID;
+import lombok.Data;
 
+@Data
 public class OAuthResponse
 {
 	private String oauthUrl;
 	private UUID uid;
-
-	public String getOauthUrl()
-	{
-		return oauthUrl;
-	}
-
-	public void setOauthUrl(String oauthUrl)
-	{
-		this.oauthUrl = oauthUrl;
-	}
-
-	public UUID getUid()
-	{
-		return uid;
-	}
-
-	public void setUid(UUID uid)
-	{
-		this.uid = uid;
-	}
 }

http-api/src/main/java/net/runelite/http/api/ws/messages/Handshake.java

@@ -25,19 +25,11 @@
 package net.runelite.http.api.ws.messages;
 
 import java.util.UUID;
+import lombok.Data;
 import net.runelite.http.api.ws.WebsocketMessage;
 
+@Data
 public class Handshake extends WebsocketMessage
 {
 	private UUID session;
-
-	public UUID getSession()
-	{
-		return session;
-	}
-
-	public void setSession(UUID session)
-	{
-		this.session = session;
-	}
 }

http-api/src/main/java/net/runelite/http/api/ws/messages/LoginResponse.java

@@ -24,29 +24,14 @@
  */
 package net.runelite.http.api.ws.messages;
 
+import lombok.Data;
 import net.runelite.http.api.ws.WebsocketMessage;
 
 /**
  * Called after a successful login to the server
- * @author Adam
  */
+@Data
 public class LoginResponse extends WebsocketMessage
 {
 	private String username;
-
-	public String getUsername()
-	{
-		return username;
-	}
-
-	public void setUsername(String username)
-	{
-		this.username = username;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "LoginResponse{" + "username=" + username + '}';
-	}
 }

http-api/src/main/java/net/runelite/http/api/xtea/XteaKey.java

@@ -24,28 +24,11 @@
  */
 package net.runelite.http.api.xtea;
 
+import lombok.Data;
+
+@Data
 public class XteaKey
 {
 	private int region;
 	private int keys[];
-
-	public int getRegion()
-	{
-		return region;
-	}
-
-	public void setRegion(int region)
-	{
-		this.region = region;
-	}
-
-	public int[] getKeys()
-	{
-		return keys;
-	}
-
-	public void setKeys(int[] keys)
-	{
-		this.keys = keys;
-	}
 }

http-api/src/main/java/net/runelite/http/api/xtea/XteaRequest.java

@@ -26,27 +26,14 @@ package net.runelite.http.api.xtea;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Data;
 
+@Data
 public class XteaRequest
 {
 	private int revision;
 	private List<XteaKey> keys = new ArrayList<>();
 
-	public int getRevision()
-	{
-		return revision;
-	}
-
-	public void setRevision(int revision)
-	{
-		this.revision = revision;
-	}
-
-	public List<XteaKey> getKeys()
-	{
-		return keys;
-	}
-
 	public void addKey(XteaKey key)
 	{
 		keys.add(key);