diff options
Diffstat (limited to 'auth/auth-service/src')
-rw-r--r-- | auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java | 5 | ||||
-rw-r--r-- | auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java index 67bf3b50..3bc06f11 100644 --- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java +++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AuthzCassServiceImpl.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; @@ -2665,7 +2664,7 @@ public class AuthzCassServiceImpl <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE String inputOption = cr.getEntry(); if (inputOption == null) { String message = selectCredFromList(lcd, false); - String[] variables = buildVariables(lcd); + Object[] variables = buildVariables(lcd); return Result.err(Status.ERR_ChoiceNeeded, message, variables); } else { entry = Integer.parseInt(inputOption) - 1; @@ -2823,7 +2822,7 @@ public class AuthzCassServiceImpl <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE String inputOption = cr.getEntry(); if (inputOption == null) { String message = selectCredFromList(rlcd.value, true); - String[] variables = buildVariables(rlcd.value); + Object[] variables = buildVariables(rlcd.value); return Result.err(Status.ERR_ChoiceNeeded, message, variables); } else { try { diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java index 55c3bc86..2d322390 100644 --- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java +++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java @@ -672,7 +672,7 @@ public class Mapper_2_0 implements Mapper<Nss, Perms, Pkey, Roles, Users, UserRo Error err = new Error(); err.setMessageId(msgID); // AT&T Restful Error Format requires numbers "%" placements - err.setText(Vars.convert(holder, text, var)); + err.setText(Vars.convert(holder, text, (Object[])var)); for (String s : var) { err.getVariables().add(s); } |