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
Cred delete fixes
[aaf/authz.git]
/
auth
/
auth-cass
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
auth
/
dao
/
cass
/
CredDAO.java
diff --git
a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
index
9a47e57
..
3750196
100644
(file)
--- a/
auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
+++ b/
auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
@@
-53,6
+53,8
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
public static final String TABLE = "cred";
public static final int CACHE_SEG = 0x40; // yields segment 0x0-0x3F
public static final int RAW = -1;
public static final String TABLE = "cred";
public static final int CACHE_SEG = 0x40; // yields segment 0x0-0x3F
public static final int RAW = -1;
+ public static final int NONE = 0;
+ public static final int FQI = 10;
public static final int BASIC_AUTH = 1;
public static final int BASIC_AUTH_SHA256 = 2;
public static final int CERT_SHA256_RSA =200;
public static final int BASIC_AUTH = 1;
public static final int BASIC_AUTH_SHA256 = 2;
public static final int CERT_SHA256_RSA =200;
@@
-84,6
+86,7
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
public Integer other;
public String ns;
public String tag;
public Integer other;
public String ns;
public String tag;
+ public String notes;
public ByteBuffer cred; // this is a blob in cassandra
public ByteBuffer cred; // this is a blob in cassandra
@@
-111,7
+114,7
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
}
}
}
}
- p
rivate
static class CredLoader extends Loader<Data> implements Streamer<Data>{
+ p
ublic
static class CredLoader extends Loader<Data> implements Streamer<Data>{
public static final int MAGIC=153323443;
public static final int VERSION=2;
public static final int BUFF_SIZE=48; // Note:
public static final int MAGIC=153323443;
public static final int VERSION=2;
public static final int BUFF_SIZE=48; // Note:
@@
-129,7
+132,8
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
data.other = row.getInt(3);
data.ns = row.getString(4);
data.tag = row.getString(5);
data.other = row.getInt(3);
data.ns = row.getString(4);
data.tag = row.getString(5);
- data.cred = row.getBytesUnsafe(6);
+ data.notes = row.getString(6);
+ data.cred = row.getBytesUnsafe(7);
return data;
}
return data;
}
@@
-148,6
+152,7
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
obj[i=idx] = data.other;
obj[++i] = data.ns;
obj[++i] = data.tag;
obj[i=idx] = data.other;
obj[++i] = data.ns;
obj[++i] = data.tag;
+ obj[++i] = data.notes;
obj[++i] = data.cred;
}
obj[++i] = data.cred;
}
@@
-160,6
+165,7
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
os.writeInt(data.other==null?0:data.other);
writeString(os, data.ns);
writeString(os, data.tag);
os.writeInt(data.other==null?0:data.other);
writeString(os, data.ns);
writeString(os, data.tag);
+ writeString(os, data.notes);
if (data.cred==null) {
os.writeInt(-1);
} else {
if (data.cred==null) {
os.writeInt(-1);
} else {
@@
-182,6
+188,7
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
data.other = is.readInt();
data.ns = readString(is,buff);
data.tag = readString(is,buff);
data.other = is.readInt();
data.ns = readString(is,buff);
data.tag = readString(is,buff);
+ data.notes = readString(is,buff);
int i = is.readInt();
data.cred=null;
int i = is.readInt();
data.cred=null;
@@
-220,8
+227,12
@@
public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
@Override
public Result<Data> create(AuthzTrans trans, Data data) {
if(data.tag == null) {
@Override
public Result<Data> create(AuthzTrans trans, Data data) {
if(data.tag == null) {
- long l = srand.nextLong();
- data.tag = Long.toHexString(l);
+ if(data.type==0) {
+ data.tag="PlaceHolder";
+ } else {
+ long l = srand.nextLong();
+ data.tag = Long.toHexString(l);
+ }
}
return super.create(trans, data);
}
}
return super.create(trans, data);
}