Markers map is final and initialized inline.

Author: bmaslakov

library/src/main/java/com/airbnb/android/airmapview/NativeGoogleMapFragment.java

@@ -29,13 +29,14 @@
 import com.google.android.gms.maps.model.Polygon;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public class NativeGoogleMapFragment extends SupportMapFragment implements AirMapInterface {
 
   private GoogleMap googleMap;
   private OnMapLoadedListener onMapLoadedListener;
   private boolean myLocationEnabled;
-  private HashMap<Marker, AirMapMarker> markers;
+  private final Map<Marker, AirMapMarker<?>> markers = new HashMap<>();
 
   public static NativeGoogleMapFragment newInstance(AirGoogleMapOptions options) {
     return new NativeGoogleMapFragment().setArguments(options);
@@ -61,7 +62,6 @@ public void init() {
       public void onMapReady(GoogleMap googleMap) {
         if (googleMap != null && getActivity() != null) {
           NativeGoogleMapFragment.this.googleMap = googleMap;
-          NativeGoogleMapFragment.this.markers = new HashMap<>();
           UiSettings settings = NativeGoogleMapFragment.this.googleMap.getUiSettings();
           settings.setZoomControlsEnabled(false);
           settings.setMyLocationButtonEnabled(false);

library/src/main/java/com/airbnb/android/airmapview/WebViewMapFragment.java

@@ -35,14 +35,14 @@
 
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 public abstract class WebViewMapFragment extends Fragment implements AirMapInterface {
 
   private static final String TAG = WebViewMapFragment.class.getSimpleName();
 
   protected WebView webView;
   private ViewGroup mLayout;
-  private HashMap<Long, AirMapMarker> markers;
   private OnMapClickListener onMapClickListener;
   private OnCameraChangeListener onCameraChangeListener;
   private OnMapLoadedListener onMapLoadedListener;
@@ -56,6 +56,7 @@ public abstract class WebViewMapFragment extends Fragment implements AirMapInter
   private boolean loaded;
   private boolean ignoreNextMapMove;
   private View infoWindowView;
+  private final Map<Long, AirMapMarker<?>> markers = new HashMap<>();
 
   private boolean trackUserLocation = false;
 
@@ -81,8 +82,6 @@ public class GeoWebChromeClient extends WebChromeClient {
     webView = (WebView) view.findViewById(R.id.webview);
     mLayout = (ViewGroup) view;
 
-    markers = new HashMap<>();
-
     WebSettings webViewSettings = webView.getSettings();
     webViewSettings.setSupportZoom(true);
     webViewSettings.setBuiltInZoomControls(false);