Cache size can never be null

3 files changed, 11 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index d396b93..7867a48 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -98,7 +98,7 @@ public class Geocache implements IWaypoint {
      * lazy initialized
      */
     private String hint = null;
-    private CacheSize size = CacheSize.UNKNOWN;
+    @NonNull private CacheSize size = CacheSize.UNKNOWN;
     private float difficulty = 0;
     private float terrain = 0;
     private Float direction = null;
@@ -271,7 +271,7 @@ public class Geocache implements IWaypoint {
         if (!detailed && StringUtils.isBlank(getHint())) {
             hint = other.getHint();
         }
-        if (size == null || CacheSize.UNKNOWN == size) {
+        if (size == CacheSize.UNKNOWN) {
             size = other.size;
         }
         if (difficulty == 0) {
@@ -559,10 +559,8 @@ public class Geocache implements IWaypoint {
         return ownerDisplayName;
     }
 
+    @NonNull
     public CacheSize getSize() {
-        if (size == null) {
-            return CacheSize.UNKNOWN;
-        }
         return size;
     }
 
@@ -1079,13 +1077,8 @@ public class Geocache implements IWaypoint {
         this.hint = hint;
     }
 
-    public void setSize(final CacheSize size) {
-        if (size == null) {
-            this.size = CacheSize.UNKNOWN;
-        }
-        else {
-            this.size = size;
-        }
+    public void setSize(@NonNull final CacheSize size) {
+        this.size = size;
     }
 
     public void setDifficulty(final float difficulty) {
@@ -1478,7 +1471,7 @@ public class Geocache implements IWaypoint {
         warnIncorrectParsingIfBlank(getOwnerUserId(), "owner");
         warnIncorrectParsingIf(getHiddenDate() == null, "hidden");
         warnIncorrectParsingIf(getFavoritePoints() < 0, "favoriteCount");
-        warnIncorrectParsingIf(getSize() == null, "size");
+        warnIncorrectParsingIf(getSize() == CacheSize.UNKNOWN, "size");
         warnIncorrectParsingIf(getType() == null || getType() == CacheType.UNKNOWN, "type");
         warnIncorrectParsingIf(getCoords() == null, "coordinates");
         warnIncorrectParsingIfBlank(getLocation(), "location");
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index e635a52..ee095e3 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -619,6 +619,7 @@ final class OkapiClient {
         cache.setCoords(new Geopoint(latitude, longitude));
     }
 
+    @NonNull
     private static CacheSize getCacheSize(final ObjectNode response) {
         if (!response.has(CACHE_SIZE2)) {
             return getCacheSizeDeprecated(response);
@@ -632,6 +633,7 @@ final class OkapiClient {
         }
     }
 
+    @NonNull
     private static CacheSize getCacheSizeDeprecated(final ObjectNode response) {
         if (!response.has(CACHE_SIZE_DEPRECATED)) {
             return CacheSize.NOT_CHOSEN;
diff --git a/main/src/cgeo/geocaching/enumerations/CacheSize.java b/main/src/cgeo/geocaching/enumerations/CacheSize.java
index 3a2f379..e6c6b8d 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -3,6 +3,8 @@ package cgeo.geocaching.enumerations;
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
@@ -50,6 +52,7 @@ public enum CacheSize {
         FIND_BY_ID = Collections.unmodifiableMap(mapping);
     }
 
+    @NonNull
     public static CacheSize getById(final String id) {
         if (id == null) {
             return UNKNOWN;