Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Changes from Onsite Tests
[aaf/authz.git]
/
auth
/
auth-service
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
auth
/
service
/
validation
/
ServiceValidator.java
diff --git
a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
index
fb7556e
..
df8bde8
100644
(file)
--- a/
auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
+++ b/
auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
@@
-86,7
+86,7
@@
public class ServiceValidator extends Validator {
}
return this;
}
}
return this;
}
-
+
public ServiceValidator role(RoleDAO.Data pd) {
if (pd==null) {
msg("Role Data is null.");
public ServiceValidator role(RoleDAO.Data pd) {
if (pd==null) {
msg("Role Data is null.");
@@
-219,6
+219,16
@@
public class ServiceValidator extends Validator {
return this;
}
return this;
}
+ public ServiceValidator user_role(String user, UserRoleDAO.Data urdd) {
+ role(user,urdd.role);
+ if(!urdd.role.startsWith(user)) {
+ nullOrBlank("UserRole.ns",urdd.ns);
+ nullOrBlank("UserRole.rname",urdd.rname);
+ }
+ return this;
+ }
+
+
public ServiceValidator user_role(UserRoleDAO.Data urdd) {
if (urdd==null) {
msg("UserRole is null");
public ServiceValidator user_role(UserRoleDAO.Data urdd) {
if (urdd==null) {
msg("UserRole is null");