fix basic code issues of auth files 71/57471/1
authorseshukm <seshu.kumar.m@huawei.com>
Wed, 25 Jul 2018 10:19:13 +0000 (18:19 +0800)
committerseshukm <seshu.kumar.m@huawei.com>
Wed, 25 Jul 2018 10:19:13 +0000 (18:19 +0800)
Issue-ID: SO-729

Change-Id: I36bb76578c39640c38b27ee5c8939341f908fba2
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java
keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java

index 08503b7..bb308f0 100644 (file)
@@ -22,67 +22,67 @@ import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")
 public class AccessKey extends Authentication {
-       
-       public static final class ApiAccessKeyCredentials {
-               
-               private String accessKey;
-               
-               private String secretKey;
+    
+    public static final class ApiAccessKeyCredentials {
+        
+        private String accessKey;
+        
+        private String secretKey;
 
-               /**
-                * @return the accessKey
-                */
-               public String getAccessKey() {
-                       return accessKey;
-               }
+        /**
+         * @return the accessKey
+         */
+        public String getAccessKey() {
+            return accessKey;
+        }
 
-               /**
-                * @param accessKey the accessKey to set
-                */
-               public void setAccessKey(String accessKey) {
-                       this.accessKey = accessKey;
-               }
+        /**
+         * @param accessKey the accessKey to set
+         */
+        public void setAccessKey(String accessKey) {
+            this.accessKey = accessKey;
+        }
 
-               /**
-                * @return the secretKey
-                */
-               public String getSecretKey() {
-                       return secretKey;
-               }
+        /**
+         * @return the secretKey
+         */
+        public String getSecretKey() {
+            return secretKey;
+        }
 
-               /**
-                * @param secretKey the secretKey to set
-                */
-               public void setSecretKey(String secretKey) {
-                       this.secretKey = secretKey;
-               }
-               
-       }
-       
-       private ApiAccessKeyCredentials apiAccessKeyCredentials = new ApiAccessKeyCredentials();
-       
-       public AccessKey() {
-               
-       }
-       
-       public AccessKey(String accessKey, String secretKey) {
-               apiAccessKeyCredentials.setAccessKey(accessKey);
-               apiAccessKeyCredentials.setSecretKey(secretKey);
-       }
+        /**
+         * @param secretKey the secretKey to set
+         */
+        public void setSecretKey(String secretKey) {
+            this.secretKey = secretKey;
+        }
+        
+    }
+    
+    private ApiAccessKeyCredentials apiAccessKeyCredentials = new ApiAccessKeyCredentials();
+    
+    public AccessKey() {
+        
+    }
+    
+    public AccessKey(String accessKey, String secretKey) {
+        apiAccessKeyCredentials.setAccessKey(accessKey);
+        apiAccessKeyCredentials.setSecretKey(secretKey);
+    }
 
-       /**
-        * @return the apiAccessKeyCredentials
-        */
-       public ApiAccessKeyCredentials getApiAccessKeyCredentials() {
-               return apiAccessKeyCredentials;
-       }
+    /**
+     * @return the apiAccessKeyCredentials
+     */
+    public ApiAccessKeyCredentials getApiAccessKeyCredentials() {
+        return apiAccessKeyCredentials;
+    }
 
-       /**
-        * @param apiAccessKeyCredentials the apiAccessKeyCredentials to set
-        */
-       public void setApiAccessKeyCredentials(
-                       ApiAccessKeyCredentials apiAccessKeyCredentials) {
-               this.apiAccessKeyCredentials = apiAccessKeyCredentials;
-       }
-       
+    /**
+     * @param apiAccessKeyCredentials the apiAccessKeyCredentials to set
+     */
+    public void setApiAccessKeyCredentials(
+            ApiAccessKeyCredentials apiAccessKeyCredentials) {
+        this.apiAccessKeyCredentials = apiAccessKeyCredentials;
+    }
+    
 }
index fec92e1..f47a94b 100644 (file)
@@ -22,45 +22,45 @@ import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")
 public class TokenAuthentication extends Authentication {
-       
-       public static final class Token {
-               
-               private String id;
+    
+    public static final class Token {
+        
+        private String id;
 
-               /**
-                * @return the id
-                */
-               public String getId() {
-                       return id;
-               }
+        /**
+         * @return the id
+         */
+        public String getId() {
+            return id;
+        }
 
-               /**
-                * @param id the id to set
-                */
-               public void setId(String id) {
-                       this.id = id;
-               }
-               
-       }
-       
-       private Token token = new Token();
-       
-       public TokenAuthentication(String token) {
-               this.token.id = token;
-       }
+        /**
+         * @param id the id to set
+         */
+        public void setId(String id) {
+            this.id = id;
+        }
+        
+    }
+    
+    private Token token = new Token();
+    
+    public TokenAuthentication(String token) {
+        this.token.id = token;
+    }
 
-       /**
-        * @return the token
-        */
-       public Token getToken() {
-               return token;
-       }
+    /**
+     * @return the token
+     */
+    public Token getToken() {
+        return token;
+    }
 
-       /**
-        * @param token the token to set
-        */
-       public void setToken(Token token) {
-               this.token = token;
-       }
-       
+    /**
+     * @param token the token to set
+     */
+    public void setToken(Token token) {
+        this.token = token;
+    }
+    
 }
index 8a13b7f..5c94d31 100644 (file)
@@ -22,66 +22,66 @@ import com.woorea.openstack.keystone.model.Authentication;
 
 @JsonRootName("auth")
 public class UsernamePassword extends Authentication {
-       
-       public static final class PasswordCredentials {
-               
-               private String username;
-               
-               private String password;
+    
+    public static final class PasswordCredentials {
+        
+        private String username;
+        
+        private String password;
 
-               /**
-                * @return the username
-                */
-               public String getUsername() {
-                       return username;
-               }
+        /**
+         * @return the username
+         */
+        public String getUsername() {
+            return username;
+        }
 
-               /**
-                * @param username the username to set
-                */
-               public void setUsername(String username) {
-                       this.username = username;
-               }
+        /**
+         * @param username the username to set
+         */
+        public void setUsername(String username) {
+            this.username = username;
+        }
 
-               /**
-                * @return the password
-                */
-               public String getPassword() {
-                       return password;
-               }
+        /**
+         * @return the password
+         */
+        public String getPassword() {
+            return password;
+        }
 
-               /**
-                * @param password the password to set
-                */
-               public void setPassword(String password) {
-                       this.password = password;
-               }
-               
-       }
-       
-       private PasswordCredentials passwordCredentials = new PasswordCredentials();
-       
-       public UsernamePassword() {
-               
-       }
-       
-       public UsernamePassword(String username, String password) {
-               passwordCredentials.setUsername(username);
-               passwordCredentials.setPassword(password);
-       }
+        /**
+         * @param password the password to set
+         */
+        public void setPassword(String password) {
+            this.password = password;
+        }
+        
+    }
+    
+    private PasswordCredentials passwordCredentials = new PasswordCredentials();
+    
+    public UsernamePassword() {
+        
+    }
+    
+    public UsernamePassword(String username, String password) {
+        passwordCredentials.setUsername(username);
+        passwordCredentials.setPassword(password);
+    }
 
-       /**
-        * @return the passwordCredentials
-        */
-       public PasswordCredentials getPasswordCredentials() {
-               return passwordCredentials;
-       }
+    /**
+     * @return the passwordCredentials
+     */
+    public PasswordCredentials getPasswordCredentials() {
+        return passwordCredentials;
+    }
 
-       /**
-        * @param passwordCredentials the passwordCredentials to set
-        */
-       public void setPasswordCredentials(PasswordCredentials passwordCredentials) {
-               this.passwordCredentials = passwordCredentials;
-       }
-       
+    /**
+     * @param passwordCredentials the passwordCredentials to set
+     */
+    public void setPasswordCredentials(PasswordCredentials passwordCredentials) {
+        this.passwordCredentials = passwordCredentials;
+    }
+    
 }
index 66d2854..2281d01 100644 (file)
@@ -24,277 +24,277 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
 
 @JsonRootName("auth")
 public class Authentication implements Serializable {
-       
-       public static final class Identity {
-               
-               public static final Identity password(String userId, String password) {
-                       Identity identity = new Identity();
-                       identity.getMethods().add("password");
-                       Password method = new Password();
-                       method.getUser().setId(userId);
-                       method.getUser().setPassword(password);
-                       identity.setPassword(method);
-                       return identity;
-               }
-               
-               public static final Identity password(String domainName, String username, String password) {
-                       Identity identity = new Identity();
-                       identity.getMethods().add("password");
-                       Password method = new Password();
-                       com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain domain = new com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain();
-                       domain.setName(domainName);
-                       method.getUser().setDomain(domain);
-                       method.getUser().setName(username);
-                       method.getUser().setPassword(password);
-                       identity.setPassword(method);
-                       return identity;
-               }
-               
-               public static final Identity token(String token) {
-                       Identity identity = new Identity();
-                       identity.getMethods().add("token");
-                       Token method = new Token();
-                       method.setId(token);
-                       identity.setToken(method);
-                       return identity;
-               }
-               
-               private List<String> methods = new ArrayList<>();
-               
-               public static final class Password {
-                       
-                       public static final class User {
-                               
-                               public static final class Domain {
-                                       
-                                       private String id;
-                                       
-                                       private String name;
-
-                                       public String getId() {
-                                               return id;
-                                       }
-
-                                       public void setId(String id) {
-                                               this.id = id;
-                                       }
-
-                                       public String getName() {
-                                               return name;
-                                       }
-
-                                       public void setName(String name) {
-                                               this.name = name;
-                                       }
-                               }
-                               
-                               private Domain domain;
-                               
-                               private String id;
-                               
-                               private String name;
-                               
-                               private String password;
-
-                               public Domain getDomain() {
-                                       return domain;
-                               }
-
-                               public void setDomain(Domain domain) {
-                                       this.domain = domain;
-                               }
-
-                               public String getId() {
-                                       return id;
-                               }
-
-                               public void setId(String id) {
-                                       this.id = id;
-                               }
-
-                               public String getName() {
-                                       return name;
-                               }
-
-                               public void setName(String name) {
-                                       this.name = name;
-                               }
-
-                               public String getPassword() {
-                                       return password;
-                               }
-
-                               public void setPassword(String password) {
-                                       this.password = password;
-                               }
-                               
-                       }
-                       
-                       private User user = new User();
-
-                       public User getUser() {
-                               return user;
-                       }
-
-                       public void setUser(User user) {
-                               this.user = user;
-                       }
-                       
-               }
-               
-               private Password password;
-               
-               public static final class Token {
-                       
-                       private String id;
-
-                       public String getId() {
-                               return id;
-                       }
-
-                       public void setId(String id) {
-                               this.id = id;
-                       }
-                       
-               }
-               
-               private Token token;
-
-               public List<String> getMethods() {
-                       return methods;
-               }
-
-               public void setMethods(List<String> methods) {
-                       this.methods = methods;
-               }
-
-               public Password getPassword() {
-                       return password;
-               }
-
-               public void setPassword(Password password) {
-                       this.password = password;
-               }
-
-               public Token getToken() {
-                       return token;
-               }
-
-               public void setToken(Token token) {
-                       this.token = token;
-               }
-               
-       }
-       
-       private Identity identity;
-       
-       public static final class Scope {
-               
-               public static Scope project(String id) {
-                       Scope scope = new Scope();
-                       Project project = new Project();
-                       project.setId(id);
-                       scope.setProject(project);
-                       return scope;
-               }
-               
-               public static Scope project(String domainName, String projectName) {
-                       Scope scope = new Scope();
-                       com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain domain = new com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain();
-                       domain.setName(domainName);
-                       Project project = new Project();
-                       project.setDomain(domain);
-                       project.setName(projectName);
-                       scope.setProject(project);
-                       return scope;
-               }
-               
-               public static final class Project {
-               
-                       public static final class Domain {
-                               
-                               private String id;
-                               
-                               private String name;
-
-                               public String getId() {
-                                       return id;
-                               }
-
-                               public void setId(String id) {
-                                       this.id = id;
-                               }
-
-                               public String getName() {
-                                       return name;
-                               }
-
-                               public void setName(String name) {
-                                       this.name = name;
-                               }
-                       }
-                       
-                       private String id;
-                       
-                       private Domain domain;
-                       
-                       private String name;
-                       
-
-                       public String getId() {
-                               return id;
-                       }
-
-                       public void setId(String id) {
-                               this.id = id;
-                       }
-
-                       public Domain getDomain() {
-                               return domain;
-                       }
-
-                       public void setDomain(Domain domain) {
-                               this.domain = domain;
-                       }
-
-                       public String getName() {
-                               return name;
-                       }
-
-                       public void setName(String name) {
-                               this.name = name;
-                       }
-                       
-               }
-               
-               private Project project;
-
-               public Project getProject() {
-                       return project;
-               }
-
-               public void setProject(Project project) {
-                       this.project = project;
-               }
-               
-       }
-       
-       private Scope scope;
-
-       public Identity getIdentity() {
-               return identity;
-       }
-
-       public void setIdentity(Identity identity) {
-               this.identity = identity;
-       }
-
-       public Scope getScope() {
-               return scope;
-       }
-
-       public void setScope(Scope scope) {
-               this.scope = scope;
-       }
-       
+    
+    public static final class Identity {
+        
+        public static final Identity password(String userId, String password) {
+            Identity identity = new Identity();
+            identity.getMethods().add("password");
+            Password method = new Password();
+            method.getUser().setId(userId);
+            method.getUser().setPassword(password);
+            identity.setPassword(method);
+            return identity;
+        }
+        
+        public static final Identity password(String domainName, String username, String password) {
+            Identity identity = new Identity();
+            identity.getMethods().add("password");
+            Password method = new Password();
+            com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain domain = new com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain();
+            domain.setName(domainName);
+            method.getUser().setDomain(domain);
+            method.getUser().setName(username);
+            method.getUser().setPassword(password);
+            identity.setPassword(method);
+            return identity;
+        }
+        
+        public static final Identity token(String token) {
+            Identity identity = new Identity();
+            identity.getMethods().add("token");
+            Token method = new Token();
+            method.setId(token);
+            identity.setToken(method);
+            return identity;
+        }
+        
+        private List<String> methods = new ArrayList<>();
+        
+        public static final class Password {
+            
+            public static final class User {
+                
+                public static final class Domain {
+                    
+                    private String id;
+                    
+                    private String name;
+
+                    public String getId() {
+                        return id;
+                    }
+
+                    public void setId(String id) {
+                        this.id = id;
+                    }
+
+                    public String getName() {
+                        return name;
+                    }
+
+                    public void setName(String name) {
+                        this.name = name;
+                    }
+                }
+                
+                private Domain domain;
+                
+                private String id;
+                
+                private String name;
+                
+                private String password;
+
+                public Domain getDomain() {
+                    return domain;
+                }
+
+                public void setDomain(Domain domain) {
+                    this.domain = domain;
+                }
+
+                public String getId() {
+                    return id;
+                }
+
+                public void setId(String id) {
+                    this.id = id;
+                }
+
+                public String getName() {
+                    return name;
+                }
+
+                public void setName(String name) {
+                    this.name = name;
+                }
+
+                public String getPassword() {
+                    return password;
+                }
+
+                public void setPassword(String password) {
+                    this.password = password;
+                }
+                
+            }
+            
+            private User user = new User();
+
+            public User getUser() {
+                return user;
+            }
+
+            public void setUser(User user) {
+                this.user = user;
+            }
+            
+        }
+        
+        private Password password;
+        
+        public static final class Token {
+            
+            private String id;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+            
+        }
+        
+        private Token token;
+
+        public List<String> getMethods() {
+            return methods;
+        }
+
+        public void setMethods(List<String> methods) {
+            this.methods = methods;
+        }
+
+        public Password getPassword() {
+            return password;
+        }
+
+        public void setPassword(Password password) {
+            this.password = password;
+        }
+
+        public Token getToken() {
+            return token;
+        }
+
+        public void setToken(Token token) {
+            this.token = token;
+        }
+        
+    }
+    
+    private Identity identity;
+    
+    public static final class Scope {
+        
+        public static Scope project(String id) {
+            Scope scope = new Scope();
+            Project project = new Project();
+            project.setId(id);
+            scope.setProject(project);
+            return scope;
+        }
+        
+        public static Scope project(String domainName, String projectName) {
+            Scope scope = new Scope();
+            com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain domain = new com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain();
+            domain.setName(domainName);
+            Project project = new Project();
+            project.setDomain(domain);
+            project.setName(projectName);
+            scope.setProject(project);
+            return scope;
+        }
+        
+        public static final class Project {
+        
+            public static final class Domain {
+                
+                private String id;
+                
+                private String name;
+
+                public String getId() {
+                    return id;
+                }
+
+                public void setId(String id) {
+                    this.id = id;
+                }
+
+                public String getName() {
+                    return name;
+                }
+
+                public void setName(String name) {
+                    this.name = name;
+                }
+            }
+            
+            private String id;
+            
+            private Domain domain;
+            
+            private String name;
+            
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Domain getDomain() {
+                return domain;
+            }
+
+            public void setDomain(Domain domain) {
+                this.domain = domain;
+            }
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+            
+        }
+        
+        private Project project;
+
+        public Project getProject() {
+            return project;
+        }
+
+        public void setProject(Project project) {
+            this.project = project;
+        }
+        
+    }
+    
+    private Scope scope;
+
+    public Identity getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(Identity identity) {
+        this.identity = identity;
+    }
+
+    public Scope getScope() {
+        return scope;
+    }
+
+    public void setScope(Scope scope) {
+        this.scope = scope;
+    }
+    
 }
index b3fc00f..7f36b15 100644 (file)
@@ -23,55 +23,55 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
 
 @JsonRootName("credential")
 public class Credential {
-       
-       private String id;
+    
+    private String id;
 
-       private String projectId;
-       
-       private String type;
-       
-       private String userId;
-       
-       private Map<String, String> blob = new HashMap<>();
+    private String projectId;
+    
+    private String type;
+    
+    private String userId;
+    
+    private Map<String, String> blob = new HashMap<>();
 
-       public String getId() {
-               return id;
-       }
+    public String getId() {
+        return id;
+    }
 
-       public void setId(String id) {
-               this.id = id;
-       }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-       public String getProjectId() {
-               return projectId;
-       }
+    public String getProjectId() {
+        return projectId;
+    }
 
-       public void setProjectId(String projectId) {
-               this.projectId = projectId;
-       }
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
 
-       public String getType() {
-               return type;
-       }
+    public String getType() {
+        return type;
+    }
 
-       public void setType(String type) {
-               this.type = type;
-       }
+    public void setType(String type) {
+        this.type = type;
+    }
 
-       public String getUserId() {
-               return userId;
-       }
+    public String getUserId() {
+        return userId;
+    }
 
-       public void setUserId(String userId) {
-               this.userId = userId;
-       }
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 
-       public Map<String, String> getBlob() {
-               return blob;
-       }
+    public Map<String, String> getBlob() {
+        return blob;
+    }
 
-       public void setBlob(Map<String, String> blob) {
-               this.blob = blob;
-       }
-       
+    public void setBlob(Map<String, String> blob) {
+        this.blob = blob;
+    }
+    
 }
index 891736a..4051fa0 100644 (file)
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
 
 public class Credentials implements Iterable<Credential>,  Serializable {
 
-       @JsonProperty("credentials")
-       private List<Credential> list;
+    @JsonProperty("credentials")
+    private List<Credential> list;
 
-       /**
-        * @return the list
-        */
-       public List<Credential> getList() {
-               return list;
-       }
-       
-       /* (non-Javadoc)
-        * @see java.lang.Object#toString()
-        */
-       @Override
-       public String toString() {
-               return "Credentials [list=" + list + "]";
-       }
+    /**
+     * @return the list
+     */
+    public List<Credential> getList() {
+        return list;
+    }
+    
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Credentials [list=" + list + "]";
+    }
 
-       @Override
-       public Iterator<Credential> iterator() {
-               return list.iterator();
-       }
-       
+    @Override
+    public Iterator<Credential> iterator() {
+        return list.iterator();
+    }
+    
 }
index dead163..cfb5d07 100644 (file)
@@ -21,44 +21,44 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
 @JsonRootName("domain")
 public class Domain {
 
-       private String id;
-       
-       private String name;
-       
-       private String description;
-       
-       private Boolean enabled;
+    private String id;
+    
+    private String name;
+    
+    private String description;
+    
+    private Boolean enabled;
 
-       public String getId() {
-               return id;
-       }
+    public String getId() {
+        return id;
+    }
 
-       public void setId(String id) {
-               this.id = id;
-       }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-       public String getName() {
-               return name;
-       }
+    public String getName() {
+        return name;
+    }
 
-       public void setName(String name) {
-               this.name = name;
-       }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-       public String getDescription() {
-               return description;
-       }
+    public String getDescription() {
+        return description;
+    }
 
-       public void setDescription(String description) {
-               this.description = description;
-       }
-       
-       public Boolean getEnabled() {
-               return enabled;
-       }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    
+    public Boolean getEnabled() {
+        return enabled;
+    }
 
-       public void setEnabled(Boolean enabled) {
-               this.enabled = enabled;
-       }
-       
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+    
 }