Skip to content

Commit

Permalink
simplify logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-eg
c-eg committed Mar 9, 2024
1 parent 7e70707 commit 1fe7b8f
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 176 deletions.
73 changes: 36 additions & 37 deletions src/test/java/info/movito/themoviedbapi/TmdbMoviesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import info.movito.themoviedbapi.tools.TmdbException;
import info.movito.themoviedbapi.tools.appendtoresponse.MovieAppendToResponse;
import info.movito.themoviedbapi.util.AbstractJsonMappingValidator;
import info.movito.themoviedbapi.util.FieldsToIgnore;
import info.movito.themoviedbapi.util.TestUtils;
import info.movito.themoviedbapi.util.Utils;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -60,24 +59,24 @@ public void testGetDetails() throws IOException, TmdbException {
assertNotNull(movie);

AbstractJsonMappingValidator abstractJsonMappingValidator = new AbstractJsonMappingValidator(movie);
List<FieldsToIgnore> fieldsToIgnore = new ArrayList<>();
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "accountStates", "accountStates"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "alternativeTitles", "alternativeTitles"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "credits", "credits"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "changes", "changes"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "externalIds", "externalIds"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "images", "images"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "keywords", "keywords"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "recommendations", "recommendations"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "releaseDates", "releaseDates"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "lists", "lists"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "reviews", "reviews"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "similar", "similar"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "translations", "translations"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "videos", "videos"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "watchProviders", "watchProviders"));

abstractJsonMappingValidator.validateNullFields(fieldsToIgnore);
List<String> filteredModel = new ArrayList<>();
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.accountStates");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.alternativeTitles");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.credits");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.changes");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.externalIds");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.images");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.keywords");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.recommendations");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.releaseDates");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.lists");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.reviews");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.similar");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.translations");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.videos");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.watchProviders");

abstractJsonMappingValidator.validateNullFields(filteredModel);
abstractJsonMappingValidator.validateEmptyCollections();
abstractJsonMappingValidator.validateNullContainingCollection();
abstractJsonMappingValidator.validateEmptyMaps();
Expand Down Expand Up @@ -226,24 +225,24 @@ public void testGetLatest() throws IOException, TmdbException {
assertNotNull(movie);

AbstractJsonMappingValidator abstractJsonMappingValidator = new AbstractJsonMappingValidator(movie);
List<FieldsToIgnore> fieldsToIgnore = new ArrayList<>();
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "accountStates", "accountStates"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "alternativeTitles", "alternativeTitles"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "credits", "credits"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "changes", "changes"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "externalIds", "externalIds"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "images", "images"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "keywords", "keywords"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "recommendations", "recommendations"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "releaseDates", "releaseDates"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "lists", "lists"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "reviews", "reviews"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "similar", "similar"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "translations", "translations"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "videos", "videos"));
fieldsToIgnore.add(new FieldsToIgnore(MovieDb.class, "watchProviders", "watchProviders"));

abstractJsonMappingValidator.validateNullFields(fieldsToIgnore);
List<String> filteredModel = new ArrayList<>();
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.accountStates");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.alternativeTitles");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.credits");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.changes");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.externalIds");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.images");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.keywords");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.recommendations");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.releaseDates");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.lists");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.reviews");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.similar");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.translations");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.videos");
filteredModel.add("info.movito.themoviedbapi.model.movies.MovieDb.watchProviders");

abstractJsonMappingValidator.validateNullFields(filteredModel);
abstractJsonMappingValidator.validateEmptyCollections();
abstractJsonMappingValidator.validateNullContainingCollection();
abstractJsonMappingValidator.validateEmptyMaps();
Expand Down
45 changes: 22 additions & 23 deletions src/test/java/info/movito/themoviedbapi/TmdbPeopleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import info.movito.themoviedbapi.tools.TmdbException;
import info.movito.themoviedbapi.tools.appendtoresponse.PersonAppendToResponse;
import info.movito.themoviedbapi.util.AbstractJsonMappingValidator;
import info.movito.themoviedbapi.util.FieldsToIgnore;
import info.movito.themoviedbapi.util.TestUtils;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -54,17 +53,17 @@ public void testGetDetails() throws IOException, TmdbException {
assertNotNull(details);

AbstractJsonMappingValidator abstractJsonMappingValidator = new AbstractJsonMappingValidator(details);
List<FieldsToIgnore> fieldsToIgnore = new ArrayList<>();
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "changes", "changes"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "combinedCredits", "combinedCredits"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "externalIds", "externalIds"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "images", "images"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "latest", "latest"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "movieCredits", "movieCredits"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "tvCredits", "tvCredits"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "translations", "translations"));

abstractJsonMappingValidator.validateNullFields(fieldsToIgnore);
List<String> filteredModel = new ArrayList<>();
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.changes");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.combinedCredits");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.externalIds");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.images");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.latest");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.movieCredits");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.tvCredits");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.translations");

abstractJsonMappingValidator.validateNullFields(filteredModel);
abstractJsonMappingValidator.validateEmptyCollections();
abstractJsonMappingValidator.validateNullContainingCollection();
abstractJsonMappingValidator.validateEmptyMaps();
Expand Down Expand Up @@ -188,17 +187,17 @@ public void testGetLatest() throws IOException, TmdbException {
assertNotNull(latest);

AbstractJsonMappingValidator abstractJsonMappingValidator = new AbstractJsonMappingValidator(latest);
List<FieldsToIgnore> fieldsToIgnore = new ArrayList<>();
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "changes", "changes"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "combinedCredits", "combinedCredits"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "externalIds", "externalIds"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "images", "images"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "latest", "latest"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "movieCredits", "movieCredits"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "tvCredits", "tvCredits"));
fieldsToIgnore.add(new FieldsToIgnore(PersonDb.class, "translations", "translations"));

abstractJsonMappingValidator.validateNullFields(fieldsToIgnore);
List<String> filteredModel = new ArrayList<>();
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.changes");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.combinedCredits");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.externalIds");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.images");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.latest");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.movieCredits");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.tvCredits");
filteredModel.add("info.movito.themoviedbapi.model.people.PersonDb.translations");

abstractJsonMappingValidator.validateNullFields(filteredModel);
abstractJsonMappingValidator.validateEmptyCollections();
abstractJsonMappingValidator.validateNullContainingCollection();
abstractJsonMappingValidator.validateEmptyMaps();
Expand Down
Loading

0 comments on commit 1fe7b8f

Please sign in to comment.