summaryrefslogtreecommitdiffstats
path: root/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication
diff options
context:
space:
mode:
authorSmokowski, Steve (ss835w) <ss835w@us.att.com>2019-05-02 09:42:55 -0400
committerSmokowski, Steve (ss835w) <ss835w@us.att.com>2019-05-07 10:02:17 -0400
commit3f9a0c3183480d150089c0d5a6e507c877f7d121 (patch)
treeb3db04cbe2cef23f81503177a50edc5360ffa486 /keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication
parente153f0adfbed711ce1e215748594a4d04fd1edaf (diff)
Enhance Openstack Client
Update Openstack Client to support additional fields Updat all formatting issues Issue-ID: SO-1844 Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
Diffstat (limited to 'keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication')
-rw-r--r--keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java21
-rw-r--r--keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java12
-rw-r--r--keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java18
3 files changed, 25 insertions, 26 deletions
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
index 99c776a..2167ca2 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java
@@ -21,11 +21,11 @@ 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;
/**
@@ -55,15 +55,15 @@ public class AccessKey extends Authentication {
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);
@@ -79,9 +79,8 @@ public class AccessKey extends Authentication {
/**
* @param apiAccessKeyCredentials the apiAccessKeyCredentials to set
*/
- public void setApiAccessKeyCredentials(
- ApiAccessKeyCredentials apiAccessKeyCredentials) {
+ public void setApiAccessKeyCredentials(ApiAccessKeyCredentials apiAccessKeyCredentials) {
this.apiAccessKeyCredentials = apiAccessKeyCredentials;
}
-
+
}
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
index f730fc0..2c33519 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java
@@ -21,9 +21,9 @@ import com.woorea.openstack.keystone.model.Authentication;
@JsonRootName("auth")
public class TokenAuthentication extends Authentication {
-
+
public static final class Token {
-
+
private String id;
/**
@@ -39,11 +39,11 @@ public class TokenAuthentication extends Authentication {
public void setId(String id) {
this.id = id;
}
-
+
}
-
+
private Token token = new Token();
-
+
public TokenAuthentication(String token) {
this.token.id = token;
}
@@ -61,5 +61,5 @@ public class TokenAuthentication extends Authentication {
public void setToken(Token token) {
this.token = token;
}
-
+
}
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
index 1c07283..3cdb03c 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java
@@ -21,11 +21,11 @@ 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;
/**
@@ -55,15 +55,15 @@ public class UsernamePassword extends Authentication {
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);
@@ -82,5 +82,5 @@ public class UsernamePassword extends Authentication {
public void setPasswordCredentials(PasswordCredentials passwordCredentials) {
this.passwordCredentials = passwordCredentials;
}
-
+
}