More nullability fixes

rubengees · rubengees · commit 3f3b0de29673 · 2017-09-03T13:08:41.000+02:00
diff --git a/library/src/main/java/me/proxer/library/api/NotificationAdapter.java b/library/src/main/java/me/proxer/library/api/NotificationAdapter.java
@@ -2,6 +2,7 @@
 
 import com.squareup.moshi.FromJson;
 import com.squareup.moshi.Json;
+import com.squareup.moshi.JsonDataException;
 import me.proxer.library.entity.notifications.Notification;
 import me.proxer.library.enums.NotificationType;
 import me.proxer.library.util.ProxerUrls;
@@ -19,6 +20,10 @@ Notification fromJson(final IntermediateNotification json) {
         final String base = ProxerUrls.webBase().toString();
         final HttpUrl properContentLink = HttpUrl.parse(base.substring(0, base.length() - 1) + json.contentLink);
 
+        if (properContentLink == null) {
+            throw new JsonDataException("Invalid link: " + json.contentLink);
+        }
+
         return new Notification(json.id, json.type, json.contentId, properContentLink, json.text,
                 json.date, json.additionalDescription);
     }
diff --git a/library/src/main/java/me/proxer/library/api/ProxerException.java b/library/src/main/java/me/proxer/library/api/ProxerException.java
@@ -25,14 +25,16 @@ public final class ProxerException extends Exception {
     /**
      * Returns the server error type if, and only if, {@link #getErrorType()} returns {@link ErrorType#SERVER}.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     private final ServerErrorType serverErrorType;
 
     /**
      * Returns a error message from the server if, and only if, {@link #getErrorType()} returns
      * {@link ErrorType#SERVER}.
      */
-    @Getter(onMethod = @__({@Override, @Nullable}))
+    @Nullable
+    @Getter(onMethod = @__({@Override}))
     private final String message;
 
     /**
diff --git a/library/src/main/java/me/proxer/library/entity/anime/Stream.java b/library/src/main/java/me/proxer/library/entity/anime/Stream.java
@@ -66,14 +66,30 @@ public class Stream implements ProxerIdItem, ProxerImageItem, ProxerDateItem {
     /**
      * Returns the id of the translator group, if present.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "tid")
     private String translatorGroupId;
 
     /**
      * Returns the name of the translator group, if present.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "tname")
     private String translatorGroupName;
+
+    public Stream(final String id, final String hoster, final String hosterName, final String image,
+                  final String uploaderId, final String uploaderName, final Date date,
+                  @Nullable final String translatorGroupId, @Nullable final String translatorGroupName) {
+        this.id = id;
+        this.hoster = hoster;
+        this.hosterName = hosterName;
+        this.image = image;
+        this.uploaderId = uploaderId;
+        this.uploaderName = uploaderName;
+        this.date = date;
+        this.translatorGroupId = translatorGroupId;
+        this.translatorGroupName = translatorGroupName;
+    }
 }
diff --git a/library/src/main/java/me/proxer/library/entity/info/Industry.java b/library/src/main/java/me/proxer/library/entity/info/Industry.java
@@ -46,7 +46,8 @@ public class Industry implements ProxerIdItem {
     /**
      * Returns the link to the homepage.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "link")
     private HttpUrl link;
 
@@ -55,4 +56,14 @@ public class Industry implements ProxerIdItem {
      */
     @Json(name = "description")
     private String description;
+
+    public Industry(final String id, final String name, final IndustryType type, final Country country,
+                    @Nullable final HttpUrl link, final String description) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.country = country;
+        this.link = link;
+        this.description = description;
+    }
 }
diff --git a/library/src/main/java/me/proxer/library/entity/info/Relation.java b/library/src/main/java/me/proxer/library/entity/info/Relation.java
@@ -105,17 +105,42 @@ public class Relation implements ProxerIdItem {
     /**
      * Returns the year this media was aired or published.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "year")
     private Integer year;
 
     /**
      * Returns the available languages.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "season")
     private Season season;
 
+    public Relation(final String id, final String name, final Set<Genre> genres,
+                    final Set<FskConstraint> fskConstraints, final String description, final Medium medium,
+                    final int episodeAmount, final MediaState state, final int ratingSum, final int ratingAmount,
+                    final int clicks, final Category category, final License license,
+                    final Set<MediaLanguage> languages, @Nullable final Integer year, @Nullable final Season season) {
+        this.id = id;
+        this.name = name;
+        this.genres = genres;
+        this.fskConstraints = fskConstraints;
+        this.description = description;
+        this.medium = medium;
+        this.episodeAmount = episodeAmount;
+        this.state = state;
+        this.ratingSum = ratingSum;
+        this.ratingAmount = ratingAmount;
+        this.clicks = clicks;
+        this.category = category;
+        this.license = license;
+        this.languages = languages;
+        this.year = year;
+        this.season = season;
+    }
+
     /**
      * Returns the average of all ratings.
      */
diff --git a/library/src/main/java/me/proxer/library/entity/info/TranslatorGroup.java b/library/src/main/java/me/proxer/library/entity/info/TranslatorGroup.java
@@ -47,7 +47,8 @@ public class TranslatorGroup implements ProxerIdItem, ProxerImageItem {
     /**
      * Returns the link to the homepage.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "link")
     private HttpUrl link;
 
@@ -68,4 +69,17 @@ public class TranslatorGroup implements ProxerIdItem, ProxerImageItem {
      */
     @Json(name = "cprojects")
     private int projectAmount;
+
+    public TranslatorGroup(final String id, final String name, final Country country, final String image,
+                           @Nullable final HttpUrl link, final String description, final int clicks,
+                           final int projectAmount) {
+        this.id = id;
+        this.name = name;
+        this.country = country;
+        this.image = image;
+        this.link = link;
+        this.description = description;
+        this.clicks = clicks;
+        this.projectAmount = projectAmount;
+    }
 }
diff --git a/library/src/main/java/me/proxer/library/entity/manga/Chapter.java b/library/src/main/java/me/proxer/library/entity/manga/Chapter.java
@@ -60,15 +60,15 @@ public class Chapter implements ProxerIdItem, ProxerDateItem {
      * Returns the id of the scan group if present.
      */
     @Nullable
-    @Getter(onMethod = @__({@Nullable}))
+    @Getter
     @Json(name = "tid")
     private String scanGroupId;
 
     /**
      * Returns the name of the scan group if present.
      */
     @Nullable
-    @Getter(onMethod = @__({@Nullable}))
+    @Getter
     @Json(name = "tname")
     private String scanGroupName;
 
@@ -83,4 +83,19 @@ public class Chapter implements ProxerIdItem, ProxerDateItem {
      */
     @Json(name = "pages")
     private List<Page> pages;
+
+    public Chapter(final String id, final String entryId, final String title, final String uploaderId,
+                   final String uploaderName, final Date date, @Nullable final String scanGroupId,
+                   @Nullable final String scanGroupName, final String server, final List<Page> pages) {
+        this.id = id;
+        this.entryId = entryId;
+        this.title = title;
+        this.uploaderId = uploaderId;
+        this.uploaderName = uploaderName;
+        this.date = date;
+        this.scanGroupId = scanGroupId;
+        this.scanGroupName = scanGroupName;
+        this.server = server;
+        this.pages = pages;
+    }
 }
diff --git a/library/src/main/java/me/proxer/library/entity/notifications/Notification.java b/library/src/main/java/me/proxer/library/entity/notifications/Notification.java
@@ -58,7 +58,19 @@ public class Notification implements ProxerIdItem, ProxerDateItem {
     /**
      * Returns additional info, depending on the {@link #type}.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "description")
     private String additionalDescription;
+
+    public Notification(final String id, final NotificationType type, final String contentId, final HttpUrl contentLink,
+                        final String text, final Date date, @Nullable final String additionalDescription) {
+        this.id = id;
+        this.type = type;
+        this.contentId = contentId;
+        this.contentLink = contentLink;
+        this.text = text;
+        this.date = date;
+        this.additionalDescription = additionalDescription;
+    }
 }
diff --git a/library/src/main/java/me/proxer/library/entity/ucp/Bookmark.java b/library/src/main/java/me/proxer/library/entity/ucp/Bookmark.java
@@ -72,7 +72,8 @@ public class Bookmark implements ProxerIdItem {
     /**
      * Returns the name of the chapter if the associated media is a manga and it is uploaded.
      */
-    @Getter(onMethod = @__({@Nullable}))
+    @Nullable
+    @Getter
     @Json(name = "chapterName")
     private String chapterName;
 
@@ -81,4 +82,19 @@ public class Bookmark implements ProxerIdItem {
      */
     @Json(name = "available")
     private boolean available;
+
+    public Bookmark(final String id, final String entryId, final Category category, final String name,
+                    final int episode, final MediaLanguage language, final Medium medium, final MediaState state,
+                    @Nullable final String chapterName, final boolean available) {
+        this.id = id;
+        this.entryId = entryId;
+        this.category = category;
+        this.name = name;
+        this.episode = episode;
+        this.language = language;
+        this.medium = medium;
+        this.state = state;
+        this.chapterName = chapterName;
+        this.available = available;
+    }
 }
diff --git a/library/src/test/java/me/proxer/library/api/ProxerCallTest.java b/library/src/test/java/me/proxer/library/api/ProxerCallTest.java
@@ -61,7 +61,8 @@ public void testServerError() throws Exception {
                 .isThrownBy(() -> api.messenger().conferences().build().execute())
                 .matches(exception -> exception.getErrorType() == ErrorType.SERVER)
                 .matches(exception -> exception.getServerErrorType() == ServerErrorType.MESSAGES_LOGIN_REQUIRED)
-                .matches(exception -> exception.getMessage().equals("Du bist nicht eingeloggt."));
+                .matches(exception -> exception.getMessage() != null
+                        && exception.getMessage().equals("Du bist nicht eingeloggt."));
     }
 
     @Test(timeout = 1000L)
diff --git a/library/src/test/java/me/proxer/library/api/notifications/NotificationEndpointTest.java b/library/src/test/java/me/proxer/library/api/notifications/NotificationEndpointTest.java
@@ -49,8 +49,13 @@ public void testPath() throws ProxerException, IOException, InterruptedException
     }
 
     private Notification buildTestNotification() {
-        return new Notification("10185686", NotificationType.REMINDER, "49815105",
-                HttpUrl.parse("https://proxer.me/chapter/2373/26/en#top"),
+        final HttpUrl url = HttpUrl.parse("https://proxer.me/chapter/2373/26/en#top");
+
+        if (url == null) {
+            throw new NullPointerException();
+        }
+
+        return new Notification("10185686", NotificationType.REMINDER, "49815105", url,
                 "Lesezeichen: <u>Test123 Manga #26</u> ist online!",
                 new Date(1494452692L * 1000L), "");
     }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ public void testServerError() throws Exception {`
`61`	`61`	`.isThrownBy(() -> api.messenger().conferences().build().execute())`
`62`	`62`	`.matches(exception -> exception.getErrorType() == ErrorType.SERVER)`
`63`	`63`	`.matches(exception -> exception.getServerErrorType() == ServerErrorType.MESSAGES_LOGIN_REQUIRED)`
`64`		`- .matches(exception -> exception.getMessage().equals("Du bist nicht eingeloggt."));`
	`64`	`+ .matches(exception -> exception.getMessage() != null`
	`65`	`+ && exception.getMessage().equals("Du bist nicht eingeloggt."));`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Test(timeout = 1000L)`