Apply data model changes (#186)

* Apply data model changes

* Set new version

---------

Co-authored-by: Michael Lieshoff <[email protected]>

CHANGELOG.md

@@ -2,7 +2,27 @@
 
 ## [Unreleased]
 
-## [4.0.1] - 2024-05-15
+## [4.0.2] - 2024-02-16
+
+- Apply data model changes on different endpoints (#185)
+    * (new field) players.info.Player.supportCards
+    * (new field) players.info.Player.currentDeckSupportCards
+    * (new field) players.info.Card.rarity
+    * (new field) players.info.Card.elixirCost
+    * (new field) players.info.CurrentDeck.rarity
+    * (new field) players.info.CurrentDeck.elixirCost
+    * (new field) players.info.CurrentFavouriteCard.rarity
+    * (new field) players.info.CurrentFavouriteCard.elixirCost
+    * (new field) players.battlelog.Team.supportCards
+    * (new field) players.battlelog.Card.rarity
+    * (new field) players.battlelog.Card.elixirCost
+    * (new field) players.battlelog.Opponent.supportCards
+    * (new field) cards.Cards.supportItems
+    * (new field) cards.Card.rarity
+    * (new field) cards.Card.elixirCost
+    * (new field) globaltournaments.Card.rarity
+
+## [4.0.1] - 2024-02-15
 
 ### Fixed
 
@@ -157,7 +177,8 @@
 
 - Create a Release job (#152)
 
-[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.1...HEAD
+[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.2...HEAD
+[4.0.2]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.1...4.0.2
 [4.0.1]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.0...4.0.1
 [4.0.0]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.5...4.0.0
 [3.0.5]: https://github.com/mlieshoff/jcrapi2/compare/v3.0.4...3.0.5

README.md

@@ -1,7 +1,7 @@
 [![](https://img.shields.io/badge/java-packagecloud.io-844fec.svg)](https://packagecloud.io/)
 [![Nightlies](https://github.com/mlieshoff/jcrapi2/actions/workflows/nightlies.yml/badge.svg)](https://github.com/mlieshoff/jcrapi2/actions/workflows/nightlies.yml)
 
-# jcrapi2 4.0.1
+# jcrapi2 4.0.2
 A Java Wrapper For Official Supercell Clash Royal Api
 
 ## Why we don't use the Swagger scheme?
@@ -454,15 +454,15 @@ All requests are returning *java.concurrent.Future*. The execution will be async
 
 to Gradle:
 ```groovy
-    implementation group: 'jcrapi2', name: 'jcrapi2', version: '4.0.1'
+    implementation group: 'jcrapi2', name: 'jcrapi2', version: '4.0.2'
 ```
 
 to Maven:
 ```xml
     <dependency>
         <groupId>jcrapi2</groupId>
         <artifactId>jcrapi2</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2</version>
     </dependency>
 ```
 

VERSION.txt

@@ -1 +1 @@
-v4.0.1
+v4.0.2

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jcrapi2</artifactId>
     <packaging>jar</packaging>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
     <groupId>jcrapi2</groupId>
     <url>https://maven.apache.org</url>
     <inceptionYear>2018</inceptionYear>

src/main/java/jcrapi2/api/intern/cards/Card.java

@@ -37,4 +37,10 @@ public class Card {
 
     @SerializedName("maxEvolutionLevel")
     private Integer maxEvolutionLevel;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("elixirCost")
+    private Integer elixirCost;
 }

src/main/java/jcrapi2/api/intern/cards/Cards.java

@@ -27,4 +27,7 @@ public class Cards {
 
     @SerializedName("items")
     private List<Card> items;
+
+    @SerializedName("supportItems")
+    private List<SupportItem> supportItems;
 }

src/main/java/jcrapi2/api/intern/cards/SupportItem.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jcrapi2.api.intern.cards;
+
+import com.google.gson.annotations.SerializedName;
+
+import lombok.Data;
+
+@Data
+public class SupportItem {
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("id")
+    private long id;
+
+    @SerializedName("maxLevel")
+    private int maxLevel;
+
+    @SerializedName("iconUrls")
+    private IconUrls iconUrls;
+
+    @SerializedName("rarity")
+    private String rarity;
+}

src/main/java/jcrapi2/api/intern/globaltournaments/Card.java

@@ -31,4 +31,7 @@ public class Card {
 
     @SerializedName("maxLevel")
     private int maxLevel;
+
+    @SerializedName("rarity")
+    private String rarity;
 }

src/main/java/jcrapi2/api/intern/players/battlelog/Card.java

@@ -46,4 +46,10 @@ public class Card {
 
     @SerializedName("evolutionLevel")
     private Integer evolutionLevel;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("elixirCost")
+    private Integer elixirCost;
 }

src/main/java/jcrapi2/api/intern/players/battlelog/Opponent.java

@@ -60,4 +60,7 @@ public class Opponent {
 
     @SerializedName("globalRank")
     private Integer globalRank;
+
+    @SerializedName("supportCards")
+    private List<SupportCard> supportCards;
 }

src/main/java/jcrapi2/api/intern/players/battlelog/SupportCard.java

@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jcrapi2.api.intern.players.battlelog;
+
+import com.google.gson.annotations.SerializedName;
+
+import lombok.Data;
+
+@Data
+public class SupportCard {
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("id")
+    private long id;
+
+    @SerializedName("level")
+    private int level;
+
+    @SerializedName("maxLevel")
+    private int maxLevel;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("iconUrls")
+    private IconUrls iconUrls;
+}

src/main/java/jcrapi2/api/intern/players/battlelog/Team.java

@@ -60,4 +60,7 @@ public class Team {
 
     @SerializedName("globalRank")
     private Integer globalRank;
+
+    @SerializedName("supportCards")
+    private List<SupportCard> supportCards;
 }

src/main/java/jcrapi2/api/intern/players/info/Card.java

@@ -49,4 +49,10 @@ public class Card {
 
     @SerializedName("evolutionLevel")
     private int evolutionLevel;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("elixirCost")
+    private Integer elixirCost;
 }

src/main/java/jcrapi2/api/intern/players/info/CurrentDeck.java

@@ -49,4 +49,10 @@ public class CurrentDeck {
 
     @SerializedName("evolutionLevel")
     private int evolutionLevel;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("elixirCost")
+    private Integer elixirCost;
 }

src/main/java/jcrapi2/api/intern/players/info/CurrentDeckSupportCard.java

@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jcrapi2.api.intern.players.info;
+
+import com.google.gson.annotations.SerializedName;
+
+import lombok.Data;
+
+@Data
+public class CurrentDeckSupportCard {
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("id")
+    private long id;
+
+    @SerializedName("level")
+    private int level;
+
+    @SerializedName("maxLevel")
+    private int maxLevel;
+
+    @SerializedName("iconUrls")
+    private IconUrls iconUrls;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("count")
+    private int count;
+}

src/main/java/jcrapi2/api/intern/players/info/CurrentFavouriteCard.java

@@ -34,4 +34,10 @@ public class CurrentFavouriteCard {
 
     @SerializedName("iconUrls")
     private IconUrls iconUrls;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("elixirCost")
+    private Integer elixirCost;
 }

src/main/java/jcrapi2/api/intern/players/info/Player.java

@@ -126,4 +126,10 @@ public class Player {
 
     @SerializedName("bestPathOfLegendSeasonResult")
     private PathOfLegendSeasonResult bestPathOfLegendSeasonResult;
+
+    @SerializedName("supportCards")
+    private List<SupportCard> supportCards;
+
+    @SerializedName("currentDeckSupportCards")
+    private List<CurrentDeckSupportCard> currentDeckSupportCards;
 }

src/main/java/jcrapi2/api/intern/players/info/SupportCard.java

@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jcrapi2.api.intern.players.info;
+
+import com.google.gson.annotations.SerializedName;
+
+import lombok.Data;
+
+@Data
+public class SupportCard {
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("id")
+    private long id;
+
+    @SerializedName("level")
+    private int level;
+
+    @SerializedName("maxLevel")
+    private int maxLevel;
+
+    @SerializedName("iconUrls")
+    private IconUrls iconUrls;
+
+    @SerializedName("rarity")
+    private String rarity;
+
+    @SerializedName("count")
+    private int count;
+}

src/test/java/jcrapi2/EndToEnd.java

@@ -282,6 +282,7 @@ void players_getBattleLog() throws Exception {
                         .replace(",\"remainingTowers\":0", "")
                         .replace(",\"starLevel\":0", "")
                         .replace(",\"elixirLeaked\":0.0,", ",")
+                        .replace(",\"elixirLeaked\":0.0}", "}")
                         .replace(",\"challengeId\":0", "")
                         .replace(",\"challengeWinCountBefore\":0", "")
                         .replace(",\"globalRank\":null", "");
@@ -296,6 +297,7 @@ void players_getBattleLog() throws Exception {
                         .replace(",\"kingTowerHitPoints\":0", "")
                         .replace(",\"princessTowersHitPoints\":null", "")
                         .replace(",\"elixirLeaked\":0.0,", ",")
+                        .replace(",\"elixirLeaked\":0.0}", "}")
                         .replace("\"name\":null,", "")
                         .replace(",\"challengeWinCountBefore\":0", "")
                         .replace(",\"maxEvolutionLevel\":null", "")
@@ -490,6 +492,7 @@ void globalTournaments_findAll() throws Exception {
                 response.getRawResponse()
                         .getRaw()
                         .replace(",\"type\":null", "")
+                        .replace(",\"rarity\":null", "")
                         .replace("\"name\":null,", "");
 
         assertDiff(expected, actual);