From e5e6b1d08eb30463f693a98e45eb1e1ee69cb976 Mon Sep 17 00:00:00 2001 From: Stuart Boston Date: Thu, 1 Nov 2012 14:35:47 +0000 Subject: [PATCH] Updated project structure --- .gitignore | 15 +-- pom.xml | 30 ++--- .../themoviedbapi}/MovieDbException.java | 2 +- .../themoviedbapi/TheMovieDbApi.java} | 59 +++++++--- .../model/AlternativeTitle.java | 2 +- .../themoviedbapi}/model/Artwork.java | 2 +- .../themoviedbapi}/model/ArtworkType.java | 2 +- .../themoviedbapi}/model/Collection.java | 2 +- .../themoviedbapi}/model/CollectionInfo.java | 2 +- .../themoviedbapi}/model/Company.java | 2 +- .../themoviedbapi}/model/Genre.java | 2 +- .../themoviedbapi}/model/Keyword.java | 2 +- .../themoviedbapi}/model/Language.java | 2 +- .../themoviedbapi}/model/MovieDb.java | 2 +- .../themoviedbapi}/model/Person.java | 2 +- .../themoviedbapi}/model/PersonCast.java | 2 +- .../themoviedbapi}/model/PersonCredit.java | 2 +- .../themoviedbapi}/model/PersonCrew.java | 2 +- .../themoviedbapi}/model/PersonType.java | 2 +- .../model/ProductionCompany.java | 2 +- .../model/ProductionCountry.java | 2 +- .../themoviedbapi}/model/ReleaseInfo.java | 2 +- .../themoviedbapi}/model/StatusCode.java | 2 +- .../model/TmdbConfiguration.java | 2 +- .../model/TokenAuthorisation.java | 2 +- .../themoviedbapi}/model/TokenSession.java | 2 +- .../themoviedbapi}/model/Trailer.java | 2 +- .../themoviedbapi}/model/Translation.java | 2 +- .../themoviedbapi}/tools/ApiUrl.java | 12 +- .../themoviedbapi}/tools/FilteringLayout.java | 2 +- .../themoviedbapi}/tools/WebBrowser.java | 4 +- .../wrapper/WrapperAlternativeTitles.java | 4 +- .../wrapper/WrapperCompany.java | 4 +- .../wrapper/WrapperCompanyMovies.java | 4 +- .../themoviedbapi}/wrapper/WrapperConfig.java | 4 +- .../themoviedbapi}/wrapper/WrapperGenres.java | 4 +- .../themoviedbapi}/wrapper/WrapperImages.java | 4 +- .../themoviedbapi}/wrapper/WrapperMovie.java | 4 +- .../wrapper/WrapperMovieCasts.java | 6 +- .../wrapper/WrapperMovieKeywords.java | 4 +- .../themoviedbapi}/wrapper/WrapperPerson.java | 4 +- .../wrapper/WrapperPersonCredits.java | 4 +- .../wrapper/WrapperReleaseInfo.java | 4 +- .../wrapper/WrapperTrailers.java | 4 +- .../wrapper/WrapperTranslations.java | 4 +- src/main/resources/log4j.properties | 2 +- .../themoviedbapi/TheMovieDbApiTest.java} | 110 ++++++++++-------- 47 files changed, 195 insertions(+), 147 deletions(-) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/MovieDbException.java (94%) rename src/main/java/com/{moviejukebox/themoviedb/TheMovieDb.java => omertron/themoviedbapi/TheMovieDbApi.java} (91%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/AlternativeTitle.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Artwork.java (99%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/ArtworkType.java (88%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Collection.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/CollectionInfo.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Company.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Genre.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Keyword.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Language.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/MovieDb.java (99%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Person.java (99%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/PersonCast.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/PersonCredit.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/PersonCrew.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/PersonType.java (87%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/ProductionCompany.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/ProductionCountry.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/ReleaseInfo.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/StatusCode.java (97%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/TmdbConfiguration.java (99%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/TokenAuthorisation.java (94%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/TokenSession.java (94%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Trailer.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/model/Translation.java (98%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/tools/ApiUrl.java (92%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/tools/FilteringLayout.java (94%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/tools/WebBrowser.java (96%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperAlternativeTitles.java (93%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperCompany.java (91%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperCompanyMovies.java (96%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperConfig.java (89%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperGenres.java (93%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperImages.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperMovie.java (96%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperMovieCasts.java (92%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperMovieKeywords.java (94%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperPerson.java (91%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperPersonCredits.java (91%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperReleaseInfo.java (94%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperTrailers.java (95%) rename src/main/java/com/{moviejukebox/themoviedb => omertron/themoviedbapi}/wrapper/WrapperTranslations.java (94%) rename src/test/java/com/{moviejukebox/themoviedb/TheMovieDbTest.java => omertron/themoviedbapi/TheMovieDbApiTest.java} (77%) diff --git a/.gitignore b/.gitignore index 94015f85f..81aa2479a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ -*.class - -# Package Files # -*.jar -*.war -*.ear - +*.class + +# Package Files # +*.jar +*.war +*.ear + +/target/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 90577519b..47711d840 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 + org.sonatype.oss oss-parent @@ -11,14 +11,23 @@ 3.0.3 - com.moviejukebox + com.omertron themoviedbapi 3.3-SNAPSHOT API-The MovieDB + jar + API for the TheMovieDb.org website + + + false + UTF-8 + UTF-8 + zip + - Google Code - http://code.google.com/p/themoviedbapi/issues/list + GitHub + https://github.com/Omertron/api-themoviedb/issues @@ -27,18 +36,11 @@ - scm:svn:http://themoviedbapi.googlecode.com/svn/trunk/themoviedbapi - scm:svn:https://themoviedbapi.googlecode.com/svn/trunk/themoviedbapi - http://code.google.com/p/themoviedbapi/source/browse/trunk/themoviedbapi + scm:git:git@github.com:Omertron/api-themoviedb.git + scm:git:git@github.com:Omertron/api-themoviedb.git + scm:git:git@github.com:Omertron/api-themoviedb.git - - false - UTF-8 - UTF-8 - zip - - diff --git a/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java b/src/main/java/com/omertron/themoviedbapi/MovieDbException.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/MovieDbException.java rename to src/main/java/com/omertron/themoviedbapi/MovieDbException.java index 1f9a95aa0..a0c8fb0d9 100644 --- a/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java +++ b/src/main/java/com/omertron/themoviedbapi/MovieDbException.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb; +package com.omertron.themoviedbapi; public class MovieDbException extends Exception { diff --git a/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java similarity index 91% rename from src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java rename to src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java index 49c48abc3..6e0896f78 100644 --- a/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java +++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java @@ -7,16 +7,47 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb; +package com.omertron.themoviedbapi; import com.fasterxml.jackson.databind.ObjectMapper; -import com.moviejukebox.themoviedb.MovieDbException.MovieDbExceptionType; -import com.moviejukebox.themoviedb.model.*; -import com.moviejukebox.themoviedb.tools.ApiUrl; -import static com.moviejukebox.themoviedb.tools.ApiUrl.*; -import com.moviejukebox.themoviedb.tools.FilteringLayout; -import com.moviejukebox.themoviedb.tools.WebBrowser; -import com.moviejukebox.themoviedb.wrapper.*; +import com.omertron.themoviedbapi.MovieDbException.MovieDbExceptionType; +import com.omertron.themoviedbapi.model.AlternativeTitle; +import com.omertron.themoviedbapi.model.Artwork; +import com.omertron.themoviedbapi.model.ArtworkType; +import com.omertron.themoviedbapi.model.CollectionInfo; +import com.omertron.themoviedbapi.model.Company; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.Keyword; +import com.omertron.themoviedbapi.model.MovieDb; +import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.PersonCast; +import com.omertron.themoviedbapi.model.PersonCredit; +import com.omertron.themoviedbapi.model.PersonCrew; +import com.omertron.themoviedbapi.model.PersonType; +import com.omertron.themoviedbapi.model.ReleaseInfo; +import com.omertron.themoviedbapi.model.TmdbConfiguration; +import com.omertron.themoviedbapi.model.TokenAuthorisation; +import com.omertron.themoviedbapi.model.TokenSession; +import com.omertron.themoviedbapi.model.Trailer; +import com.omertron.themoviedbapi.model.Translation; +import com.omertron.themoviedbapi.tools.ApiUrl; +import static com.omertron.themoviedbapi.tools.ApiUrl.*; +import com.omertron.themoviedbapi.tools.FilteringLayout; +import com.omertron.themoviedbapi.tools.WebBrowser; +import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles; +import com.omertron.themoviedbapi.wrapper.WrapperCompany; +import com.omertron.themoviedbapi.wrapper.WrapperCompanyMovies; +import com.omertron.themoviedbapi.wrapper.WrapperConfig; +import com.omertron.themoviedbapi.wrapper.WrapperGenres; +import com.omertron.themoviedbapi.wrapper.WrapperImages; +import com.omertron.themoviedbapi.wrapper.WrapperMovie; +import com.omertron.themoviedbapi.wrapper.WrapperMovieCasts; +import com.omertron.themoviedbapi.wrapper.WrapperMovieKeywords; +import com.omertron.themoviedbapi.wrapper.WrapperPerson; +import com.omertron.themoviedbapi.wrapper.WrapperPersonCredits; +import com.omertron.themoviedbapi.wrapper.WrapperReleaseInfo; +import com.omertron.themoviedbapi.wrapper.WrapperTrailers; +import com.omertron.themoviedbapi.wrapper.WrapperTranslations; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -32,9 +63,9 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class TheMovieDb { +public class TheMovieDbApi { - private static final Logger LOGGER = Logger.getLogger(TheMovieDb.class); + private static final Logger LOGGER = Logger.getLogger(TheMovieDbApi.class); private String apiKey; private TmdbConfiguration tmdbConfig; /* @@ -73,7 +104,7 @@ public class TheMovieDb { * @param apiKey * @throws MovieDbException */ - public TheMovieDb(String apiKey) throws MovieDbException { + public TheMovieDbApi(String apiKey) throws MovieDbException { this.apiKey = apiKey; ApiUrl apiUrl = new ApiUrl(this, "configuration"); URL configUrl = apiUrl.buildUrl(); @@ -92,11 +123,11 @@ public class TheMovieDb { * Output the API version information to the debug log */ public static void showVersion() { - String apiTitle = TheMovieDb.class.getPackage().getSpecificationTitle(); + String apiTitle = TheMovieDbApi.class.getPackage().getSpecificationTitle(); if (StringUtils.isNotBlank(apiTitle)) { - String apiVersion = TheMovieDb.class.getPackage().getSpecificationVersion(); - String apiRevision = TheMovieDb.class.getPackage().getImplementationVersion(); + String apiVersion = TheMovieDbApi.class.getPackage().getSpecificationVersion(); + String apiRevision = TheMovieDbApi.class.getPackage().getImplementationVersion(); StringBuilder sv = new StringBuilder(); sv.append(apiTitle).append(" "); sv.append(apiVersion).append(" r"); diff --git a/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java b/src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java rename to src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java index c57c564bf..6829a2946 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java +++ b/src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java similarity index 99% rename from src/main/java/com/moviejukebox/themoviedb/model/Artwork.java rename to src/main/java/com/omertron/themoviedbapi/model/Artwork.java index 391bb468b..74b8257b1 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java b/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java similarity index 88% rename from src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java rename to src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java index e454b0b6e..cdf404ab7 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; /** * ArtworkType enum List of the artwork types that are available diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Collection.java b/src/main/java/com/omertron/themoviedbapi/model/Collection.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/model/Collection.java rename to src/main/java/com/omertron/themoviedbapi/model/Collection.java index f3ac281a9..e14c3b6cd 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Collection.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Collection.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java rename to src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java index 0edf12770..d128d8aa5 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Company.java b/src/main/java/com/omertron/themoviedbapi/model/Company.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/model/Company.java rename to src/main/java/com/omertron/themoviedbapi/model/Company.java index 3cd07bbc8..aa66958d4 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Company.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Company.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Genre.java b/src/main/java/com/omertron/themoviedbapi/model/Genre.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/Genre.java rename to src/main/java/com/omertron/themoviedbapi/model/Genre.java index b0da30e3e..50efcbcce 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Genre.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Genre.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java b/src/main/java/com/omertron/themoviedbapi/model/Keyword.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/Keyword.java rename to src/main/java/com/omertron/themoviedbapi/model/Keyword.java index f0dd79045..d07205d52 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Keyword.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/Language.java rename to src/main/java/com/omertron/themoviedbapi/model/Language.java index c81dc339c..4fd96f5a6 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Language.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Language.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java similarity index 99% rename from src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java rename to src/main/java/com/omertron/themoviedbapi/model/MovieDb.java index 7dedb1c82..e8afcdc05 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Person.java b/src/main/java/com/omertron/themoviedbapi/model/Person.java similarity index 99% rename from src/main/java/com/moviejukebox/themoviedb/model/Person.java rename to src/main/java/com/omertron/themoviedbapi/model/Person.java index 771dba51c..93331588f 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Person.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Person.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java rename to src/main/java/com/omertron/themoviedbapi/model/PersonCast.java index 9b04b7012..bc5af7057 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java rename to src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java index 1698140d5..26e19bbd5 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java rename to src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java index d6f69bbd2..ddb5dce05 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/PersonType.java b/src/main/java/com/omertron/themoviedbapi/model/PersonType.java similarity index 87% rename from src/main/java/com/moviejukebox/themoviedb/model/PersonType.java rename to src/main/java/com/omertron/themoviedbapi/model/PersonType.java index 40bf83222..2847fd72b 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/PersonType.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonType.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; /** * diff --git a/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java rename to src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java index 93b10247e..f75481b7b 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java rename to src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java index 001d4d289..5374b5ab7 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java rename to src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java index 0edd1dc10..052600445 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java similarity index 97% rename from src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java rename to src/main/java/com/omertron/themoviedbapi/model/StatusCode.java index 33c73a091..c6e247613 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java +++ b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java similarity index 99% rename from src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java rename to src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java index 7aac0b47a..d427759b7 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java +++ b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java rename to src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java index d8c3fb063..e175ce344 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java rename to src/main/java/com/omertron/themoviedbapi/model/TokenSession.java index a540af287..c52f9f304 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java +++ b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/model/Trailer.java rename to src/main/java/com/omertron/themoviedbapi/model/Trailer.java index 9d716caf6..9b582c4ae 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import java.io.Serializable; diff --git a/src/main/java/com/moviejukebox/themoviedb/model/Translation.java b/src/main/java/com/omertron/themoviedbapi/model/Translation.java similarity index 98% rename from src/main/java/com/moviejukebox/themoviedb/model/Translation.java rename to src/main/java/com/omertron/themoviedbapi/model/Translation.java index 66f6c769a..ce3036da4 100644 --- a/src/main/java/com/moviejukebox/themoviedb/model/Translation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Translation.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.model; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java b/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java similarity index 92% rename from src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java rename to src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java index c89e05631..504ccd9c5 100644 --- a/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java +++ b/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java @@ -7,9 +7,9 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.tools; +package com.omertron.themoviedbapi.tools; -import com.moviejukebox.themoviedb.TheMovieDb; +import com.omertron.themoviedbapi.TheMovieDbApi; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -30,7 +30,7 @@ public class ApiUrl { */ private static final Logger LOGGER = Logger.getLogger(ApiUrl.class); /* - * TheMovieDb API Base URL + * TheMovieDbApi API Base URL */ private static final String TMDB_API_BASE = "http://api.themoviedb.org/3/"; // private static final String TMDB_API_BASE = "http://private-3aa3-themoviedb.apiary.io/3/"; @@ -43,7 +43,7 @@ public class ApiUrl { /* * Properties */ - private TheMovieDb tmdb; + private TheMovieDbApi tmdb; private String method; private String submethod; private Map arguments = new HashMap(); @@ -71,7 +71,7 @@ public class ApiUrl { * * @param method */ - public ApiUrl(TheMovieDb tmdb, String method) { + public ApiUrl(TheMovieDbApi tmdb, String method) { this.tmdb = tmdb; this.method = method; this.submethod = DEFAULT_STRING; @@ -83,7 +83,7 @@ public class ApiUrl { * @param method * @param submethod */ - public ApiUrl(TheMovieDb tmdb, String method, String submethod) { + public ApiUrl(TheMovieDbApi tmdb, String method, String submethod) { this.tmdb = tmdb; this.method = method; this.submethod = submethod; diff --git a/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java b/src/main/java/com/omertron/themoviedbapi/tools/FilteringLayout.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java rename to src/main/java/com/omertron/themoviedbapi/tools/FilteringLayout.java index 6cf8126ff..6f71fe814 100644 --- a/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java +++ b/src/main/java/com/omertron/themoviedbapi/tools/FilteringLayout.java @@ -7,7 +7,7 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.tools; +package com.omertron.themoviedbapi.tools; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java b/src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java similarity index 96% rename from src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java rename to src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java index 0df2cfa1b..801266505 100644 --- a/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java +++ b/src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java @@ -7,9 +7,9 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.tools; +package com.omertron.themoviedbapi.tools; -import com.moviejukebox.themoviedb.MovieDbException; +import com.omertron.themoviedbapi.MovieDbException; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java similarity index 93% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java index 50af41663..dd6de968d 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.AlternativeTitle; +import com.omertron.themoviedbapi.model.AlternativeTitle; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java similarity index 91% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java index 62b96140d..dc5f5ef5e 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.Company; +import com.omertron.themoviedbapi.model.Company; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java similarity index 96% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java index bc286db9b..52456eb8f 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.MovieDb; +import com.omertron.themoviedbapi.model.MovieDb; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java similarity index 89% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java index aea884cd0..db4bca4e2 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.TmdbConfiguration; +import com.omertron.themoviedbapi.model.TmdbConfiguration; import org.apache.log4j.Logger; /** diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java similarity index 93% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java index f4608455c..0afb0606b 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.Genre; +import com.omertron.themoviedbapi.model.Genre; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java index 98edbbfda..2a4a41220 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.Artwork; +import com.omertron.themoviedbapi.model.Artwork; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java similarity index 96% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java index 2ae8cd5e9..753aff599 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.MovieDb; +import com.omertron.themoviedbapi.model.MovieDb; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java similarity index 92% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java index 03acee9b6..45d78e0ef 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java @@ -7,12 +7,12 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.PersonCast; -import com.moviejukebox.themoviedb.model.PersonCrew; +import com.omertron.themoviedbapi.model.PersonCast; +import com.omertron.themoviedbapi.model.PersonCrew; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java index abec165f5..944d2efa3 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.Keyword; +import com.omertron.themoviedbapi.model.Keyword; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java similarity index 91% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java index 81514b7ca..65a825742 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.Person; +import com.omertron.themoviedbapi.model.Person; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java similarity index 91% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java index 4b4cf4cf6..5de86fb38 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.PersonCredit; +import com.omertron.themoviedbapi.model.PersonCredit; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java index 8d55e9ea7..f534e3920 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.ReleaseInfo; +import com.omertron.themoviedbapi.model.ReleaseInfo; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTrailers.java similarity index 95% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTrailers.java index dde4b774a..a2b3a72e3 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTrailers.java @@ -7,11 +7,11 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.moviejukebox.themoviedb.model.Trailer; +import com.omertron.themoviedbapi.model.Trailer; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java similarity index 94% rename from src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java rename to src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java index ff15f1a85..7b9780628 100644 --- a/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java @@ -7,10 +7,10 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb.wrapper; +package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.moviejukebox.themoviedb.model.Translation; +import com.omertron.themoviedbapi.model.Translation; import java.util.List; import org.apache.log4j.Logger; diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 26b472d1e..be8e13285 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -1,6 +1,6 @@ log4j.rootLogger=DEBUG, CONSOLE log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=com.moviejukebox.themoviedb.tools.FilteringLayout +log4j.appender.CONSOLE.layout=com.omertron.themoviedbapi.tools.FilteringLayout #log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=[TheMovieDB API-%C{1}] %m%n #log4j.appender.CONSOLE.Threshold=DEBUG diff --git a/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java similarity index 77% rename from src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java rename to src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java index a9305b742..e9f827fd8 100644 --- a/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java +++ b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java @@ -7,10 +7,24 @@ * For any reuse or distribution, you must make clear to others the * license terms of this work. */ -package com.moviejukebox.themoviedb; +package com.omertron.themoviedbapi; -import com.moviejukebox.themoviedb.model.*; -import com.moviejukebox.themoviedb.tools.FilteringLayout; +import com.omertron.themoviedbapi.model.AlternativeTitle; +import com.omertron.themoviedbapi.model.Artwork; +import com.omertron.themoviedbapi.model.CollectionInfo; +import com.omertron.themoviedbapi.model.Company; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.Keyword; +import com.omertron.themoviedbapi.model.MovieDb; +import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.PersonCredit; +import com.omertron.themoviedbapi.model.ReleaseInfo; +import com.omertron.themoviedbapi.model.TmdbConfiguration; +import com.omertron.themoviedbapi.model.TokenAuthorisation; +import com.omertron.themoviedbapi.model.TokenSession; +import com.omertron.themoviedbapi.model.Trailer; +import com.omertron.themoviedbapi.model.Translation; +import com.omertron.themoviedbapi.tools.FilteringLayout; import java.io.IOException; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -20,17 +34,17 @@ import org.junit.*; import static org.junit.Assert.*; /** - * Test cases for TheMovieDb API + * Test cases for TheMovieDbApi API * * @author stuart.boston */ -public class TheMovieDbTest { +public class TheMovieDbApiTest { // Logger - private static final Logger LOGGER = Logger.getLogger(TheMovieDbTest.class); + private static final Logger LOGGER = Logger.getLogger(TheMovieDbApiTest.class); // API Key private static final String API_KEY = "5a1a77e2eba8984804586122754f969f"; - private static TheMovieDb tmdb; + private static TheMovieDbApi tmdb; // Test data private static final int ID_MOVIE_BLADE_RUNNER = 78; private static final int ID_MOVIE_STAR_WARS_COLLECTION = 10; @@ -39,8 +53,8 @@ public class TheMovieDbTest { private static final String COMPANY_NAME = "Marvel Studios"; private static final int ID_GENRE_ACTION = 28; - public TheMovieDbTest() throws MovieDbException { - tmdb = new TheMovieDb(API_KEY); + public TheMovieDbApiTest() throws MovieDbException { + tmdb = new TheMovieDbApi(API_KEY); } @BeforeClass @@ -48,7 +62,7 @@ public class TheMovieDbTest { // Set the logger level to TRACE Logger.getRootLogger().setLevel(Level.TRACE); // Show the version of the API - TheMovieDb.showVersion(); + TheMovieDbApi.showVersion(); } @AfterClass @@ -66,7 +80,7 @@ public class TheMovieDbTest { } /** - * Test of getConfiguration method, of class TheMovieDb. + * Test of getConfiguration method, of class TheMovieDbApi. */ @Test public void testConfiguration() throws IOException { @@ -82,7 +96,7 @@ public class TheMovieDbTest { } /** - * Test of showVersion method, of class TheMovieDb. + * Test of showVersion method, of class TheMovieDbApi. */ @Test public void testShowVersion() { @@ -90,7 +104,7 @@ public class TheMovieDbTest { } /** - * Test of searchMovie method, of class TheMovieDb. + * Test of searchMovie method, of class TheMovieDbApi. */ @Test public void testSearchMovie() throws MovieDbException { @@ -111,7 +125,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieInfo method, of class TheMovieDb. + * Test of getMovieInfo method, of class TheMovieDbApi. */ @Test public void testGetMovieInfo() throws MovieDbException { @@ -122,7 +136,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieAlternativeTitles method, of class TheMovieDb. + * Test of getMovieAlternativeTitles method, of class TheMovieDbApi. */ @Test public void testGetMovieAlternativeTitles() throws MovieDbException { @@ -138,7 +152,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieCasts method, of class TheMovieDb. + * Test of getMovieCasts method, of class TheMovieDbApi. */ @Test public void testGetMovieCasts() throws MovieDbException { @@ -165,7 +179,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieImages method, of class TheMovieDb. + * Test of getMovieImages method, of class TheMovieDbApi. */ @Test public void testGetMovieImages() throws MovieDbException { @@ -176,7 +190,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieKeywords method, of class TheMovieDb. + * Test of getMovieKeywords method, of class TheMovieDbApi. */ @Test public void testGetMovieKeywords() throws MovieDbException { @@ -186,7 +200,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieReleaseInfo method, of class TheMovieDb. + * Test of getMovieReleaseInfo method, of class TheMovieDbApi. */ @Test public void testGetMovieReleaseInfo() throws MovieDbException { @@ -196,7 +210,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieTrailers method, of class TheMovieDb. + * Test of getMovieTrailers method, of class TheMovieDbApi. */ @Test public void testGetMovieTrailers() throws MovieDbException { @@ -206,7 +220,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieTranslations method, of class TheMovieDb. + * Test of getMovieTranslations method, of class TheMovieDbApi. */ @Test public void testGetMovieTranslations() throws MovieDbException { @@ -216,7 +230,7 @@ public class TheMovieDbTest { } /** - * Test of getCollectionInfo method, of class TheMovieDb. + * Test of getCollectionInfo method, of class TheMovieDbApi. */ @Test public void testGetCollectionInfo() throws MovieDbException { @@ -227,7 +241,7 @@ public class TheMovieDbTest { } /** - * Test of createImageUrl method, of class TheMovieDb. + * Test of createImageUrl method, of class TheMovieDbApi. * @throws MovieDbException */ @Test @@ -239,7 +253,7 @@ public class TheMovieDbTest { } /** - * Test of getMovieInfoImdb method, of class TheMovieDb. + * Test of getMovieInfoImdb method, of class TheMovieDbApi. */ @Test public void testGetMovieInfoImdb() throws MovieDbException { @@ -249,7 +263,7 @@ public class TheMovieDbTest { } /** - * Test of getApiKey method, of class TheMovieDb. + * Test of getApiKey method, of class TheMovieDbApi. */ @Test public void testGetApiKey() { @@ -257,7 +271,7 @@ public class TheMovieDbTest { } /** - * Test of getApiBase method, of class TheMovieDb. + * Test of getApiBase method, of class TheMovieDbApi. */ @Test public void testGetApiBase() { @@ -265,7 +279,7 @@ public class TheMovieDbTest { } /** - * Test of getConfiguration method, of class TheMovieDb. + * Test of getConfiguration method, of class TheMovieDbApi. */ @Test public void testGetConfiguration() { @@ -273,7 +287,7 @@ public class TheMovieDbTest { } /** - * Test of searchPeople method, of class TheMovieDb. + * Test of searchPeople method, of class TheMovieDbApi. */ @Test public void testSearchPeople() throws MovieDbException { @@ -285,7 +299,7 @@ public class TheMovieDbTest { } /** - * Test of getPersonInfo method, of class TheMovieDb. + * Test of getPersonInfo method, of class TheMovieDbApi. */ @Test public void testGetPersonInfo() throws MovieDbException { @@ -295,7 +309,7 @@ public class TheMovieDbTest { } /** - * Test of getPersonCredits method, of class TheMovieDb. + * Test of getPersonCredits method, of class TheMovieDbApi. */ @Test public void testGetPersonCredits() throws MovieDbException { @@ -306,7 +320,7 @@ public class TheMovieDbTest { } /** - * Test of getPersonImages method, of class TheMovieDb. + * Test of getPersonImages method, of class TheMovieDbApi. */ @Test public void testGetPersonImages() throws MovieDbException { @@ -317,7 +331,7 @@ public class TheMovieDbTest { } /** - * Test of getLatestMovie method, of class TheMovieDb. + * Test of getLatestMovie method, of class TheMovieDbApi. */ @Test public void testGetLatestMovie() throws MovieDbException { @@ -328,7 +342,7 @@ public class TheMovieDbTest { } /** - * Test of compareMovies method, of class TheMovieDb. + * Test of compareMovies method, of class TheMovieDbApi. */ @Test public void testCompareMovies() { @@ -336,7 +350,7 @@ public class TheMovieDbTest { } /** - * Test of setProxy method, of class TheMovieDb. + * Test of setProxy method, of class TheMovieDbApi. */ @Test public void testSetProxy() { @@ -344,7 +358,7 @@ public class TheMovieDbTest { } /** - * Test of setTimeout method, of class TheMovieDb. + * Test of setTimeout method, of class TheMovieDbApi. */ @Test public void testSetTimeout() { @@ -352,7 +366,7 @@ public class TheMovieDbTest { } /** - * Test of getNowPlayingMovies method, of class TheMovieDb. + * Test of getNowPlayingMovies method, of class TheMovieDbApi. */ @Test public void testGetNowPlayingMovies() throws MovieDbException { @@ -362,7 +376,7 @@ public class TheMovieDbTest { } /** - * Test of getPopularMovieList method, of class TheMovieDb. + * Test of getPopularMovieList method, of class TheMovieDbApi. */ @Test public void testGetPopularMovieList() throws MovieDbException { @@ -372,7 +386,7 @@ public class TheMovieDbTest { } /** - * Test of getTopRatedMovies method, of class TheMovieDb. + * Test of getTopRatedMovies method, of class TheMovieDbApi. */ @Test public void testGetTopRatedMovies() throws MovieDbException { @@ -382,7 +396,7 @@ public class TheMovieDbTest { } /** - * Test of getCompanyInfo method, of class TheMovieDb. + * Test of getCompanyInfo method, of class TheMovieDbApi. */ @Test public void testGetCompanyInfo() throws MovieDbException { @@ -392,7 +406,7 @@ public class TheMovieDbTest { } /** - * Test of getCompanyMovies method, of class TheMovieDb. + * Test of getCompanyMovies method, of class TheMovieDbApi. */ @Test public void testGetCompanyMovies() throws MovieDbException { @@ -402,7 +416,7 @@ public class TheMovieDbTest { } /** - * Test of searchCompanies method, of class TheMovieDb. + * Test of searchCompanies method, of class TheMovieDbApi. */ @Test public void testSearchCompanies() throws MovieDbException { @@ -412,7 +426,7 @@ public class TheMovieDbTest { } /** - * Test of getSimilarMovies method, of class TheMovieDb. + * Test of getSimilarMovies method, of class TheMovieDbApi. */ @Test public void testGetSimilarMovies() throws MovieDbException { @@ -422,7 +436,7 @@ public class TheMovieDbTest { } /** - * Test of getGenreList method, of class TheMovieDb. + * Test of getGenreList method, of class TheMovieDbApi. */ @Test public void testGetGenreList() throws MovieDbException { @@ -432,7 +446,7 @@ public class TheMovieDbTest { } /** - * Test of getGenreMovies method, of class TheMovieDb. + * Test of getGenreMovies method, of class TheMovieDbApi. */ @Test public void testGetGenreMovies() throws MovieDbException { @@ -442,7 +456,7 @@ public class TheMovieDbTest { } /** - * Test of getUpcoming method, of class TheMovieDb. + * Test of getUpcoming method, of class TheMovieDbApi. */ @Test public void testGetUpcoming() throws Exception { @@ -452,7 +466,7 @@ public class TheMovieDbTest { } /** - * Test of getCollectionImages method, of class TheMovieDb. + * Test of getCollectionImages method, of class TheMovieDbApi. */ @Test public void testGetCollectionImages() throws Exception { @@ -463,7 +477,7 @@ public class TheMovieDbTest { } /** - * Test of getAuthorisationToken method, of class TheMovieDb. + * Test of getAuthorisationToken method, of class TheMovieDbApi. */ // @Test public void testGetAuthorisationToken() throws Exception { @@ -475,7 +489,7 @@ public class TheMovieDbTest { } /** - * Test of getSessionToken method, of class TheMovieDb. + * Test of getSessionToken method, of class TheMovieDbApi. */ // @Test public void testGetSessionToken() throws Exception {