From 46f1f45fd6bf1bbffa36ca3178e54975cf3ab1b3 Mon Sep 17 00:00:00 2001 From: Michael Lieshoff Date: Wed, 12 Jul 2023 14:08:53 +0200 Subject: [PATCH] Move tournament package to tournaments (#157) * Move tournament package to tournaments * Fix unit test --------- Co-authored-by: Michael Lieshoff --- CHANGELOG.md | 14 +++++++++++--- README.md | 6 +++--- VERSION.txt | 2 +- pom.xml | 2 +- .../java/jcrapi2/api/intern/DefaultApiClasses.java | 4 ++-- .../{tournament => tournaments}/TournamentApi.java | 4 +--- .../TournamentApiImpl.java | 4 +--- src/test/java/jcrapi2/EndToEnd.java | 2 +- src/test/java/jcrapi2/JCrApiTest.java | 2 +- .../TournamentApiImplIntegrationTest.java | 2 +- 10 files changed, 23 insertions(+), 19 deletions(-) rename src/main/java/jcrapi2/api/intern/{tournament => tournaments}/TournamentApi.java (88%) rename src/main/java/jcrapi2/api/intern/{tournament => tournaments}/TournamentApiImpl.java (90%) rename src/test/java/jcrapi2/api/intern/{tournament => tournaments}/TournamentApiImplIntegrationTest.java (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 550e37d..57e4251 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index a6b02a8..2f8ceeb 100644 --- a/README.md +++ b/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,7 +372,7 @@ 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: @@ -380,7 +380,7 @@ to Maven: jcrapi2 jcrapi2 - 2.0.6 + 2.1.0 ``` diff --git a/VERSION.txt b/VERSION.txt index 52dbd82..852700e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v2.0.6 \ No newline at end of file +v2.1.0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0cfc94d..c791248 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 jcrapi2 jar - 2.0.6 + 2.1.0 jcrapi2 https://maven.apache.org 2018 diff --git a/src/main/java/jcrapi2/api/intern/DefaultApiClasses.java b/src/main/java/jcrapi2/api/intern/DefaultApiClasses.java index f8fd734..564113e 100644 --- a/src/main/java/jcrapi2/api/intern/DefaultApiClasses.java +++ b/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, diff --git a/src/main/java/jcrapi2/api/intern/tournament/TournamentApi.java b/src/main/java/jcrapi2/api/intern/tournaments/TournamentApi.java similarity index 88% rename from src/main/java/jcrapi2/api/intern/tournament/TournamentApi.java rename to src/main/java/jcrapi2/api/intern/tournaments/TournamentApi.java index d070c32..f8aded4 100644 --- a/src/main/java/jcrapi2/api/intern/tournament/TournamentApi.java +++ b/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; diff --git a/src/main/java/jcrapi2/api/intern/tournament/TournamentApiImpl.java b/src/main/java/jcrapi2/api/intern/tournaments/TournamentApiImpl.java similarity index 90% rename from src/main/java/jcrapi2/api/intern/tournament/TournamentApiImpl.java rename to src/main/java/jcrapi2/api/intern/tournaments/TournamentApiImpl.java index a112b38..4ddef3a 100644 --- a/src/main/java/jcrapi2/api/intern/tournament/TournamentApiImpl.java +++ b/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; diff --git a/src/test/java/jcrapi2/EndToEnd.java b/src/test/java/jcrapi2/EndToEnd.java index 9c68cae..10561a2 100644 --- a/src/test/java/jcrapi2/EndToEnd.java +++ b/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; diff --git a/src/test/java/jcrapi2/JCrApiTest.java b/src/test/java/jcrapi2/JCrApiTest.java index 31c83be..4062fac 100644 --- a/src/test/java/jcrapi2/JCrApiTest.java +++ b/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 actual = unitUnderTest.listApis(); diff --git a/src/test/java/jcrapi2/api/intern/tournament/TournamentApiImplIntegrationTest.java b/src/test/java/jcrapi2/api/intern/tournaments/TournamentApiImplIntegrationTest.java similarity index 99% rename from src/test/java/jcrapi2/api/intern/tournament/TournamentApiImplIntegrationTest.java rename to src/test/java/jcrapi2/api/intern/tournaments/TournamentApiImplIntegrationTest.java index 00195a0..42ab171 100644 --- a/src/test/java/jcrapi2/api/intern/tournament/TournamentApiImplIntegrationTest.java +++ b/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;