Move tournament package to tournaments (#157)

* Move tournament package to tournaments

* Fix unit test

---------

Co-authored-by: Michael Lieshoff <michael.lieshoff@virtual-solution.com>

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+
+## [2.1.0] - 2023-07-12
+
+### Changed
+
+- Move tournament package to tournaments (#147)
+
 ## [2.0.6] - 2023-07-12
 
 ### Added
@@ -34,6 +41,7 @@
 
 - Create a Release job (#152)
 
-[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v2.0.6...HEAD
-[2.0.6]: https://github.com/mlieshoff/jcrapi2/compare/v2.0.6...v2.0.6
-[2.0.5]: https://github.com/mlieshoff/jcrapi2/compare/v2.0.5...v2.0.6
+[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/mlieshoff/jcrapi2/compare/v2.0.6...v2.1.0
+[2.0.6]: https://github.com/mlieshoff/jcrapi2/compare/v2.0.5...v2.0.6
+[2.0.5]: https://github.com/mlieshoff/jcrapi2/compare/v2.0.5...v2.0.5

README.md

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

VERSION.txt

@@ -1 +1 @@
-v2.0.6
+v2.1.0

pom.xml

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

src/main/java/jcrapi2/api/intern/DefaultApiClasses.java

@@ -23,7 +23,7 @@
 import jcrapi2.api.intern.globaltournaments.GlobalTournamentApi;
 import jcrapi2.api.intern.locations.LocationApi;
 import jcrapi2.api.intern.players.PlayerApi;
-import jcrapi2.api.intern.tournament.TournamentApi;
+import jcrapi2.api.intern.tournaments.TournamentApi;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -40,7 +40,7 @@ public class DefaultApiClasses {
                             put(CardApi.class, "jcrapi2.api.intern.cards.CardApiImpl");
                             put(
                                     TournamentApi.class,
-                                    "jcrapi2.api.intern.tournament.TournamentApiImpl");
+                                    "jcrapi2.api.intern.tournaments.TournamentApiImpl");
                             put(LocationApi.class, "jcrapi2.api.intern.locations.LocationApiImpl");
                             put(
                                     ChallengeApi.class,

src/main/java/jcrapi2/api/intern/tournament/TournamentApi.java → src/main/java/jcrapi2/api/intern/tournaments/TournamentApi.java

@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jcrapi2.api.intern.tournament;
+package jcrapi2.api.intern.tournaments;
 
 import jcrapi2.api.Api;
-import jcrapi2.api.intern.tournaments.TournamentsRequest;
-import jcrapi2.api.intern.tournaments.TournamentsResponse;
 import jcrapi2.api.intern.tournaments.info.TournamentRequest;
 import jcrapi2.api.intern.tournaments.info.TournamentResponse;
 

src/main/java/jcrapi2/api/intern/tournament/TournamentApiImpl.java → src/main/java/jcrapi2/api/intern/tournaments/TournamentApiImpl.java

@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jcrapi2.api.intern.tournament;
+package jcrapi2.api.intern.tournaments;
 
 import jcrapi2.api.ApiContext;
 import jcrapi2.api.BaseApi;
-import jcrapi2.api.intern.tournaments.TournamentsRequest;
-import jcrapi2.api.intern.tournaments.TournamentsResponse;
 import jcrapi2.api.intern.tournaments.info.TournamentRequest;
 import jcrapi2.api.intern.tournaments.info.TournamentResponse;
 

src/test/java/jcrapi2/EndToEnd.java

@@ -70,7 +70,7 @@
 import jcrapi2.api.intern.players.info.PlayerResponse;
 import jcrapi2.api.intern.players.upcomingchests.UpcomingChestsRequest;
 import jcrapi2.api.intern.players.upcomingchests.UpcomingChestsResponse;
-import jcrapi2.api.intern.tournament.TournamentApi;
+import jcrapi2.api.intern.tournaments.TournamentApi;
 import jcrapi2.api.intern.tournaments.TournamentsRequest;
 import jcrapi2.api.intern.tournaments.TournamentsResponse;
 import jcrapi2.api.intern.tournaments.info.TournamentRequest;

src/test/java/jcrapi2/JCrApiTest.java

@@ -67,7 +67,7 @@ void listApis_whenCalled_shouldReturnListOfApiInterfaceNames() {
                                 "jcrapi2.api.intern.globaltournaments.GlobalTournamentApi",
                                 "jcrapi2.api.intern.locations.LocationApi",
                                 "jcrapi2.api.intern.players.PlayerApi",
-                                "jcrapi2.api.intern.tournament.TournamentApi"));
+                                "jcrapi2.api.intern.tournaments.TournamentApi"));
 
         List<String> actual = unitUnderTest.listApis();
 

src/test/java/jcrapi2/api/intern/tournament/TournamentApiImplIntegrationTest.java → src/test/java/jcrapi2/api/intern/tournaments/TournamentApiImplIntegrationTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jcrapi2.api.intern.tournament;
+package jcrapi2.api.intern.tournaments;
 
 import static wiremock.org.apache.commons.lang3.StringUtils.EMPTY;