diff options
| author |   Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-11-16 13:31:39 +0100 |
|---|---|---|
| committer | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-11-16 13:44:54 +0100 |
| commit | b315e03572a752c3f12cd4b97d2e05f2bdbc1ec5 (patch) | |
| tree | 23db893ce6aed89a6e159f998457be79c4b77c30 /src | |
| parent | 96dc01ee00007b4e076c51b0d7e848cadd19b9d7 (diff) | |
Rework the cldsUser
Reformat the JSON files and update the code in CldsUser
Change-Id: If82e5e21695189532d7352912db4d4a7be504852
Issue-ID: CLAMP-74
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src')
4 files changed, 47 insertions, 54 deletions
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsUser.java b/src/main/java/org/onap/clamp/clds/service/CldsUser.java index 34a3f8ea2..db8a24f31 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsUser.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsUser.java @@ -26,11 +26,8 @@ package org.onap.clamp.clds.service; import java.util.Arrays; public class CldsUser { - private String user; - private String password; - private SecureServicePermission[] permissions; /** @@ -67,7 +64,7 @@ public class CldsUser { * @return the permissions */ public SecureServicePermission[] getPermissions() { - return permissions; + return Arrays.copyOf(permissions, permissions.length); } public String[] getPermissionsString() { @@ -78,7 +75,7 @@ public class CldsUser { * @param permissions * the permissions to set */ - public void setPermissions(SecureServicePermission[] permissions) { - this.permissions = permissions; + public void setPermissions(SecureServicePermission[] permissionsArray) { + this.permissions = Arrays.copyOf(permissionsArray, permissionsArray.length); } } diff --git a/src/test/resources/clds/clds-users-incomplete-permissions.json b/src/test/resources/clds/clds-users-incomplete-permissions.json index a642511cd..9e3534ff4 100644 --- a/src/test/resources/clds/clds-users-incomplete-permissions.json +++ b/src/test/resources/clds/clds-users-incomplete-permissions.json @@ -1,14 +1,14 @@ - [{ - "user":"admin1", - "password":"5f4dcc3b5aa765d61d8327deb882cf99", - "permissions": - [ - "permission-type-cl|dev|", - "permission-type-cl|dev", - "permission-type-cl-manage|dev|*", - "permission-type-filter-vf|dev|*", - "permission-type-template|dev|read", - "permission-type-template|dev|update" - ] +[ + { + "user": "admin1", + "password": "5f4dcc3b5aa765d61d8327deb882cf99", + "permissions": [ + "permission-type-cl|dev|", + "permission-type-cl|dev", + "permission-type-cl-manage|dev|*", + "permission-type-filter-vf|dev|*", + "permission-type-template|dev|read", + "permission-type-template|dev|update" + ] } -]
\ No newline at end of file +] diff --git a/src/test/resources/clds/clds-users-no-permission.json b/src/test/resources/clds/clds-users-no-permission.json index 77f16c38c..ac91540f2 100644 --- a/src/test/resources/clds/clds-users-no-permission.json +++ b/src/test/resources/clds/clds-users-no-permission.json @@ -1,9 +1,7 @@ - [{ - "user":"admin1", - "permissions": - [ - - ] +[ + { + "user": "admin1", + "permissions": [ + ] } - -]
\ No newline at end of file +] diff --git a/src/test/resources/clds/clds-users-two-users.json b/src/test/resources/clds/clds-users-two-users.json index 8c8d7278a..b3721946a 100644 --- a/src/test/resources/clds/clds-users-two-users.json +++ b/src/test/resources/clds/clds-users-two-users.json @@ -1,28 +1,26 @@ - [{ - "user":"admin1", - "password":"5f4dcc3b5aa765d61d8327deb882cf99", - "permissions": - [ - "permission-type-cl|dev|read", - "permission-type-cl|dev|update", - "permission-type-cl-manage|dev|*", - "permission-type-filter-vf|dev|*", - "permission-type-template|dev|read", - "permission-type-template|dev|update" - ] +[ + { + "user": "admin1", + "password": "5f4dcc3b5aa765d61d8327deb882cf99", + "permissions": [ + "permission-type-cl|dev|read", + "permission-type-cl|dev|update", + "permission-type-cl-manage|dev|*", + "permission-type-filter-vf|dev|*", + "permission-type-template|dev|read", + "permission-type-template|dev|update" + ] + }, + { + "user": "admin2", + "password": "5f4dcc3b5aa765d61d8327deb882cf99", + "permissions": [ + "permission-type-cl|dev|read", + "permission-type-cl|dev|update", + "permission-type-cl-manage|dev|*", + "permission-type-filter-vf|dev|*", + "permission-type-template|dev|read", + "permission-type-template|dev|update" + ] } - , - {"user":"admin2", - "password":"5f4dcc3b5aa765d61d8327deb882cf99", - "permissions": - [ - "permission-type-cl|dev|read", - "permission-type-cl|dev|update", - "permission-type-cl-manage|dev|*", - "permission-type-filter-vf|dev|*", - "permission-type-template|dev|read", - "permission-type-template|dev|update" - ] - - } -]
\ No newline at end of file +] |