Dev #31
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,7 +43,7 @@ | |
| public MediaPage getMovie(@Argument(name = "id") Integer id, @Argument(name = "name") String name, DataFetchingEnvironment dataFetchingEnvironment) { | ||
| name = name == null ? null : name.trim(); | ||
|
|
||
| if (name == null && id == null || name == "" && id == null) { | ||
|
Check warning on line 46 in src/main/java/com/espacogeek/geek/controllers/MediaController.java
|
||
| return new MediaPage(); | ||
| } | ||
|
|
||
|
|
@@ -62,7 +62,7 @@ | |
| public MediaPage getSerie(@Argument(name = "id") Integer id, @Argument(name = "name") String name, DataFetchingEnvironment dataFetchingEnvironment) { | ||
| name = name == null ? null : name.trim(); | ||
|
|
||
| if (name == null && id == null || name == "" && id == null) { | ||
|
Check warning on line 65 in src/main/java/com/espacogeek/geek/controllers/MediaController.java
|
||
| return new MediaPage(); | ||
|
Comment on lines
+65
to
66
There was a problem hiding this comment. This check uses |
||
| } | ||
|
|
||
|
|
@@ -81,7 +81,7 @@ | |
| public MediaPage getGame(@Argument(name = "id") Integer id, @Argument(name = "name") String name, DataFetchingEnvironment dataFetchingEnvironment) { | ||
| name = name == null ? null : name.trim(); | ||
|
|
||
| if (name == null && id == null || name == "" && id == null) { | ||
|
Check warning on line 84 in src/main/java/com/espacogeek/geek/controllers/MediaController.java
|
||
| return new MediaPage(); | ||
|
Comment on lines
+84
to
85
There was a problem hiding this comment. This check uses |
||
| } | ||
|
|
||
|
|
@@ -101,7 +101,7 @@ | |
| MediaPage response = new MediaPage(); | ||
| name = name == null ? null : name.trim(); | ||
|
|
||
| if (name == null && id == null || name == "" && id == null) { | ||
|
Check warning on line 104 in src/main/java/com/espacogeek/geek/controllers/MediaController.java
|
||
| return response; | ||
|
Comment on lines
+104
to
105
There was a problem hiding this comment. This check uses |
||
| } | ||
|
|
||
|
|
@@ -119,7 +119,7 @@ | |
| public MediaPage getAnime(@Argument(name = "id") Integer id, @Argument(name = "name") String name, DataFetchingEnvironment dataFetchingEnvironment) { | ||
| name = name == null ? null : name.trim(); | ||
|
|
||
| if (name == null && id == null || name == "" && id == null) { | ||
|
Check warning on line 122 in src/main/java/com/espacogeek/geek/controllers/MediaController.java
|
||
| return new MediaPage(); | ||
|
Comment on lines
+122
to
123
There was a problem hiding this comment. This check uses |
||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -1,11 +1,14 @@ | ||||||||
| package com.espacogeek.geek.utils; | ||||||||
|
|
||||||||
| import java.io.IOException; | ||||||||
| import java.io.InputStream; | ||||||||
| import java.io.BufferedReader; | ||||||||
| import java.io.InputStreamReader; | ||||||||
| import java.text.MessageFormat; | ||||||||
| import java.time.LocalDateTime; | ||||||||
| import java.util.zip.GZIPInputStream; | ||||||||
|
|
||||||||
| import lombok.Getter; | ||||||||
| import org.json.simple.JSONArray; | ||||||||
| import org.json.simple.JSONObject; | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| import org.json.simple.parser.JSONParser; | ||||||||
|
|
@@ -21,7 +24,8 @@ | |||||||
| public final class DataJumpUtils { | ||||||||
| private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(DataJumpUtils.class); | ||||||||
|
|
||||||||
| @Getter | ||||||||
| public enum DataJumpTypeTMDB { | ||||||||
| MOVIE("movie"), SERIES("tv_series"), PERSON("person"); | ||||||||
|
|
||||||||
| private final String value; | ||||||||
|
|
@@ -30,22 +34,15 @@ public static enum DataJumpTypeTMDB { | |||||||
| this.value = value; | ||||||||
| } | ||||||||
|
|
||||||||
| } | ||||||||
|
|
||||||||
| /** | ||||||||
| * | ||||||||
| * This function get the daily datajump available by tmdb as a stream | ||||||||
| * | ||||||||
| * @return an uncompressed GZIP InputStream with all titles | ||||||||
| */ | ||||||||
| public static InputStream getDataJumpTMDBStream(final @NotNull DataJumpTypeTMDB type) { | ||||||||
| var now = LocalDateTime.now(); | ||||||||
|
|
||||||||
| // formatting the date to do request as tmdb pattern | ||||||||
|
|
@@ -54,7 +51,7 @@ public static JSONArray getDataJumpTMDBArray(final @NotNull DataJumpTypeTMDB typ | |||||||
| var year = String.valueOf(now.getYear()).replace(".", ""); | ||||||||
|
|
||||||||
| var client = new OkHttpClient().newBuilder().build(); | ||||||||
| Request request; | ||||||||
| try { | ||||||||
| request = new Request.Builder() | ||||||||
| .url(MessageFormat.format("http://files.tmdb.org/p/exports/{3}_ids_{0}_{1}_{2}.json.gz", month, day, year, type.getValue())) | ||||||||
|
|
@@ -68,29 +65,43 @@ public static JSONArray getDataJumpTMDBArray(final @NotNull DataJumpTypeTMDB typ | |||||||
| Response response = null; | ||||||||
| try { | ||||||||
| response = client.newCall(request).execute(); | ||||||||
| if (!response.isSuccessful()) { | ||||||||
| log.error("Failed to fetch TMDB daily export: {}", response.message()); | ||||||||
| response.close(); | ||||||||
| throw new com.espacogeek.geek.exception.RequestException(); | ||||||||
| } | ||||||||
| assert response.body() != null; | ||||||||
| return new GZIPInputStream(response.body().byteStream()); | ||||||||
| } catch (IOException e) { | ||||||||
|
Comment on lines
65
to
75
There was a problem hiding this comment.
|
||||||||
| log.error(e.getMessage(), e); | ||||||||
| if (response != null) response.close(); | ||||||||
| throw new com.espacogeek.geek.exception.RequestException(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /** | ||||||||
| * | ||||||||
| * This function get the daily datajump available by tmdb | ||||||||
| * | ||||||||
| * @return a JSON Array with all serie titles | ||||||||
| */ | ||||||||
| @SuppressWarnings({ "unchecked" }) | ||||||||
| @Retryable(maxAttempts = 2, backoff = @Backoff(delay = 2000), retryFor = com.espacogeek.geek.exception.RequestException.class) | ||||||||
| public static JSONArray getDataJumpTMDBArray(final @NotNull DataJumpTypeTMDB type) { | ||||||||
| JSONArray jsonArray = new JSONArray(); | ||||||||
| try (InputStream is = getDataJumpTMDBStream(type); | ||||||||
| BufferedReader reader = new BufferedReader(new InputStreamReader(is))) { | ||||||||
| String line; | ||||||||
|
Comment on lines
+92
to
+94
There was a problem hiding this comment.
|
||||||||
| JSONParser parser = new JSONParser(); | ||||||||
| while ((line = reader.readLine()) != null) { | ||||||||
| try { | ||||||||
| jsonArray.add(parser.parse(line)); | ||||||||
| } catch (ParseException e) { | ||||||||
| log.error("Error parsing TMDB JSON line: {}", e.getMessage()); | ||||||||
| } | ||||||||
| } | ||||||||
| } catch (Exception e) { | ||||||||
| log.error("Error reading TMDB array: {}", e.getMessage()); | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| } | ||||||||
| return jsonArray; | ||||||||
| } | ||||||||
|
|
||||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -34,13 +34,13 @@ | |||||
| * update was more than one day ago | ||||||
| * or if the update date is null), <code>false</code> otherwise | ||||||
| */ | ||||||
| public static Boolean updateMediaWhenLastTimeUpdateMoreThanOneDay(MediaModel media) { | ||||||
|
There was a problem hiding this comment. This method is now
Suggested change
|
||||||
| if (media == null) | ||||||
| return false; | ||||||
|
|
||||||
| LocalDate mediaUpdateAt = media.getUpdateAt() == null ? null : LocalDate.ofInstant(media.getUpdateAt().toInstant(), ZoneId.systemDefault()); | ||||||
|
|
||||||
| if (mediaUpdateAt == null || ChronoUnit.DAYS.between(mediaUpdateAt, LocalDate.now()) > 1l) { | ||||||
|
Check warning on line 43 in src/main/java/com/espacogeek/geek/utils/MediaUtils.java
|
||||||
| return true; | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -61,7 +61,7 @@ | |||||
| */ | ||||||
| public static List<MediaModel> updateGenericMedia(List<MediaModel> medias, MediaDataController mediaDataController, | ||||||
| TypeReferenceModel typeReference, MediaApi mediaApi) { | ||||||
| List<MediaModel> updatedMedias = new ArrayList<>(); | ||||||
|
Check warning on line 64 in src/main/java/com/espacogeek/geek/utils/MediaUtils.java
|
||||||
|
|
||||||
| for (MediaModel media : medias) { | ||||||
| updatedMedias.add(updateMediaWhenLastTimeUpdateMoreThanOneDay(media) | ||||||
|
|
@@ -81,7 +81,7 @@ | |||||
| * @return the list of updated medias | ||||||
| */ | ||||||
| public static List<MediaModel> updateMedia(List<MediaModel> medias, MediaDataController mediaDataController) { | ||||||
| List<MediaModel> updatedMedias = new ArrayList<>(); | ||||||
|
Check warning on line 84 in src/main/java/com/espacogeek/geek/utils/MediaUtils.java
|
||||||
|
|
||||||
| for (MediaModel media : medias) { | ||||||
| updatedMedias.add(updateMediaWhenLastTimeUpdateMoreThanOneDay(media) | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This check uses
name == "", which compares references rather than string content; empty (or whitespace-only) names may not be detected and will fall through to the service call unexpectedly. After trimming, prefername.isEmpty()/name.isBlank()(and simplify to something likeif (id == null && (name == null || name.isBlank()))).