Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prevent password hash from being shown
[controller.git]
/
opendaylight
/
web
/
root
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
web
/
DaylightWebAdmin.java
diff --git
a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
index 3c28152c25fa0a16e7263d3b69b2fa49f8264306..4c8a6b8439f2b18482a848605e1f5e234a27f8cd 100644
(file)
--- a/
opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
+++ b/
opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
@@
-143,17
+143,22
@@
public class DaylightWebAdmin {
return gson.toJson(result);
}
return gson.toJson(result);
}
- @RequestMapping(
"/users"
)
+ @RequestMapping(
value = "/users", method = RequestMethod.GET
)
@ResponseBody
@ResponseBody
- public List<User
Config
> getUsers() {
+ public List<User
Bean
> getUsers() {
IUserManager userManager = (IUserManager) ServiceHelper.getGlobalInstance(IUserManager.class, this);
if (userManager == null) {
return null;
}
IUserManager userManager = (IUserManager) ServiceHelper.getGlobalInstance(IUserManager.class, this);
if (userManager == null) {
return null;
}
- List<UserConfig> userConfList = userManager.getLocalUserList();
+ List<UserBean> result = new ArrayList<UserBean>();
+ List<UserConfig> configs = userManager.getLocalUserList();
+ for (UserConfig config : configs) {
+ UserBean bean = new UserBean(config);
+ result.add(bean);
+ }
- return
userConfLis
t;
+ return
resul
t;
}
/*
}
/*