- Added the username/password criteria in usermanager

[controller.git] / opendaylight / usermanager / src / main / java / org / opendaylight / controller / usermanager / internal / AuthorizationConfig.java

diff --git a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/AuthorizationConfig.java b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/AuthorizationConfig.java
index 3eafe2b75b1a9b8991ff0bd5b5286b629e120d38..2474eec6d95470765c2f29d86a124196bb886dc5 100644 (file)
--- a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/AuthorizationConfig.java
+++ b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/AuthorizationConfig.java
@@ -8,36 +8,36 @@
 
 package org.opendaylight.controller.usermanager.internal;
 
+import org.opendaylight.controller.sal.utils.Status;
 
 /**
  * Configuration Java Object which represents a Local configured Authorization
  * for a remote authenticated user for User Manager.
  */
 public class AuthorizationConfig extends UserConfig {
-       private static final long serialVersionUID = 1L;
-
-       public AuthorizationConfig() {
-               super();
-       }
-
-       // Constructor may be needed for autocontainer logic
-       public AuthorizationConfig(String user, String role) {
-               super();
-               this.user = user;
-               this.role = role;
-       }
-
-       @Override
-       public boolean isValid() {
-               return (user != null && !user.isEmpty() && role != null && !role
-                               .isEmpty());
-       }
-
-       public String getRolesData() {
-               return (role.replace(",", " "));
-       }
-
-       public String toString() {
-               return "AuthorizationConfig=[user: " + user + ", role: " + role + "]";
-       }
+    private static final long serialVersionUID = 1L;
+
+    public AuthorizationConfig() {
+        super();
+    }
+
+    // Constructor may be needed for autocontainer logic
+    public AuthorizationConfig(String user, String role) {
+        super();
+        this.user = user;
+        this.role = role;
+    }
+
+    @Override
+    public Status validate() {
+        return (!isRoleValid().isSuccess() ? isRoleValid() : isUsernameValid());
+    }
+
+    public String getRolesData() {
+        return (role.replace(",", " "));
+    }
+
+    public String toString() {
+        return "AuthorizationConfig=[user: " + user + ", role: " + role + "]";
+    }
 }