From af0b65758656cebac054a406d00fe2dc5600d531 Mon Sep 17 00:00:00 2001
From: Stuart Boston <Stuart.Boston@Gmail.com>
Date: Wed, 19 Dec 2012 16:00:57 +0000
Subject: [PATCH] Remove deprecated functions

---
 .../omertron/themoviedbapi/TheMovieDbApi.java | 151 ------------------
 .../themoviedbapi/TheMovieDbApiTest.java      |  14 +-
 2 files changed, 7 insertions(+), 158 deletions(-)

diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
index 9037db925..416221a12 100644
--- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
@@ -1381,155 +1381,4 @@ public class TheMovieDbApi {
     }
 
     //</editor-fold>
-    //
-    /*
-     * Deprecated Functions.
-     *
-     * Will be removed in next version: 3.3
-     */
-    //<editor-fold defaultstate="collapsed" desc="Deprecated Functions">
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param movieName
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> searchMovie(String movieName, String language, boolean allResults) throws MovieDbException {
-        return searchMovie(movieName, 0, language, allResults, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param companyName
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<Company> searchCompanies(String companyName, String language, boolean allResults) throws MovieDbException {
-        return searchCompanies(companyName, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param personName
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<Person> searchPeople(String personName, boolean allResults) throws MovieDbException {
-        return searchPeople(personName, allResults, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param movieId
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getSimilarMovies(int movieId, String language, boolean allResults) throws MovieDbException {
-        return getSimilarMovies(movieId, language, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param language
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getUpcoming(String language) throws MovieDbException {
-        return getUpcoming(language, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getNowPlayingMovies(String language, boolean allResults) throws MovieDbException {
-        return getNowPlayingMovies(language, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getPopularMovieList(String language, boolean allResults) throws MovieDbException {
-        return getPopularMovieList(language, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getTopRatedMovies(String language, boolean allResults) throws MovieDbException {
-        return getTopRatedMovies(language, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param companyId
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getCompanyMovies(int companyId, String language, boolean allResults) throws MovieDbException {
-        return getCompanyMovies(companyId, language, 0);
-    }
-
-    /**
-     * This interface will be deprecated in the next version
-     *
-     * @param genreId
-     * @param language
-     * @param allResults
-     * @return
-     * @throws MovieDbException
-     * @deprecated
-     */
-    @Deprecated
-    public List<MovieDb> getGenreMovies(int genreId, String language, boolean allResults) throws MovieDbException {
-        return getGenreMovies(genreId, language, 0);
-    }
-    //</editor-fold>
 }
diff --git a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
index 7e9f30123..44b1b9e0b 100644
--- a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
@@ -297,8 +297,8 @@ public class TheMovieDbApiTest {
     public void testSearchPeople() throws MovieDbException {
         logger.info("searchPeople");
         String personName = "Bruce Willis";
-        boolean allResults = false;
-        List<Person> result = tmdb.searchPeople(personName, allResults);
+        boolean includeAdult = false;
+        List<Person> result = tmdb.searchPeople(personName, includeAdult, 0);
         assertTrue("Couldn't find the person", result.size() > 0);
     }
 
@@ -415,7 +415,7 @@ public class TheMovieDbApiTest {
     @Test
     public void testGetCompanyMovies() throws MovieDbException {
         logger.info("getCompanyMovies");
-        List<MovieDb> results = tmdb.getCompanyMovies(ID_COMPANY_LUCASFILM, "", true);
+        List<MovieDb> results = tmdb.getCompanyMovies(ID_COMPANY_LUCASFILM, "", 0);
         assertTrue("No company movies found", !results.isEmpty());
     }
 
@@ -425,7 +425,7 @@ public class TheMovieDbApiTest {
     @Test
     public void testSearchCompanies() throws MovieDbException {
         logger.info("searchCompanies");
-        List<Company> results = tmdb.searchCompanies(COMPANY_NAME, "", true);
+        List<Company> results = tmdb.searchCompanies(COMPANY_NAME, 0);
         assertTrue("No company information found", !results.isEmpty());
     }
 
@@ -435,7 +435,7 @@ public class TheMovieDbApiTest {
     @Test
     public void testGetSimilarMovies() throws MovieDbException {
         logger.info("getSimilarMovies");
-        List<MovieDb> results = tmdb.getSimilarMovies(ID_MOVIE_BLADE_RUNNER, "", true);
+        List<MovieDb> results = tmdb.getSimilarMovies(ID_MOVIE_BLADE_RUNNER, "", 0);
         assertTrue("No similar movies found", !results.isEmpty());
     }
 
@@ -455,7 +455,7 @@ public class TheMovieDbApiTest {
     @Test
     public void testGetGenreMovies() throws MovieDbException {
         logger.info("getGenreMovies");
-        List<MovieDb> results = tmdb.getGenreMovies(ID_GENRE_ACTION, "", true);
+        List<MovieDb> results = tmdb.getGenreMovies(ID_GENRE_ACTION, "", 0);
         assertTrue("No genre movies found", !results.isEmpty());
     }
 
@@ -465,7 +465,7 @@ public class TheMovieDbApiTest {
     @Test
     public void testGetUpcoming() throws Exception {
         logger.info("getUpcoming");
-        List<MovieDb> results = tmdb.getUpcoming("");
+        List<MovieDb> results = tmdb.getUpcoming("", 0);
         assertTrue("No upcoming movies found", !results.isEmpty());
     }