Merge from release-staging

CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+---------
+## 1.1.0
+##### Domain
+* Bugfix: Fixed wrong REST Api URLs
+
+##### Rest
+* Added support for match-v2.2
+* Added support for matchhistory-v2.2
+* Bugfixes: Various wrong endpoints and bad field types
+
+------
+
+## 1.0.0
+* Initial release

README.md

@@ -1,16 +1,16 @@
 # RiotAPI
 
-Current version: 1.0.0
+Current version: 1.1.0
 
 This is a Java 8 project designed to offer a simple binding to most League of Legends services. Right now this includes:
 
 | module | description |
 |--------|-------------|
-|[domain](./domain) | Holding common information for all other modules. Mostly copies of the client's classes transmitted via RTMP in [com.riotgames](../tree/master/domain/src/main/java/net/boreeas/riotapi/com/riotgames), but also the [Shard](../blob/master/domain/src/main/java/net/boreeas/riotapi/Shard.java) enum, holding constants for all regions |
-|[loginqueue](./loginqueue) | Login to a server. |
-|[rest](./rest) | The official rest API provided by Riot. Includes an unthrottled handler as well as a throttled, asynchronous handler with configurable rate limits |
-|[rtmp](./rtmp) | The part that makes the client run. |
-|[spectator](./spectator) | Spectate games. Supports loading spectator files (.rofl) and streaming via the rest API. For non-featured games, you will need to provide a decryption key, which can be retrieved via RTMP |
-|[xmpp](./xmpp) | Connect to the chat server. A simple wrapper that takes care of menial tasks such as channel name encoding |
+|[domain](https://github.com/loldevs/riotapi/wiki/domain) | Holding common information for all other modules. Mostly copies of the client's classes transmitted via RTMP in [com.riotgames](../tree/master/domain/src/main/java/net/boreeas/riotapi/com/riotgames), but also the [Shard](../blob/master/domain/src/main/java/net/boreeas/riotapi/Shard.java) enum, holding constants for all regions |
+|[loginqueue](https://github.com/loldevs/riotapi/wiki/loginqueue) | Login to a server. |
+|[rest](https://github.com/loldevs/riotapi/wiki/rest) | The official rest API provided by Riot. Includes an unthrottled handler as well as a throttled, asynchronous handler with configurable rate limits |
+|[rtmp](https://github.com/loldevs/riotapi/wiki/rtmp) | The part that makes the client run. |
+|[spectator](https://github.com/loldevs/riotapi/wiki/spectator) | Spectate games. Supports loading spectator files (.rofl) and streaming via the rest API. For non-featured games, you will need to provide a decryption key, which can be retrieved via RTMP |
+|[xmpp](https://github.com/loldevs/riotapi/wiki/xmpp) | Connect to the chat server. A simple wrapper that takes care of menial tasks such as channel name encoding |
 
 Take a look at the [wiki](https://github.com/loldevs/riotapi/wiki) for a complete documentation.

domain/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>riotapi</artifactId>
         <groupId>net.boreeas</groupId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

domain/src/main/java/net/boreeas/riotapi/Shard.java

@@ -26,7 +26,7 @@ public enum Shard {
             "EUW1",
             "eu." + Constants.BASE_PATH,
             "chat.euw1." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "euw"),
             "https://lq.euw1." + Constants.BASE_PATH,
             "prod.euw1." + Constants.BASE_PATH,
             "http://spectator.eu." + Constants.BASE_PATH + ":8088",
@@ -35,7 +35,7 @@ public enum Shard {
             "EUN1",
             "eun1." + Constants.BASE_PATH,
             "chat.eun1." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "eune"),
             "https://lq.eun1." + Constants.BASE_PATH,
             "prod.eun1." + Constants.BASE_PATH,
             "http://spectator.eu." + Constants.BASE_PATH + ":8088",
@@ -44,7 +44,7 @@ public enum Shard {
             "NA1",
             "na1." + Constants.BASE_PATH,
             "chat.na1." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "na"),
             "https://lq.na1." + Constants.BASE_PATH,
             "prod.na1." + Constants.BASE_PATH,
             "http://spectator.na." + Constants.BASE_PATH,
@@ -53,7 +53,7 @@ public enum Shard {
             "BR1",
             "br." + Constants.BASE_PATH,
             "chat.br." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "br"),
             "https://lq.br." + Constants.BASE_PATH,
             "prod.br." + Constants.BASE_PATH,
             "http://spectator.br." + Constants.BASE_PATH,
@@ -62,7 +62,7 @@ public enum Shard {
             "OC1",
             "oc1." + Constants.BASE_PATH,
             "chat.oc1." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "oce"),
             "https://lq.oc1." + Constants.BASE_PATH,
             "prod.oc1." + Constants.BASE_PATH,
             "http://spectator.oc1." + Constants.BASE_PATH,
@@ -71,7 +71,7 @@ public enum Shard {
             "TR1",
             "tr." + Constants.BASE_PATH,
             "chat.tr." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "tr"),
             "https://lq.tr." + Constants.BASE_PATH,
             "prod.tr." + Constants.BASE_PATH,
             "http://spectator.tr." + Constants.BASE_PATH,
@@ -80,7 +80,7 @@ public enum Shard {
             "RU",
             "ru." + Constants.BASE_PATH,
             "chat.ru." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "ru"),
             "https://lq.ru." + Constants.BASE_PATH,
             "prod.ru." + Constants.BASE_PATH,
             "http://spectator.eu." + Constants.BASE_PATH,
@@ -89,7 +89,7 @@ public enum Shard {
             "LA1",
             "la1." + Constants.BASE_PATH,
             "chat.la1." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "lan"),
             "https://lq.la1." + Constants.BASE_PATH,
             "prod.la1." + Constants.BASE_PATH,
             "http://spectator.br." + Constants.BASE_PATH,
@@ -98,7 +98,7 @@ public enum Shard {
             "LA2",
             "la2." + Constants.BASE_PATH,
             "chat.la2." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            String.format(Constants.API_PATH_FMT, "las"),
             "https://lq.la2." + Constants.BASE_PATH,
             "prod.la2." + Constants.BASE_PATH,
             "http://spectator.br." + Constants.BASE_PATH,
@@ -107,7 +107,7 @@ public enum Shard {
             "PBE1",
             "pbe1." + Constants.BASE_PATH,
             "chat.pbe1." + Constants.BASE_PATH,
-            Constants.API_PATH,
+            Constants.API_PATH_FMT,
             "https://lq.pbe1." + Constants.BASE_PATH,
             "prod.pbe1." + Constants.BASE_PATH,
             "http://spectator.pbe1." + Constants.BASE_PATH + ":8088",
@@ -116,7 +116,7 @@ public enum Shard {
             "KR",
             "kr." + Constants.BASE_PATH,
             "chat.kr." + Constants.BASE_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            String.format(Constants.API_PATH_FMT, "kr"),
             "https://lq.kr." + Constants.BASE_PATH,
             "prod.kr." + Constants.BASE_PATH,
             "QFKR1PROXY.kassad.in:8088",
@@ -125,7 +125,7 @@ public enum Shard {
             "SG",
             Constants.GARENA_PATH,
             "chat." + Constants.GARENA_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            null,
             "https://lq." + Constants.GARENA_PATH,
             "prod." + Constants.GARENA_PATH,
             "qfsea1proxy.kassad.in:8088",
@@ -134,7 +134,7 @@ public enum Shard {
             "TW",
             Constants.GARENA_PATH,
             "chatth." + Constants.GARENA_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            null,
             "https://loginqueuetw." + Constants.GARENA_PATH,
             "prodtw." + Constants.GARENA_PATH,
             "QFTW1PROXY.kassad.in:8088",
@@ -143,7 +143,7 @@ public enum Shard {
             "TH",
             Constants.GARENA_PATH,
             "chatth." + Constants.GARENA_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            null,
             "https://lqth." + Constants.GARENA_PATH,
             "prodth." + Constants.GARENA_PATH,
             "qfsea1proxy.kassad.in:8088",
@@ -152,7 +152,7 @@ public enum Shard {
             "PH",
             Constants.GARENA_PATH,
             "chatph." + Constants.GARENA_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            null,
             "https://lqph." + Constants.GARENA_PATH,
             "prodph." + Constants.GARENA_PATH,
             "qfsea1proxy.kassad.in:8088",
@@ -161,7 +161,7 @@ public enum Shard {
             "VN",
             Constants.GARENA_PATH,
             "chatvn." + Constants.BASE_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            null,
             "https://lqvn." + Constants.GARENA_PATH,
             "prodvn." + Constants.GARENA_PATH,
             "qfsea1proxy.kassad.in:8088",
@@ -170,7 +170,7 @@ public enum Shard {
             "ID",
             Constants.GARENA_PATH,
             "chatid." + Constants.BASE_PATH,
-            "https://asia.api." + Constants.BASE_PATH + "/api/lol",
+            null,
             "https://lqid." + Constants.GARENA_PATH,
             "prodid." + Constants.GARENA_PATH,
             "qfsea1proxy.kassad.in:8088",
@@ -208,7 +208,7 @@ private Shard(String name, String spectatorPlatformName, String base, String cha
     private static class Constants {
         static String BASE_PATH = "lol.riotgames.com";
         static String GARENA_PATH = "lol.garenanow.com";
-        static String API_PATH= "https://prod.api." + Constants.BASE_PATH + "/api/lol";
+        static String API_PATH_FMT = "https://%s.api.pvp.net/api/lol";
     }
 
     public static Shard getBySpectatorPlatform(String name) {

domain/src/main/java/net/boreeas/riotapi/com/riotgames/platform/game/Participant.java

@@ -25,4 +25,5 @@
 @Data
 @Serialization(name = "com.riotgames.platform.game.Participant")
 public class Participant {
+
 }

domain/src/main/java/net/boreeas/riotapi/com/riotgames/platform/game/PlayerParticipant.java

@@ -25,7 +25,7 @@
  */
 @Data
 @Serialization(name = "com.riotgames.platform.game.PlayerParticipant")
-public class PlayerParticipant {
+public class PlayerParticipant extends Participant {
     // TODO inspect
     private Object timeAddedToQueue;
     private int index;