Do not overprotect private fields in enumerations

Those fields are not exposed, and the @NonNull annotation requires that
they are initialized from the beginning.

5 files changed, 24 insertions, 62 deletions

diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
index 823ea7e..585b890 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
@@ -9,7 +9,6 @@ import org.eclipse.jdt.annotation.Nullable;
 
 import android.util.SparseArray;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -165,20 +164,15 @@ public enum CacheAttribute {
                 enabled ? stringIdYes : stringIdNo);
     }
 
-    @NonNull
-    private final static Map<String, CacheAttribute> FIND_BY_GCRAWNAME;
-
-    @NonNull
+    private final static Map<String, CacheAttribute> FIND_BY_GCRAWNAME = new HashMap<>();
     private final static SparseArray<CacheAttribute> FIND_BY_OCACODE = new SparseArray<>();
     static {
-        final HashMap<String, CacheAttribute> mapGcRawNames = new HashMap<>();
         for (final CacheAttribute attr : values()) {
-            mapGcRawNames.put(attr.rawName, attr);
+            FIND_BY_GCRAWNAME.put(attr.rawName, attr);
             if (attr.ocacode != NO_ID) {
                 FIND_BY_OCACODE.put(attr.ocacode, attr);
             }
         }
-        FIND_BY_GCRAWNAME = Collections.unmodifiableMap(mapGcRawNames);
     }
 
     @Nullable
diff --git a/main/src/cgeo/geocaching/enumerations/CacheSize.java b/main/src/cgeo/geocaching/enumerations/CacheSize.java
index 37446b9..54e12e0 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -5,7 +5,6 @@ import cgeo.geocaching.R;
 
 import org.eclipse.jdt.annotation.NonNull;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -40,17 +39,14 @@ public enum CacheSize {
         this.ocSize2 = ocSize2;
     }
 
-    @NonNull
-    final private static Map<String, CacheSize> FIND_BY_ID;
+    final private static Map<String, CacheSize> FIND_BY_ID = new HashMap<>();
     static {
-        final HashMap<String, CacheSize> mapping = new HashMap<>();
         for (final CacheSize cs : values()) {
-            mapping.put(cs.id.toLowerCase(Locale.US), cs);
-            mapping.put(cs.ocSize2.toLowerCase(Locale.US), cs);
+            FIND_BY_ID.put(cs.id.toLowerCase(Locale.US), cs);
+            FIND_BY_ID.put(cs.ocSize2.toLowerCase(Locale.US), cs);
         }
         // add medium as additional string for Regular
-        mapping.put("medium", CacheSize.REGULAR);
-        FIND_BY_ID = Collections.unmodifiableMap(mapping);
+        FIND_BY_ID.put("medium", CacheSize.REGULAR);
     }
 
     @NonNull
@@ -73,9 +69,6 @@ public enum CacheSize {
 
     /**
      * Bad GPX files can contain the container size encoded as number.
-     *
-     * @param id
-     * @return
      */
     @NonNull
     private static CacheSize getByNumber(final String id) {
diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java
index f551c52..e66c742 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheType.java
@@ -6,7 +6,6 @@ import cgeo.geocaching.R;
 
 import org.eclipse.jdt.annotation.NonNull;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -58,34 +57,22 @@ public enum CacheType {
         this.markerId = markerId;
     }
 
-    @NonNull
-    private final static Map<String, CacheType> FIND_BY_ID;
-
-    @NonNull
-    private final static Map<String, CacheType> FIND_BY_PATTERN;
-
-    @NonNull
-    private final static Map<String, CacheType> FIND_BY_GUID;
+    private final static Map<String, CacheType> FIND_BY_ID = new HashMap<>();
+    private final static Map<String, CacheType> FIND_BY_PATTERN = new HashMap<>();
+    private final static Map<String, CacheType> FIND_BY_GUID = new HashMap<>();
 
     static {
-        final HashMap<String, CacheType> mappingId = new HashMap<>();
-        final HashMap<String, CacheType> mappingPattern = new HashMap<>();
-        final HashMap<String, CacheType> mappingGuid = new HashMap<>();
         for (final CacheType ct : values()) {
-            mappingId.put(ct.id, ct);
-            mappingPattern.put(ct.pattern.toLowerCase(Locale.US), ct);
-            mappingGuid.put(ct.guid, ct);
+            FIND_BY_ID.put(ct.id, ct);
+            FIND_BY_PATTERN.put(ct.pattern.toLowerCase(Locale.US), ct);
+            FIND_BY_GUID.put(ct.guid, ct);
         }
         // Add old mystery type for GPX file compatibility.
-        mappingPattern.put("Mystery Cache".toLowerCase(Locale.US), MYSTERY);
+        FIND_BY_PATTERN.put("Mystery Cache".toLowerCase(Locale.US), MYSTERY);
         // This pattern briefly appeared on gc.com in 2014-08.
-        mappingPattern.put("Traditional Geocache".toLowerCase(Locale.US), TRADITIONAL);
+        FIND_BY_PATTERN.put("Traditional Geocache".toLowerCase(Locale.US), TRADITIONAL);
         // map lab caches to the virtual type for the time being
-        mappingPattern.put("Lab Cache".toLowerCase(Locale.US), VIRTUAL);
-
-        FIND_BY_ID = Collections.unmodifiableMap(mappingId);
-        FIND_BY_PATTERN = Collections.unmodifiableMap(mappingPattern);
-        FIND_BY_GUID = Collections.unmodifiableMap(mappingGuid);
+        FIND_BY_PATTERN.put("Lab Cache".toLowerCase(Locale.US), VIRTUAL);
     }
 
     @NonNull
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index 4c83321..a27ec1a 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -5,7 +5,6 @@ import cgeo.geocaching.R;
 
 import org.eclipse.jdt.annotation.NonNull;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -67,22 +66,15 @@ public enum LogType {
         this(id, iconName, type, oc_type, stringId, R.drawable.mark_gray);
     }
 
-    @NonNull
-    private final static Map<String, LogType> FIND_BY_ICONNAME;
-
-    @NonNull
-    private final static Map<String, LogType> FIND_BY_TYPE;
+    private final static Map<String, LogType> FIND_BY_ICONNAME = new HashMap<>();
+    private final static Map<String, LogType> FIND_BY_TYPE = new HashMap<>();
     static {
-        final HashMap<String, LogType> mappingPattern = new HashMap<>();
-        final HashMap<String, LogType> mappingType = new HashMap<>();
         for (final LogType lt : values()) {
             if (lt.iconName != null) {
-                mappingPattern.put(lt.iconName, lt);
+                FIND_BY_ICONNAME.put(lt.iconName, lt);
             }
-            mappingType.put(lt.type, lt);
+            FIND_BY_TYPE.put(lt.type, lt);
         }
-        FIND_BY_ICONNAME = Collections.unmodifiableMap(mappingPattern);
-        FIND_BY_TYPE = Collections.unmodifiableMap(mappingType);
     }
 
     @NonNull
diff --git a/main/src/cgeo/geocaching/enumerations/WaypointType.java b/main/src/cgeo/geocaching/enumerations/WaypointType.java
index 81c0e4d..707b9f3 100644
--- a/main/src/cgeo/geocaching/enumerations/WaypointType.java
+++ b/main/src/cgeo/geocaching/enumerations/WaypointType.java
@@ -39,21 +39,17 @@ public enum WaypointType {
      * inverse lookup of waypoint IDs<br/>
      * non public so that <code>null</code> handling can be handled centrally in the enum type itself
      */
-    @NonNull
-    private static final Map<String, WaypointType> FIND_BY_ID;
-
-    @NonNull
-    public static final Set<WaypointType> ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL = new HashSet<>();
+    private static final Map<String, WaypointType> FIND_BY_ID = new HashMap();
+    private static final Set<WaypointType> ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL_TMP = new HashSet<>();
     static {
-        final HashMap<String, WaypointType> mapping = new HashMap<>();
         for (final WaypointType wt : values()) {
-            mapping.put(wt.id, wt);
+            FIND_BY_ID.put(wt.id, wt);
             if (wt != WaypointType.OWN && wt != WaypointType.ORIGINAL) {
-                ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL.add(wt);
+                ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL_TMP.add(wt);
             }
         }
-        FIND_BY_ID = Collections.unmodifiableMap(mapping);
     }
+    public static final Set<WaypointType> ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL = Collections.unmodifiableSet(ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL_TMP);
 
     /**
      * inverse lookup of waypoint IDs<br/>