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
Changes for OpenJDK 11
[dmaap/dbcapi.git]
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
service
/
DmaapService.java
diff --git
a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
index
3ea44cc
..
8789ac4
100644
(file)
--- a/
src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
+++ b/
src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
@@
-24,6
+24,7
@@
package org.onap.dmaap.dbcapi.service;
import java.util.ArrayList;
import org.onap.dmaap.dbcapi.aaf.AafService;
import java.util.ArrayList;
import org.onap.dmaap.dbcapi.aaf.AafService;
+import org.onap.dmaap.dbcapi.aaf.AafServiceFactory;
import org.onap.dmaap.dbcapi.aaf.DmaapGrant;
import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
import org.onap.dmaap.dbcapi.aaf.DmaapGrant;
import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
@@
-68,6
+69,13
@@
public class DmaapService extends BaseLoggingClass {
" multisite=" + multiSite +
" noEnvironmentPrefix=" + noEnvironmentPrefix
);
" multisite=" + multiSite +
" noEnvironmentPrefix=" + noEnvironmentPrefix
);
+
+ Dmaap dmaap = dmaapholder.get();
+ logger.info( "DmaapService object values: " +
+ " dmaapName=" + dmaap.getDmaapName() +
+ " drProvURL=" + dmaap.getDrProvUrl() +
+ " version="+ dmaap.getVersion()
+ );
}
}
@@
-85,7
+93,7
@@
public class DmaapService extends BaseLoggingClass {
nd.setLastMod();
dmaapholder.update(nd);
nd.setLastMod();
dmaapholder.update(nd);
- AafService aaf = new AafService
(
ServiceType.AAF_Admin);
+ AafService aaf = new AafService
Factory().initAafService(
ServiceType.AAF_Admin);
ApiPolicy apiPolicy = new ApiPolicy();
if ( apiPolicy.isPermissionClassSet() ) {
ApiPerms p = new ApiPerms();
ApiPolicy apiPolicy = new ApiPolicy();
if ( apiPolicy.isPermissionClassSet() ) {
ApiPerms p = new ApiPerms();
@@
-134,7
+142,7
@@
public class DmaapService extends BaseLoggingClass {
ApiPerms p = new ApiPerms();
p.setEnvMap();
}
ApiPerms p = new ApiPerms();
p.setEnvMap();
}
- AafService aaf = new AafService
(
ServiceType.AAF_Admin);
+ AafService aaf = new AafService
Factory().initAafService(
ServiceType.AAF_Admin);
if ( multiSite ) {
anythingWrong = setTopicMgtPerms( nd, aaf ) || createMmaTopic();
}
if ( multiSite ) {
anythingWrong = setTopicMgtPerms( nd, aaf ) || createMmaTopic();
}