Merge pull request #18 from innokenty/master

tiny apis improvements

Author: innokenty

config/src/main/java/ru/qatools/gridrouter/config/WithHosts.java

@@ -0,0 +1,22 @@
+package ru.qatools.gridrouter.config;
+
+import java.util.List;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * @author Dmitry Baev charlie@yandex-team.ru
+ * @author Innokenty Shuvalov innokenty@yandex-team.ru
+ */
+public interface WithHosts {
+
+    default List<Host> getHosts() {
+        return getBrowsers().stream()
+                .flatMap(b -> b.getVersions().stream())
+                .flatMap(v -> v.getRegions().stream())
+                .flatMap(r -> r.getHosts().stream())
+                .collect(toList());
+    }
+
+    List<Browser> getBrowsers();
+}

config/src/main/java/ru/qatools/gridrouter/config/WithRoutesMap.java

@@ -1,24 +1,17 @@
 package ru.qatools.gridrouter.config;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
  * @author Dmitry Baev charlie@yandex-team.ru
  * @author Innokenty Shuvalov innokenty@yandex-team.ru
  */
-public interface WithRoutesMap {
-
-    List<Browser> getBrowsers();
+public interface WithRoutesMap extends WithHosts {
 
     default Map<String, String> getRoutesMap() {
-        HashMap<String, String> routes = new HashMap<>();
-        getBrowsers().stream()
-                .flatMap(b -> b.getVersions().stream())
-                .flatMap(v -> v.getRegions().stream())
-                .flatMap(r -> r.getHosts().stream())
-                .forEach(h -> routes.put(h.getRouteId(), h.getRoute()));
+        Map<String, String> routes = new HashMap<>();
+        getHosts().forEach(h -> routes.put(h.getRouteId(), h.getRoute()));
         return routes;
     }
 }

proxy/src/main/java/ru/qatools/gridrouter/ConfigRepository.java

@@ -72,6 +72,10 @@ public void beanChanged(Path filename, Browsers browsers) {
         }
     }
 
+    public Map<String, Browsers> getQuotaMap() {
+        return userBrowsers;
+    }
+
     public Map<String, String> getRoutes() {
         return routes;
     }