create vendor service factory

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Thu Dec 28 08:32:26 EST 2017
+#Fri Dec 29 08:07:50 EST 2017
 version_minor=8
-version_build=5
+version_build=6
 version_patch=8
-version_major=1
 version_store=34
+version_major=1

app/src/main/java/com/vrem/wifianalyzer/MainContext.java

@@ -27,8 +27,8 @@
 
 import com.vrem.wifianalyzer.settings.Repository;
 import com.vrem.wifianalyzer.settings.Settings;
-import com.vrem.wifianalyzer.vendor.model.VendorDB;
 import com.vrem.wifianalyzer.vendor.model.VendorService;
+import com.vrem.wifianalyzer.vendor.model.VendorServiceFactory;
 import com.vrem.wifianalyzer.wifi.filter.adapter.FilterAdapter;
 import com.vrem.wifianalyzer.wifi.scanner.Scanner;
 
@@ -112,7 +112,7 @@ void initialize(@NonNull MainActivity mainActivity, boolean largeScreen) {
         setMainActivity(mainActivity);
         setConfiguration(currentConfiguration);
         setSettings(currentSettings);
-        setVendorService(new VendorDB(mainActivity.getResources()));
+        setVendorService(VendorServiceFactory.makeVendorService(mainActivity.getResources()));
         setScanner(new Scanner(wifiManager, handler, currentSettings));
         setFilterAdapter(new FilterAdapter(currentSettings));
     }

app/src/main/java/com/vrem/wifianalyzer/vendor/model/VendorDB.java

@@ -34,13 +34,17 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-public class VendorDB implements VendorService {
+class VendorDB implements VendorService {
     private final Resources resources;
-    private final Map<String, List<String>> vendors = new TreeMap<>();
-    private final Map<String, String> macs = new TreeMap<>();
+    private final Map<String, List<String>> vendors;
+    private final Map<String, String> macs;
+    private boolean loaded;
 
-    public VendorDB(@NonNull Resources resources) {
+    VendorDB(@NonNull Resources resources) {
         this.resources = resources;
+        this.vendors = new TreeMap<>();
+        this.macs = new TreeMap<>();
+        this.loaded = false;
     }
 
     @NonNull
@@ -87,7 +91,8 @@ Map<String, String> getMacs() {
     }
 
     private void load(@NonNull Resources resources) {
-        if (vendors.isEmpty()) {
+        if (!loaded) {
+            loaded = true;
             String[] lines = VendorUtils.readFile(resources, R.raw.data);
             for (String data : lines) {
                 if (data != null) {

app/src/main/java/com/vrem/wifianalyzer/vendor/model/VendorServiceFactory.java

@@ -0,0 +1,32 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2017  VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.vrem.wifianalyzer.vendor.model;
+
+import android.content.res.Resources;
+import android.support.annotation.NonNull;
+
+public class VendorServiceFactory {
+    private VendorServiceFactory() {
+        throw new IllegalStateException("Factory class");
+    }
+
+    public static VendorService makeVendorService(@NonNull Resources resources) {
+        return new VendorDB(resources);
+    }
+}

app/src/test/java/com/vrem/wifianalyzer/vendor/model/VendorServiceFactoryTest.java

@@ -0,0 +1,43 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2017  VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.vrem.wifianalyzer.vendor.model;
+
+import android.content.res.Resources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class VendorServiceFactoryTest {
+
+    @Mock
+    private Resources resources;
+
+    @Test
+    public void testMakeVendorService() throws Exception {
+        // execute
+        VendorService actual = VendorServiceFactory.makeVendorService(resources);
+        // validate
+        assertTrue(actual instanceof VendorDB);
+    }
+}