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
use delete level property in AafTopicSetupService
[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
edce4f0
..
1491818
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,10
+23,13
@@
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 {
private static final int CREATED = 201;
private static final int OK = 200;
public class AafServiceImpl extends BaseLoggingClass implements AafService {
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 String aafUrl;
private final String identity;
private final boolean useAAF;
@@
-51,8
+54,11
@@
public class AafServiceImpl extends BaseLoggingClass implements AafService {
}
@Override
}
@Override
- public int delPerm(DmaapPerm perm) {
- return OK;
+ 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
}
@Override
@@
-67,12
+73,6
@@
public class AafServiceImpl extends BaseLoggingClass implements AafService {
return doPost(ur, "authz/userRole", CREATED);
}
return doPost(ur, "authz/userRole", CREATED);
}
- @Override
- public int delGrant(DmaapGrant grant) {
- logger.info("entry: delGrant() ");
- 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() ");
@@
-86,8
+86,11
@@
public class AafServiceImpl extends BaseLoggingClass implements AafService {
}
@Override
}
@Override
- public int delNamespace(AafNamespace ns) {
- return OK;
+ 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) {