upgrade to beanloader 2.1

Author: innokenty

proxy/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>ru.yandex.qatools.beanloader</groupId>
             <artifactId>beanloader</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
         </dependency>
 
         <!-- Commons -->

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

@@ -6,23 +6,20 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 import ru.qatools.beanloader.BeanChangeListener;
+import ru.qatools.beanloader.BeanLoader;
 import ru.qatools.beanloader.BeanWatcher;
 import ru.qatools.gridrouter.config.Browser;
 import ru.qatools.gridrouter.config.Browsers;
 import ru.qatools.gridrouter.config.Version;
 import ru.qatools.gridrouter.json.JsonCapabilities;
 
 import javax.annotation.PostConstruct;
-import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
-import static java.nio.file.Files.newDirectoryStream;
-
 /**
  * @author Alexander Andyashin [email protected]
  * @author Dmitry Baev [email protected]
@@ -46,26 +43,17 @@ public class ConfigRepository implements BeanChangeListener<Browsers> {
     private Map<String, String> routes = new HashMap<>();
 
     @PostConstruct
-    public void init() throws JAXBException, IOException {
-        if (quotaHotReload) {
-            startQuotaWatcher();
-        } else {
-            loadQuotaOnce();
-        }
-    }
-
-    private void startQuotaWatcher() {
-        LOGGER.debug("Starting quota watcher");
+    public void init() {
         try {
-            BeanWatcher.watchFor(Browsers.class, quotaDirectory.getPath(), XML_GLOB, this);
+            if (quotaHotReload) {
+                LOGGER.debug("Starting quota watcher");
+                BeanWatcher.watchFor(Browsers.class, quotaDirectory.toPath(), XML_GLOB, this);
+            } else {
+                LOGGER.debug("Loading quota configuration");
+                BeanLoader.loadAll(Browsers.class, quotaDirectory.toPath(), XML_GLOB, this);
+            }
         } catch (IOException e) {
-            LOGGER.error("Quota configuration loading failed: \n\n{}", e);
-        }
-    }
-
-    private void loadQuotaOnce() throws IOException {
-        for (Path filename : newDirectoryStream(quotaDirectory.toPath(), XML_GLOB)) {
-            beanChanged(filename, JAXB.unmarshal(filename.toFile(), Browsers.class));
+            LOGGER.error("Quota configuration loading failed", e);
         }
     }