Move more models

This commit is contained in:
Stuart Boston
2015-03-04 11:57:13 +00:00
parent 24ac470ede
commit aa9f52f3c3
12 changed files with 11 additions and 14 deletions
@@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods;
import com.fasterxml.jackson.core.type.TypeReference;
import com.omertron.themoviedbapi.MovieDbException;
import com.omertron.themoviedbapi.model.MovieDbListStatus;
import com.omertron.themoviedbapi.model2.list.ListStatusCode;
import com.omertron.themoviedbapi.model2.StatusCode;
import com.omertron.themoviedbapi.model2.list.ListItem;
import com.omertron.themoviedbapi.model2.list.ListItemStatus;
@@ -123,7 +123,7 @@ public class TmdbLists extends AbstractMethod {
String webpage = httpTools.postRequest(url, jsonBody);
try {
return MAPPER.readValue(webpage, MovieDbListStatus.class).getListId();
return MAPPER.readValue(webpage, ListStatusCode.class).getListId();
} catch (IOException ex) {
throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to create list", url, ex);
}
@@ -1,6 +1,6 @@
package com.omertron.themoviedbapi.model.tv;
import com.omertron.themoviedbapi.model.AbstractIdName;
import com.omertron.themoviedbapi.model2.AbstractIdName;
public class AbstractTv extends AbstractIdName {
@@ -1,6 +1,6 @@
package com.omertron.themoviedbapi.model.tv;
import com.omertron.themoviedbapi.model.AbstractIdName;
import com.omertron.themoviedbapi.model2.AbstractIdName;
public class Network extends AbstractIdName {
@@ -17,7 +17,7 @@
* along with TheMovieDB API. If not;private see <http://www.gnu.org/licenses/>.
*
*/
package com.omertron.themoviedbapi.model;
package com.omertron.themoviedbapi.model2;
import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -20,7 +20,6 @@
package com.omertron.themoviedbapi.model2;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.omertron.themoviedbapi.model.AbstractIdName;
/**
* @author stuart.boston
@@ -20,7 +20,7 @@
package com.omertron.themoviedbapi.model2.keyword;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.omertron.themoviedbapi.model.AbstractIdName;
import com.omertron.themoviedbapi.model2.AbstractIdName;
/**
* @author stuart.boston
@@ -17,12 +17,12 @@
* along with TheMovieDB API. If not;private see <http://www.gnu.org/licenses/>.
*
*/
package com.omertron.themoviedbapi.model;
package com.omertron.themoviedbapi.model2.list;
import com.omertron.themoviedbapi.model2.StatusCode;
import com.fasterxml.jackson.annotation.JsonProperty;
public class MovieDbListStatus extends StatusCode {
public class ListStatusCode extends StatusCode {
@JsonProperty("list_id")
private String listId;
@@ -20,7 +20,6 @@
package com.omertron.themoviedbapi.model2.list;
import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
import com.omertron.themoviedbapi.model.*;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
@@ -21,7 +21,6 @@ package com.omertron.themoviedbapi.model2.movie;
import com.omertron.themoviedbapi.model2.Language;
import com.omertron.themoviedbapi.model2.Genre;
import com.omertron.themoviedbapi.model.*;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.omertron.themoviedbapi.model.person.PersonCast;
import com.omertron.themoviedbapi.model.person.PersonCrew;
@@ -20,7 +20,7 @@
package com.omertron.themoviedbapi.model2.movie;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.omertron.themoviedbapi.model.AbstractIdName;
import com.omertron.themoviedbapi.model2.AbstractIdName;
/**
* @author stuart.boston
@@ -19,7 +19,7 @@
*/
package com.omertron.themoviedbapi.model2.person;
import com.omertron.themoviedbapi.model.AbstractIdName;
import com.omertron.themoviedbapi.model2.AbstractIdName;
/**
* @author stuart.boston
@@ -20,7 +20,7 @@
package com.omertron.themoviedbapi.model2.tv;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.omertron.themoviedbapi.model.AbstractIdName;
import com.omertron.themoviedbapi.model2.AbstractIdName;
import java.util.List;
/**