Merge pull request #49 from creatubbles/null_safety

Add annotations and remove unused fields/files

Author: szymanskip

api/src/main/java/com/creatubbles/api/Configuration.java

@@ -1,6 +1,7 @@
 package com.creatubbles.api;
 
 import android.app.Application;
+import android.support.annotation.NonNull;
 
 import com.creatubbles.api.exception.InvalidParametersException;
 
@@ -22,7 +23,7 @@ public class Configuration {
     private final Application context;
     private final Locale locale;
 
-    public Configuration(Builder builder) {
+    public Configuration(@NonNull Builder builder) {
         this.clientId = builder.clientId;
         this.clientSecret = builder.clientSecret;
         this.baseUrl = builder.baseUrl;
@@ -38,31 +39,32 @@ public static class Builder {
         Application context;
         Locale locale;
 
-        public Builder clientId(String clientId) {
+        public Builder clientId(@NonNull String clientId) {
             this.clientId = clientId;
             return this;
         }
 
-        public Builder clientSecret(String clientSecret) {
+        public Builder clientSecret(@NonNull String clientSecret) {
             this.clientSecret = clientSecret;
             return this;
         }
 
-        public Builder baseUrl(String baseUrl) {
+        public Builder baseUrl(@NonNull String baseUrl) {
             this.baseUrl = baseUrl;
             return this;
         }
 
-        public Builder application(Application application) {
+        public Builder application(@NonNull Application application) {
             this.context = application;
             return this;
         }
 
-        public Builder locale(Locale locale) {
+        public Builder locale(@NonNull Locale locale) {
             this.locale = locale;
             return this;
         }
 
+        @NonNull
         public Configuration build() {
             if (clientId == null) {
                 throw new InvalidParametersException(INVALID_CLIENT_ID_MESSAGE);

api/src/main/java/com/creatubbles/api/CreatubblesApi.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api;
 
+import android.support.annotation.NonNull;
+
 import com.creatubbles.api.di.modules.ApiModule;
 import com.creatubbles.api.exception.InitializationException;
 
@@ -11,7 +13,7 @@ public final class CreatubblesApi {
 
     private static Configuration apiConfiguration = null;
 
-    public static void initialize(Configuration configuration) {
+    public static void initialize(@NonNull Configuration configuration) {
         if (configuration == null) {
             throw new NullPointerException("Configuration can't be null");
         }

api/src/main/java/com/creatubbles/api/exception/Error.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api.exception;
 
+import android.support.annotation.NonNull;
+
 /**
  * Created by mariuszostapowicz on 08.03.2016.
  */
@@ -9,18 +11,22 @@ public class Error {
     private String title;
     private String detail;
 
+    @NonNull
     public Integer getStatus() {
         return status;
     }
 
+    @NonNull
     public String getCode() {
         return code;
     }
 
+    @NonNull
     public String getTitle() {
         return title;
     }
 
+    @NonNull
     public String getDetail() {
         return detail;
     }

api/src/main/java/com/creatubbles/api/exception/ErrorResponse.java

@@ -1,13 +1,17 @@
 package com.creatubbles.api.exception;
 
+import android.support.annotation.NonNull;
+
+import java.util.Collections;
 import java.util.List;
 
 /**
  * Created by mariuszostapowicz on 08.03.2016.
  */
 public class ErrorResponse {
-    private List<Error> errors;
+    private final List<Error> errors = Collections.emptyList();
 
+    @NonNull
     public List<Error> getErrors() {
         return errors;
     }

api/src/main/java/com/creatubbles/api/model/CreatubblesResponse.java

@@ -1,5 +1,8 @@
 package com.creatubbles.api.model;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import com.github.jasminb.jsonapi.Links;
 
 public class CreatubblesResponse<D> {
@@ -16,14 +19,17 @@ public CreatubblesResponse(D data, Meta meta, Links links) {
         this.links = links;
     }
 
+    @NonNull
     public D getData() {
         return data;
     }
 
+    @Nullable
     public Meta getMeta() {
         return meta;
     }
 
+    @Nullable
     public Links getLinks() {
         return links;
     }

api/src/main/java/com/creatubbles/api/model/GallerySubmission.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api.model;
 
+import android.support.annotation.NonNull;
+
 import com.creatubbles.api.model.creation.Creation;
 import com.creatubbles.api.model.gallery.Gallery;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,15 +28,17 @@ public class GallerySubmission {
     public GallerySubmission() {
     }
 
-    public GallerySubmission(String galleryId, String creationId) {
+    public GallerySubmission(@NonNull String galleryId, @NonNull String creationId) {
         this.gallery = new Gallery(galleryId);
         this.creation = new Creation(creationId);
     }
 
+    @NonNull
     public Gallery getGallery() {
         return gallery;
     }
 
+    @NonNull
     public Creation getCreation() {
         return creation;
     }

api/src/main/java/com/creatubbles/api/model/Meta.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api.model;
 
+import android.support.annotation.Nullable;
+
 import com.creatubbles.api.converter.AbilitiesConverter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -31,30 +33,37 @@ public class Meta {
     @JsonDeserialize(using = AbilitiesConverter.class)
     private List<Ability> abilities;
 
+    @Nullable
     public Integer getTotalPages() {
         return totalPages;
     }
 
+    @Nullable
     public Integer getTotalCount() {
         return totalCount;
     }
 
+    @Nullable
     public List<String> getBubbledCreations() {
         return unmodifiableList(userBubbledCreations);
     }
 
+    @Nullable
     public List<String> getBubbledGalleries() {
         return unmodifiableList(userBubbledGalleries);
     }
 
+    @Nullable
     public List<String> getBubbledUsers() {
         return unmodifiableList(userBubbledUsers);
     }
 
+    @Nullable
     public List<String> getFollowedUsers() {
         return unmodifiableList(followedUsers);
     }
 
+    @Nullable
     public List<Ability> getAbilities() {
         return unmodifiableList(abilities);
     }

api/src/main/java/com/creatubbles/api/model/ObjectType.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api.model;
 
+import android.support.annotation.NonNull;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -25,6 +27,7 @@ public enum ObjectType {
     }
 
     @JsonValue
+    @NonNull
     public String getTypeName() {
         return typeName;
     }

api/src/main/java/com/creatubbles/api/model/PasswordChange.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api.model;
 
+import android.support.annotation.NonNull;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.jasminb.jsonapi.annotations.Id;
@@ -29,7 +31,7 @@ public class PasswordChange {
      *
      * @see PasswordChange#create(String, String)
      */
-    public static PasswordChange create(String newPassword) {
+    public static PasswordChange create(@NonNull String newPassword) {
         return new PasswordChange(newPassword, null, null);
     }
 
@@ -38,7 +40,7 @@ public static PasswordChange create(String newPassword) {
      *
      * @see PasswordChange#create(String)
      */
-    public static PasswordChange create(String newPassword, String currentPassword) {
+    public static PasswordChange create(@NonNull String newPassword, @NonNull String currentPassword) {
         return new PasswordChange(newPassword, currentPassword, newPassword);
     }
 
@@ -56,6 +58,7 @@ public String getId() {
         return id;
     }
 
+    @NonNull
     public String getNewPassword() {
         return newPassword;
     }

api/src/main/java/com/creatubbles/api/model/Report.java

@@ -1,5 +1,7 @@
 package com.creatubbles.api.model;
 
+import android.support.annotation.NonNull;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Type;
@@ -22,14 +24,16 @@ private Report(String message) {
         this.message = message;
     }
 
-    public static Report create(String message) {
+    public static Report create(@NonNull String message) {
         return new Report(message);
     }
 
+    @NonNull
     public String getId() {
         return id;
     }
 
+    @NonNull
     public String getMessage() {
         return message;
     }