Add possibility to get the assets from LCU API with example and updat…

…e generated classes to version 9.16

README.md

@@ -14,7 +14,7 @@ This product is not endorsed, certified or otherwise approved in any way by Riot
 
 ## Setup
 
-This project is available on [Jitpack](https://jitpack.io/#stirante/lol-client-java-api/1.0.3)
+This project is available on [Jitpack](https://jitpack.io/#stirante/lol-client-java-api/1.1.4)
 
 ### Gradle
 
@@ -33,7 +33,7 @@ Add the project as a dependency:
 
 ```java
 dependencies {
-	compile 'com.github.stirante:lol-client-java-api:1.1.2'
+	compile 'com.github.stirante:lol-client-java-api:1.1.4'
 }
 ```
 
@@ -56,7 +56,7 @@ Add the project as a dependency:
 <dependency>
     <groupId>com.github.stirante</groupId>
     <artifactId>lol-client-java-api</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.4</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.stirante</groupId>
     <artifactId>lol-client-java-api</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
 
     <properties>
         <java.version>1.8</java.version>

src/main/java/com/stirante/lolclient/ClientApi.java

@@ -3,21 +3,20 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import generated.*;
-import org.apache.http.NameValuePair;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.EntityBuilder;
 import org.apache.http.client.methods.*;
-import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 import javax.net.ssl.*;
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
@@ -504,6 +503,10 @@ private <T> T decodeResponse(InputStream in, Class<T> clz) throws IOException {
         }
     }
 
+    public InputStream getAsset(String plugin, String path) throws IOException {
+        return executeBinaryGet(plugin + "/assets/" + URLEncoder.encode(path, StandardCharsets.UTF_8.name()));
+    }
+
     public boolean isAuthorized() throws IOException {
         try {
             return executeGet("/lol-summoner/v1/current-summoner", LolSummonerSummoner.class).accountId > 0;
@@ -525,6 +528,17 @@ public <T> T executeGet(String path, Class<T> clz) throws IOException {
         return getResponseObject(clz, conn);
     }
 
+    public InputStream executeBinaryGet(String path) throws IOException {
+        HttpGet conn = getConnection(path, new HttpGet());
+        CloseableHttpResponse response = client.execute(conn);
+        boolean b = response.getStatusLine().getStatusCode() == 200;
+        if (!b) {
+            EntityUtils.consume(response.getEntity());
+            return null;
+        }
+        return response.getEntity().getContent();
+    }
+
     public <T> T executeGet(String path, Class<T> clz, String... queryParams) throws IOException {
         HttpGet conn = getConnection(path, new HttpGet(), queryParams);
         return getResponseObject(clz, conn);
@@ -600,26 +614,29 @@ private <T extends HttpRequestBase> boolean isOk(T method) throws IOException {
     /**
      * Prepares Http request with proper URL and authorization.
      * Simple usage: getConnection("/endpoint", new HttpGet(), "key1", "value1", key2", "value2")
-     * @param endpoint endpoint
-     * @param method Base request
+     *
+     * @param endpoint    endpoint
+     * @param method      Base request
      * @param queryParams Pairs of get parameters. Must be divisible by 2.
      */
     private <T extends HttpRequestBase> T getConnection(String endpoint, T method, String... queryParams) {
         if (!connected.get()) {
             throw new IllegalStateException("API not connected!");
         }
         try {
-            List<NameValuePair> params = new ArrayList<>();
+            StringBuilder sb = new StringBuilder("https://127.0.0.1:").append(port).append("/").append(endpoint);
+            boolean addedParams = false;
             for (int i = 0; i < queryParams.length; i += 2) {
-                params.add(new BasicNameValuePair(queryParams[i], queryParams[i + 1]));
+                if (!addedParams) {
+                    sb.append("?");
+                    addedParams = true;
+                }
+                else {
+                    sb.append("&");
+                }
+                sb.append(queryParams[i]).append("=").append(queryParams[i + 1]);
             }
-            URI uri = new URIBuilder()
-                    .setScheme("https")
-                    .setHost("127.0.0.1")
-                    .setPath(endpoint)
-                    .setPort(port)
-                    .addParameters(params)
-                    .build();
+            URI uri = new URI(sb.toString());
             if (!disableEndpointWarnings.get()) {
                 String path = uri.getPath().substring(1, uri.getPath().substring(1).indexOf('/') + 1);
                 if (!ALLOWED_ENDPOINTS.contains(path)) {
@@ -632,8 +649,7 @@ private <T extends HttpRequestBase> T getConnection(String endpoint, T method, S
             }
             method.setURI(uri);
             method.addHeader("Authorization", "Basic " + token);
-            method.addHeader("Content-Type", "application/json");
-            method.addHeader("Accept", "application/json");
+            method.addHeader("Accept", "*/*");
             method.setConfig(requestConfig);
             return method;
         } catch (URISyntaxException e) {

src/main/java/examples/AssetsExample.java

@@ -0,0 +1,43 @@
+package examples;
+
+import com.stirante.lolclient.ClientApi;
+import com.stirante.lolclient.ClientConnectionListener;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+public class AssetsExample {
+
+    /**
+     * Simple example, which shows how to access assets from LCU API
+     */
+    public static void main(String[] args) {
+        //Initialize API
+        ClientApi api = new ClientApi();
+        //Add listener, which will notify us about client connection available
+        api.addClientConnectionListener(new ClientConnectionListener() {
+            @Override
+            public void onClientConnected() {
+                try {
+                    //Get "v1/champion-splashes/1/1000.jpg" (Annie's centered splash art) from plugin "lol-game-data"
+                    //Result will be this: http://raw.communitydragon.org/latest/plugins/rcp-be-lol-game-data/global/default/v1/champion-splashes/2/2000.jpg
+                    InputStream input = api.getAsset("lol-game-data", "v1/champion-splashes/1/1000.jpg");
+                    //Save file locally
+                    Files.copy(input, new File("Annie.jpg").toPath(), StandardCopyOption.REPLACE_EXISTING);
+                    //Close stream
+                    input.close();
+                    api.stop();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onClientDisconnected() {
+
+            }
+        });
+    }
+}

src/main/java/generated/LolChatBlocked.java

@@ -2,6 +2,8 @@
 
 public class LolChatBlocked {
 
+	public String game_name;
+	public String game_tag;
 	public String name;
 	public String pid;
 

src/main/java/generated/LolChatBlockedPlayerResource.java

@@ -2,7 +2,10 @@
 
 public class LolChatBlockedPlayerResource {
 
+	public String gameName;
+	public String gameTag;
 	public Long id;
 	public String name;
+	public String pid;
 
 }

src/main/java/generated/LolChatChatMessage.java

@@ -4,6 +4,8 @@ public class LolChatChatMessage {
 
 	public String body;
 	public String cid;
+	public String game_name;
+	public String game_tag;
 	public String id;
 	public String mid;
 	public String name;

src/main/java/generated/LolChatConversationMessageResource.java

@@ -4,6 +4,7 @@ public class LolChatConversationMessageResource {
 
 	public String body;
 	public Long fromId;
+	public String fromPid;
 	public String id;
 	public Boolean isHistorical;
 	public String timestamp;

src/main/java/generated/LolChatConversationResource.java

@@ -2,12 +2,15 @@
 
 public class LolChatConversationResource {
 
+	public String gameName;
+	public String gameTag;
 	public String id;
 	public String inviterId;
 	public Boolean isMuted;
 	public LolChatConversationMessageResource lastMessage;
 	public String name;
 	public String password;
+	public String pid;
 	public String type;
 	public Long unreadMessageCount;
 

src/main/java/generated/LolChatFriend.java

@@ -3,6 +3,8 @@
 public class LolChatFriend {
 
 	public String displayGroup;
+	public String game_name;
+	public String game_tag;
 	public String group;
 	public String name;
 	public String note;

src/main/java/generated/LolChatFriendRequest.java

@@ -2,6 +2,8 @@
 
 public class LolChatFriendRequest {
 
+	public String game_name;
+	public String game_tag;
 	public String name;
 	public String note;
 	public String pid;

src/main/java/generated/LolChatFriendRequestAdd.java

@@ -2,6 +2,8 @@
 
 public class LolChatFriendRequestAdd {
 
+	public String game_name;
+	public String game_tag;
 	public String name;
 	public String note;
 	public String pid;

src/main/java/generated/LolChatFriendRequestResource.java

@@ -3,8 +3,11 @@
 public class LolChatFriendRequestResource {
 
 	public LolChatFriendRequestDirection direction;
+	public String gameName;
+	public String gameTag;
 	public Long id;
 	public String name;
 	public String note;
+	public String pid;
 
 }

src/main/java/generated/LolChatFriendResource.java

@@ -4,6 +4,8 @@ public class LolChatFriendResource {
 
 	public String availability;
 	public Integer displayGroupId;
+	public String gameName;
+	public String gameTag;
 	public Integer groupId;
 	public Integer icon;
 	public Long id;
@@ -12,6 +14,11 @@ public class LolChatFriendResource {
 	public Object lol;
 	public String name;
 	public String note;
+	public String pid;
+	public String platformId;
+	public String product;
 	public String statusMessage;
+	public String summary;
+	public Long time;
 
 }

src/main/java/generated/LolChatIdBody.java

@@ -0,0 +1,7 @@
+package generated;
+
+public class LolChatIdBody {
+
+	public String id;
+
+}

src/main/java/generated/LolChatLeagueQueueType.java

@@ -6,11 +6,13 @@ public enum LolChatLeagueQueueType {
 
 	@SerializedName("NONE")
 	NONE,
-	@SerializedName("SOLO5V5")
-	SOLO5V5,
-	@SerializedName("FLEXTT")
-	FLEXTT,
-	@SerializedName("FLEXSR")
-	FLEXSR
+	@SerializedName("RANKED_SOLO_5x5")
+	RANKED_SOLO_5X5,
+	@SerializedName("RANKED_FLEX_SR")
+	RANKED_FLEX_SR,
+	@SerializedName("RANKED_FLEX_TT")
+	RANKED_FLEX_TT,
+	@SerializedName("RANKED_TFT")
+	RANKED_TFT
 
 }