pass all regions to selection strategy as well

This change provides an option for a custom strategy
to select all the same regions over and over again without
trying others. This may be useful when the strategy
contains some extra specific information about the regions
and therefore may want to select a given region twice.

Author: innokenty

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

@@ -7,7 +7,7 @@
  */
 public interface HostSelectionStrategy {
 
-    Region selectRegion(List<Region> regions);
+    Region selectRegion(List<Region> allRegions, List<Region> unvisitedRegions);
 
     Host selectHost(List<Host> hosts);
 

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

@@ -21,8 +21,8 @@ protected <T extends WithCount> T selectRandom(List<T> elements) {
     }
 
     @Override
-    public Region selectRegion(List<Region> regions) {
-        return selectRandom(regions);
+    public Region selectRegion(List<Region> allRegions, List<Region> unvisitedRegions) {
+        return selectRandom(unvisitedRegions);
     }
 
     @Override

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

@@ -7,15 +7,11 @@
  */
 public class SequentialHostSelectionStrategy implements HostSelectionStrategy {
 
-    private int regionIndex;
-
     private int hostIndex;
 
     @Override
-    public Region selectRegion(List<Region> regions) {
-        Region region = regions.get(regionIndex++ % regions.size());
-        regionIndex %= regions.size();
-        return region;
+    public Region selectRegion(List<Region> allRegions, List<Region> unvisitedRegions) {
+        return unvisitedRegions.get(0);
     }
 
     @Override

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

@@ -98,15 +98,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
         capabilityProcessorFactory.getProcessor(caps).process(caps);
 
-        List<Region> actualRegions = actualVersion.getRegions()
+        List<Region> allRegions = actualVersion.getRegions()
                 .stream().map(Region::copy).collect(toList());
-        List<Region> unusedRegions = new ArrayList<>(actualRegions);
+        List<Region> unvisitedRegions = new ArrayList<>(allRegions);
 
         int attempt = 0;
-        while (!actualRegions.isEmpty()) {
+        while (!allRegions.isEmpty()) {
             attempt++;
 
-            Region currentRegion = hostSelectionStrategy.selectRegion(unusedRegions);
+            Region currentRegion = hostSelectionStrategy.selectRegion(allRegions, unvisitedRegions);
             Host host = hostSelectionStrategy.selectHost(currentRegion.getHosts());
 
             String route = host.getRoute();
@@ -138,12 +138,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             currentRegion.getHosts().remove(host);
             if (currentRegion.getHosts().isEmpty()) {
-                actualRegions.remove(currentRegion);
+                allRegions.remove(currentRegion);
             }
 
-            unusedRegions.remove(currentRegion);
-            if (unusedRegions.isEmpty()) {
-                unusedRegions = new ArrayList<>(actualRegions);
+            unvisitedRegions.remove(currentRegion);
+            if (unvisitedRegions.isEmpty()) {
+                unvisitedRegions = new ArrayList<>(allRegions);
             }
         }