@@ -47,24 +47,24 @@ public class ConfigRepository implements BeanChangeListener<Browsers> {
47
47
48
48
@ PostConstruct
49
49
public void init () throws JAXBException , IOException {
50
- if (isQuotaHotReload () ) {
50
+ if (quotaHotReload ) {
51
51
startQuotaWatcher ();
52
52
} else {
53
- loadQuotaOnce (getQuotaPath () );
53
+ loadQuotaOnce ();
54
54
}
55
55
}
56
56
57
57
private void startQuotaWatcher () {
58
58
LOGGER .debug ("Starting quota watcher" );
59
59
try {
60
- BeanWatcher .watchFor (Browsers .class , getQuotaPath (). toString (), XML_GLOB , this );
60
+ BeanWatcher .watchFor (Browsers .class , quotaDirectory . getPath (), XML_GLOB , this );
61
61
} catch (IOException e ) {
62
62
LOGGER .error ("Quota configuration loading failed: \n \n {}" , e );
63
63
}
64
64
}
65
65
66
- private void loadQuotaOnce (Path quotaPath ) throws IOException {
67
- for (Path filename : newDirectoryStream (quotaPath , XML_GLOB )) {
66
+ private void loadQuotaOnce () throws IOException {
67
+ for (Path filename : newDirectoryStream (quotaDirectory . toPath () , XML_GLOB )) {
68
68
beanChanged (filename , JAXB .unmarshal (filename .toFile (), Browsers .class ));
69
69
}
70
70
}
@@ -76,45 +76,25 @@ public void beanChanged(Path filename, Browsers browsers) {
76
76
+ "It is not purged from the running gridrouter process though." , filename );
77
77
} else {
78
78
LOGGER .info ("Loading quota configuration file [{}]" , filename );
79
- String user = getFileName (filename );
79
+ String user = FilenameUtils . getBaseName (filename . toString () );
80
80
userBrowsers .put (user , browsers );
81
81
routes .putAll (browsers .getRoutesMap ());
82
82
LOGGER .info ("Loaded quota configuration for [{}] from [{}]: \n \n {}" ,
83
83
user , filename , browsers .toXml ());
84
84
}
85
85
}
86
86
87
- protected boolean isQuotaHotReload () {
88
- return quotaHotReload ;
89
- }
90
-
91
- protected Path getQuotaPath () {
92
- return quotaDirectory .toPath ();
93
- }
94
-
95
87
public Map <String , String > getRoutes () {
96
88
return routes ;
97
89
}
98
90
99
- public Map <String , Browsers > getUserBrowsers () {
100
- return this .userBrowsers ;
101
- }
102
-
103
- protected Browsers getUserBrowsers (String user ) {
104
- return getUserBrowsers ().get (user );
105
- }
106
-
107
91
public Version findVersion (String user , JsonCapabilities caps ) {
108
92
return userBrowsers .get (user ).find (caps .getBrowserName (), caps .getVersion ());
109
93
}
110
94
111
- private static String getFileName (Path path ) {
112
- return FilenameUtils .getBaseName (path .toString ());
113
- }
114
-
115
95
public Map <String , Integer > getBrowsersCountMap (String user ) {
116
96
HashMap <String , Integer > countMap = new HashMap <>();
117
- for (Browser browser : getUserBrowsers (user ).getBrowsers ()) {
97
+ for (Browser browser : this . userBrowsers . get (user ).getBrowsers ()) {
118
98
for (Version version : browser .getVersions ()) {
119
99
countMap .put (browser .getName () + ":" + version .getNumber (), version .getCount ());
120
100
}
0 commit comments