Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Batch work and client
[aaf/authz.git]
/
auth
/
auth-service
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
auth
/
service
/
AuthzCassServiceImpl.java
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
67bf3b5
..
c9730f5
100644
(file)
--- 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.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;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
@@
-2396,6
+2395,7
@@
public class AuthzCassServiceImpl <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
} catch (Exception e) {
trans.error().log(e, "While setting expiration to TempPassword");
}
} catch (Exception e) {
trans.error().log(e, "While setting expiration to TempPassword");
}
+
Result<?>udr = ques.credDAO.create(trans, rcred.value);
if (udr.isOK()) {
return Result.ok();
Result<?>udr = ques.credDAO.create(trans, rcred.value);
if (udr.isOK()) {
return Result.ok();
@@
-2633,8
+2633,6
@@
public class AuthzCassServiceImpl <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
} else {
rcred.value.expires = org.expiration(null,exp).getTime();
}
} else {
rcred.value.expires = org.expiration(null,exp).getTime();
}
- // Copy in other fields 10/21/2016
- rcred.value.notes=current.notes;
udr = ques.credDAO.create(trans, rcred.value);
if (udr.isOK()) {
udr = ques.credDAO.create(trans, rcred.value);
if (udr.isOK()) {
@@
-2665,7
+2663,7
@@
public class AuthzCassServiceImpl <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
String inputOption = cr.getEntry();
if (inputOption == null) {
String message = selectCredFromList(lcd, false);
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;
return Result.err(Status.ERR_ChoiceNeeded, message, variables);
} else {
entry = Integer.parseInt(inputOption) - 1;
@@
-2732,9
+2730,9
@@
public class AuthzCassServiceImpl <NSS,PERMS,PERMKEY,ROLES,USERS,USERROLES,DE
cd.cred = found.cred;
cd.other = found.other;
cd.type = found.type;
cd.cred = found.cred;
cd.other = found.other;
cd.type = found.type;
- cd.notes = found.notes;
cd.ns = found.ns;
cd.expires = org.expiration(null, Expiration.ExtendPassword,days).getTime();
cd.ns = found.ns;
cd.expires = org.expiration(null, Expiration.ExtendPassword,days).getTime();
+ cd.tag = found.tag;
cred = ques.credDAO.create(trans, cd);
if (cred.isOK()) {
cred = ques.credDAO.create(trans, cd);
if (cred.isOK()) {
@@
-2823,7
+2821,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 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 {
return Result.err(Status.ERR_ChoiceNeeded, message, variables);
} else {
try {