birkeh/api-themoviedb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Jackson JSON processor to v2.x

Browse Source
This commit is contained in:
Omertron
2012-10-31 11:39:00 +00:00
parent 95bf1af07e
commit 25cfa62e38
38 changed files with 98 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themoviedbapi/pom.xml
+19 -6
View File
@@ -40,37 +40,50 @@
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-lgpl</artifactId>
<version>1.9.10</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-lgpl</artifactId>
<version>1.9.10</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
</dependencies>
<profiles>
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
+1 -1
View File
@@ -12,6 +12,7 @@
*/
package com.moviejukebox.themoviedb;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.moviejukebox.themoviedb.MovieDbException.MovieDbExceptionType;
import com.moviejukebox.themoviedb.model.*;
import com.moviejukebox.themoviedb.tools.ApiUrl;
@@ -26,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.codehaus.jackson.map.ObjectMapper;
/**
* The MovieDb API
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* The artwork type information
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java
+3 -3
View File
@@ -12,12 +12,12 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
+2 -2
View File
@@ -12,12 +12,12 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* Company information
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java
+3 -3
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
+3 -3
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
+3 -3
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* Movie Bean
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
+2 -2
View File
@@ -12,12 +12,12 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
+3 -3
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
@@ -96,7 +96,7 @@ public class PersonCast implements Serializable {
public void setCastId(int castId) {
this.castId = castId;
}
//</editor-fold>
/**
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
+3 -3
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
+3 -3
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
+2 -2
View File
@@ -12,12 +12,12 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
+2 -2
View File
@@ -12,9 +12,9 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
public class TokenAuthorisation {
/*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
+2 -2
View File
@@ -12,9 +12,9 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
public class TokenSession {
/*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
+1 -1
View File
@@ -12,9 +12,9 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java
+2 -2
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.model;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.AlternativeTitle;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.Company;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.MovieDb;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
+3 -3
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.TmdbConfiguration;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
@@ -40,7 +40,7 @@ public class WrapperConfig {
public void setTmdbConfiguration(TmdbConfiguration tmdbConfiguration) {
this.tmdbConfiguration = tmdbConfiguration;
}
/**
* Handle unknown properties and print a message
* @param key
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.Genre;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
* Wrapper class for the Genres searches
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.Artwork;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.MovieDb;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
+2 -2
View File
@@ -12,12 +12,12 @@
*/
package com.moviejukebox.themoviedb.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 java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.Keyword;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.Person;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.PersonCredit;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.ReleaseInfo;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
+2 -2
View File
@@ -12,11 +12,11 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.moviejukebox.themoviedb.model.Trailer;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
/**
*
themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
+1 -1
View File
@@ -12,10 +12,10 @@
*/
package com.moviejukebox.themoviedb.wrapper;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.moviejukebox.themoviedb.model.Translation;
import java.util.List;
import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAnySetter;
/**
*