Merge pull request #4 from innokenty/master

Simplify embedding into other applications

Author: Artem Eroshenko

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

@@ -1,5 +1,6 @@
 package ru.qatools.gridrouter.config;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -10,15 +11,15 @@ public interface WithCopy {
 
     List<Host> getHosts();
 
+    String getName();
+
     /**
      * Creates a copy for the {@link Region} object, which is almost deep:
      * the hosts itself are not copied although the list is new.
      *
      * @return a copy of the object
      */
     default Region copy() {
-        Region result = new Region();
-        result.getHosts().addAll(getHosts());
-        return result;
+        return new Region(new ArrayList<>(getHosts()), getName());
     }
 }

config/src/test/java/ru/qatools/gridrouter/config/RandomHostSelectionStrategyTest.java

@@ -27,7 +27,7 @@ public void testRandomness() {
         int entriesCount = 5000000;
         int keysCount = 10;
 
-        Host host1 = newHost("host_1", keysCount - 1);
+        Host host1 = new Host("host_1", 4444, keysCount - 1);
 
         List<Host> hosts = new ArrayList<>(keysCount);
         hosts.add(host1);
@@ -54,14 +54,7 @@ public void testRandomness() {
     }
 
     private static Host newHost() {
-        return newHost(UUID.randomUUID().toString(), 1);
-    }
-
-    private static Host newHost(String name, int count) {
-        Host host = new Host();
-        host.setName(name);
-        host.setCount(count);
-        return host;
+        return new Host(UUID.randomUUID().toString(), 4444, 1);
     }
 
     private static Matcher<Integer> isAround(int count) {

pom.xml

@@ -112,13 +112,19 @@
                         <verbose>true</verbose>
                         <args>
                             <arg>-Xinheritance</arg>
+                            <arg>-Xvalue-constructor</arg>
                         </args>
                         <plugins>
                             <plugin>
                                 <groupId>org.jvnet.jaxb2_commons</groupId>
                                 <artifactId>jaxb2-basics</artifactId>
                                 <version>0.9.4</version>
                             </plugin>
+                            <plugin>
+                                <groupId>org.jvnet.jaxb2_commons</groupId>
+                                <artifactId>jaxb2-value-constructor</artifactId>
+                                <version>3.0</version>
+                            </plugin>
                         </plugins>
                     </configuration>
                 </plugin>

proxy/pom.xml

@@ -13,6 +13,13 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>

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

@@ -65,13 +65,16 @@ public void beanChanged(Path filename, Browsers browsers) {
         } else {
             LOGGER.info("Loading quota configuration file [{}]", filename);
             String user = FilenameUtils.getBaseName(filename.toString());
-            userBrowsers.put(user, browsers);
-            routes.putAll(browsers.getRoutesMap());
-            LOGGER.info("Loaded quota configuration for [{}] from [{}]: \n\n{}",
-                    user, filename, browsers.toXml());
+            updateQuota(user, browsers);
         }
     }
 
+    public void updateQuota(String user, Browsers browsers) {
+        userBrowsers.put(user, browsers);
+        routes.putAll(browsers.getRoutesMap());
+        LOGGER.info("Loaded quota configuration for [{}]: \n\n{}", user, browsers.toXml());
+    }
+
     public Map<String, String> getRoutes() {
         return routes;
     }