Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "App metrics visualization manage"
[portal/ric-dashboard.git]
/
dashboard
/
webapp-backend
/
src
/
main
/
java
/
org
/
oransc
/
ric
/
portal
/
dashboard
/
config
/
AdminConfiguration.java
diff --git
a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AdminConfiguration.java
b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AdminConfiguration.java
index
696d74f
..
c728e7c
100644
(file)
--- a/
dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AdminConfiguration.java
+++ b/
dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AdminConfiguration.java
@@
-23,6
+23,7
@@
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import org.oransc.ric.portal.dashboard.DashboardUserManager;
import java.lang.invoke.MethodHandles;
import org.oransc.ric.portal.dashboard.DashboardUserManager;
+import org.oransc.ric.portal.dashboard.AppStatsManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@
-32,7
+33,7
@@
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
/**
import org.springframework.context.annotation.Profile;
/**
- * Creates an instance of the user manager.
+ * Creates an instance of the user manager
and app stats manager
.
*/
@Configuration
@Profile("!test")
*/
@Configuration
@Profile("!test")
@@
-42,11
+43,16
@@
public class AdminConfiguration {
// Populated by the autowired constructor
private final String userfile;
// Populated by the autowired constructor
private final String userfile;
+ private final String statsfile;
@Autowired
@Autowired
- public AdminConfiguration(@Value("${userfile}") final String userfile) {
+ public AdminConfiguration(@Value("${userfile}") final String userfile,
+ @Value("${statsfile}") final String statsfile) {
logger.debug("ctor userfile '{}'", userfile);
logger.debug("ctor userfile '{}'", userfile);
+ logger.debug("ctor statsfile '{}'", statsfile);
this.userfile = userfile;
this.userfile = userfile;
+ this.statsfile = statsfile;
+
}
@Bean
}
@Bean
@@
-55,4
+61,10
@@
public class AdminConfiguration {
return new DashboardUserManager(userfile);
}
return new DashboardUserManager(userfile);
}
+ @Bean
+ // The bean (method) name must be globally unique
+ public AppStatsManager statsManager() throws IOException {
+ return new AppStatsManager(statsfile);
+ }
+
}
}