Refactor wrappers

src/main/java/com/omertron/themoviedbapi/interfaces/IWrapperDates.java

@@ -19,7 +19,7 @@
  */
 package com.omertron.themoviedbapi.interfaces;
 
-import com.omertron.themoviedbapi.wrapper.ResultDates;
+import com.omertron.themoviedbapi.results.ResultDates;
 
 public interface IWrapperDates {
 

src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java

@@ -45,8 +45,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperChanges;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperChanges;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;

src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java

@@ -36,7 +36,7 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java

@@ -28,7 +28,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.net.URL;
 
 /**

src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java

@@ -30,7 +30,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperImages;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java

@@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java

@@ -30,8 +30,8 @@ import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
-import com.omertron.themoviedbapi.wrapper.WrapperConfig;
-import com.omertron.themoviedbapi.wrapper.WrapperJobList;
+import com.omertron.themoviedbapi.results.WrapperConfig;
+import com.omertron.themoviedbapi.results.WrapperJobList;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;

src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java

@@ -28,7 +28,7 @@ import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.net.URL;
 
 /**

src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java

@@ -38,8 +38,8 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.slf4j.LoggerFactory;

src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java

@@ -29,8 +29,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperGenres;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenres;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java

@@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java

@@ -43,13 +43,13 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieKeywords;
-import com.omertron.themoviedbapi.wrapper.WrapperReleaseInfo;
-import com.omertron.themoviedbapi.wrapper.WrapperTranslations;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperAlternativeTitles;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperMovieKeywords;
+import com.omertron.themoviedbapi.results.WrapperReleaseInfo;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java

@@ -42,8 +42,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java

@@ -37,8 +37,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperMultiSearch;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperMultiSearch;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java

@@ -35,8 +35,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java

@@ -43,10 +43,10 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperTranslations;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;

src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java

@@ -36,13 +36,13 @@ import com.omertron.themoviedbapi.model.media.MediaCreditCast;
 import com.omertron.themoviedbapi.model.media.MediaCreditCrew;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.review.Review;
-import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieKeywords;
-import com.omertron.themoviedbapi.wrapper.WrapperReleaseInfo;
-import com.omertron.themoviedbapi.wrapper.WrapperTranslations;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperAlternativeTitles;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperMovieKeywords;
+import com.omertron.themoviedbapi.results.WrapperReleaseInfo;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.util.List;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperAll.java

@@ -17,65 +17,28 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.omertron.themoviedbapi.interfaces.IWrapperDates;
 import com.omertron.themoviedbapi.interfaces.IWrapperPages;
 import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.results.AbstractResults;
 
 /**
  * Base class for the wrappers
  *
  * @author Stuart
  */
-public class AbstractWrapperAll extends AbstractWrapperId implements IIdentification, IWrapperPages, IWrapperDates {
+public class AbstractWrapperAll extends AbstractWrapperIdPages implements IIdentification, IWrapperPages, IWrapperDates {
 
-    @JsonProperty("page")
-    private int page;
-    @JsonProperty("total_pages")
-    private int totalPages;
-    @JsonProperty("total_results")
-    private int totalResults;
     @JsonProperty("dates")
     private ResultDates dates = new ResultDates();
 
-    @Override
-    public int getPage() {
-        return page;
-    }
-
-    @Override
-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    @Override
-    public int getTotalResults() {
-        return totalResults;
-    }
-
     @Override
     public ResultDates getDates() {
         return dates;
     }
 
-    @Override
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    @Override
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    @Override
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
-
     @Override
     public void setDates(ResultDates dates) {
         this.dates = dates;
@@ -87,10 +50,7 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IIdentifica
      * @param results
      */
     @Override
-    public void setResultProperties(AbstractResults results) {
+    public void setResultProperties(AbstractWrapperIdPages results) {
         super.setResultProperties(results);
-        results.setPage(page);
-        results.setTotalPages(totalPages);
-        results.setTotalResults(totalResults);
     }
 }

src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java

@@ -17,16 +17,15 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.omertron.themoviedbapi.model.AbstractJsonMapping;
-import com.omertron.themoviedbapi.results.AbstractResults;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
-public abstract class AbstractWrapper extends AbstractJsonMapping {
+public abstract class AbstractWrapperBase extends AbstractJsonMapping {
 
     /**
      * Get a list of the enums passed
@@ -49,7 +48,7 @@ public abstract class AbstractWrapper extends AbstractJsonMapping {
      *
      * @param results
      */
-    public void setResultProperties(AbstractResults results) {
+    public void setResultProperties(AbstractWrapperIdPages results) {
         // There are no values to copy
         results.setId(0);
         results.setPage(0);

src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperId.java

@@ -17,18 +17,17 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.results.AbstractResults;
 
 /**
  * Base class for the wrappers
  *
  * @author Stuart
  */
-public class AbstractWrapperId extends AbstractWrapper implements IIdentification {
+public class AbstractWrapperId extends AbstractWrapperBase implements IIdentification {
 
     @JsonProperty("id")
     private int id;
@@ -49,7 +48,7 @@ public class AbstractWrapperId extends AbstractWrapper implements IIdentificatio
      * @param results
      */
     @Override
-    public void setResultProperties(AbstractResults results) {
+    public void setResultProperties(AbstractWrapperIdPages results) {
         super.setResultProperties(results);
         results.setId(id);
     }

src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperIdPages.java

@@ -19,28 +19,19 @@
  */
 package com.omertron.themoviedbapi.results;
 
-import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.omertron.themoviedbapi.interfaces.IWrapperPages;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * Abstract class to return the results and the id/page info
  *
  * @author Stuart
  */
-public abstract class AbstractResults implements IIdentification, IWrapperPages {
+public abstract class AbstractWrapperIdPages extends AbstractWrapperId implements IWrapperPages {
 
-    private int id = 0;
     private int page = 0;
     private int totalPages = 0;
     private int totalResults = 0;
 
-    @Override
-    public int getId() {
-        return id;
-    }
-
     @Override
     public int getPage() {
         return page;
@@ -56,11 +47,6 @@ public abstract class AbstractResults implements IIdentification, IWrapperPages
         return totalResults;
     }
 
-    @Override
-    public void setId(int id) {
-        this.id = id;
-    }
-
     @Override
     public void setPage(int page) {
         this.page = page;
@@ -76,8 +62,16 @@ public abstract class AbstractResults implements IIdentification, IWrapperPages
         this.totalResults = totalResults;
     }
 
+    /**
+     * Copy the wrapper values to the results
+     *
+     * @param results
+     */
     @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    public void setResultProperties(AbstractWrapperIdPages results) {
+        super.setResultProperties(results);
+        results.setPage(page);
+        results.setTotalPages(totalPages);
+        results.setTotalResults(totalResults);
     }
 }

src/main/java/com/omertron/themoviedbapi/results/ResultDates.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.AbstractJsonMapping;

src/main/java/com/omertron/themoviedbapi/results/ResultList.java

@@ -31,7 +31,7 @@ import java.util.List;
  * @author Stuart
  * @param <T>
  */
-public final class ResultList<T> extends AbstractResults {
+public final class ResultList<T> extends AbstractWrapperIdPages {
 
     private List<T> results;
 

src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java

@@ -32,7 +32,7 @@ import java.util.Map;
  * @param <K>
  * @param <V>
  */
-public final class ResultsMap<K, V> extends AbstractResults {
+public final class ResultsMap<K, V> extends AbstractWrapperIdPages {
 
     private Map<K, V> results;
 

src/main/java/com/omertron/themoviedbapi/results/WrapperAlternativeTitles.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.media.AlternativeTitle;

src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java

@@ -17,14 +17,14 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WrapperChanges extends AbstractWrapper {
+public class WrapperChanges extends AbstractWrapperBase {
 
     @JsonProperty("changes")
     private List<ChangeKeyItem> changedItems = new ArrayList<ChangeKeyItem>();

src/main/java/com/omertron/themoviedbapi/results/WrapperConfig.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.config.Configuration;
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperConfig extends AbstractWrapper {
+public class WrapperConfig extends AbstractWrapperBase {
 
     @JsonProperty("images")
     private Configuration tmdbConfiguration;

src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/omertron/themoviedbapi/results/WrapperGenres.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Genre;
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperGenres extends AbstractWrapper {
+public class WrapperGenres extends AbstractWrapperBase {
 
     @JsonProperty("genres")
     private List<Genre> genres;

src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.enumeration.ArtworkType;

src/main/java/com/omertron/themoviedbapi/results/WrapperJobList.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.config.JobDepartment;
@@ -27,7 +27,7 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperJobList extends AbstractWrapper {
+public class WrapperJobList extends AbstractWrapperBase {
 
     @JsonProperty("jobs")
     private List<JobDepartment> jobs;

src/main/java/com/omertron/themoviedbapi/results/WrapperMovieKeywords.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.keyword.Keyword;

src/main/java/com/omertron/themoviedbapi/results/WrapperMultiSearch.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonSubTypes;

src/main/java/com/omertron/themoviedbapi/results/WrapperReleaseInfo.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.movie.ReleaseInfo;

src/main/java/com/omertron/themoviedbapi/results/WrapperTranslations.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.media.Translation;

src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.omertron.themoviedbapi.model.media.Trailer;