diff options
Diffstat (limited to 'auth/auth-cass/src')
3 files changed, 2 insertions, 10 deletions
diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/FutureDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/FutureDAO.java index 96cbf28a..10c0ec97 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/FutureDAO.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/FutureDAO.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.UUID; import org.onap.aaf.auth.dao.CassDAOImpl; -import org.onap.aaf.auth.dao.DAOException; import org.onap.aaf.auth.dao.Loader; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.layer.Result; @@ -125,8 +124,6 @@ public class FutureDAO extends CassDAOImpl<AuthzTrans,FutureDAO.Data> { obj[++idx]=data.target; } },readConsistency); - - } public Result<List<Data>> readByStartAndTarget(AuthzTrans trans, Date start, String target) { @@ -136,7 +133,7 @@ public class FutureDAO extends CassDAOImpl<AuthzTrans,FutureDAO.Data> { /** * Override create to add secondary ID to Subject in History, and create Data.ID, if it is null */ - public Result<FutureDAO.Data> create(AuthzTrans trans, FutureDAO.Data data, String id) { + public Result<FutureDAO.Data> create(AuthzTrans trans, FutureDAO.Data data, String id) { // If ID is not set (typical), create one. if (data.id==null) { StringBuilder sb = new StringBuilder(trans.user()); diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/UserRoleDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/UserRoleDAO.java index 26f9a995..b6cbcf82 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/UserRoleDAO.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/UserRoleDAO.java @@ -140,8 +140,6 @@ public class UserRoleDAO extends CassDAOImpl<AuthzTrans,UserRoleDAO.Data> { public String toString() { return user + '|' + ns + '|' + rname + '|' + Chrono.dateStamp(expires); } - - } private static class URLoader extends Loader<Data> implements Streamer<Data> { diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java index f440a8cd..5a5fada2 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java @@ -136,11 +136,8 @@ public class Function { sb = new StringBuilder(); ao = new ArrayList<>(); } - sb.append(result.details); + sb.append(String.format(result.details,result.variables)); sb.append('\n'); - for (String s : result.variables) { - ao.add(s); - } } } |