Code Review
/
dmaap
/
dbcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
deleting namespace and permission implementation
[dmaap/dbcapi.git]
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
aaf
/
AafServiceImpl.java
diff --git
a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java
b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java
index
49810f3
..
4848a69
100644
(file)
--- a/
src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java
+++ b/
src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java
@@
-23,12
+23,17
@@
package org.onap.dmaap.dbcapi.aaf;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
+import static java.lang.String.format;
+
public class AafServiceImpl extends BaseLoggingClass implements AafService {
public class AafServiceImpl extends BaseLoggingClass implements AafService {
- private String aafUrl;
- private String identity;
- private boolean useAAF;
- private AafConnection aafConnection;
+ private static final int CREATED = 201;
+ private static final int OK = 200;
+ private static final String FORCE = "?force=true";
+ private final String aafUrl;
+ private final String identity;
+ private final boolean useAAF;
+ private final AafConnection aafConnection;
AafServiceImpl(boolean useAaf, String aafUrl, String identity, AafConnection aafConnection) {
this.useAAF = useAaf;
AafServiceImpl(boolean useAaf, String aafUrl, String identity, AafConnection aafConnection) {
this.useAAF = useAaf;
@@
-45,47
+50,53
@@
public class AafServiceImpl extends BaseLoggingClass implements AafService {
@Override
public int addPerm(DmaapPerm perm) {
logger.info("entry: addPerm() ");
@Override
public int addPerm(DmaapPerm perm) {
logger.info("entry: addPerm() ");
- return doPost(perm, "authz/perm",
201
);
+ return doPost(perm, "authz/perm",
CREATED
);
}
@Override
}
@Override
- public int delPerm(DmaapPerm perm) {
- return 200;
+ public int delPerm(DmaapPerm perm, boolean force) {
+ logger.info("entry: delPerm()");
+ return doDelete(new AafEmpty(), format(
+ "authz/perm/%s/%s/%s%s",
+ perm.getPermission(), perm.getPtype(), perm.getAction(), force ? FORCE : ""), OK);
}
@Override
public int addGrant(DmaapGrant grant) {
logger.info("entry: addGrant() ");
}
@Override
public int addGrant(DmaapGrant grant) {
logger.info("entry: addGrant() ");
- return doPost(grant, "authz/role/perm",
201
);
+ return doPost(grant, "authz/role/perm",
CREATED
);
}
@Override
public int addUserRole(AafUserRole ur) {
logger.info("entry: addUserRole() ");
}
@Override
public int addUserRole(AafUserRole ur) {
logger.info("entry: addUserRole() ");
- return doPost(ur, "authz/userRole",
201
);
+ return doPost(ur, "authz/userRole",
CREATED
);
}
@Override
public int delGrant(DmaapGrant grant) {
logger.info("entry: delGrant() ");
}
@Override
public int delGrant(DmaapGrant grant) {
logger.info("entry: delGrant() ");
- return doDelete(grant, "authz/role/:" + grant.getRole() + "/perm",
200
);
+ return doDelete(grant, "authz/role/:" + grant.getRole() + "/perm",
OK
);
}
@Override
public int addRole(AafRole role) {
logger.info("entry: addRole() ");
}
@Override
public int addRole(AafRole role) {
logger.info("entry: addRole() ");
- return doPost(role, "authz/role",
201
);
+ return doPost(role, "authz/role",
CREATED
);
}
@Override
public int addNamespace(AafNamespace ns) {
logger.info("entry: addNamespace() ");
}
@Override
public int addNamespace(AafNamespace ns) {
logger.info("entry: addNamespace() ");
- return doPost(ns, "authz/ns",
201
);
+ return doPost(ns, "authz/ns",
CREATED
);
}
@Override
}
@Override
- public int delNamespace(AafNamespace ns) {
- return 200;
+ public int delNamespace(AafNamespace ns, boolean force) {
+ logger.info("entry: delNamespace()");
+ return doDelete(new AafEmpty(), format(
+ "authz/ns/%s%s",
+ ns.getName(), force ? FORCE : ""), OK);
}
private int doPost(AafObject obj, String uri, int expect) {
}
private int doPost(AafObject obj, String uri, int expect) {
@@
-136,7
+147,7
@@
public class AafServiceImpl extends BaseLoggingClass implements AafService {
case 404:
logger.warn("Object not found...ignore");
break;
case 404:
logger.warn("Object not found...ignore");
break;
- case
200
:
+ case
OK
:
logger.info("expected response");
break;
default:
logger.info("expected response");
break;
default: