X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-els-onap-logging%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Flogging%2Ffilter%2Fbase%2FONAPComponents.java;fp=aai-els-onap-logging%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Flogging%2Ffilter%2Fbase%2FONAPComponents.java;h=b9cdd0e9a97603e92e70fbf6fa3c3d49d634c881;hb=dff80ed76c8e0e6416e0688541f3094db3ca260a;hp=5465b7ceeb0bf5627f6284ee59e208bddd3a0d62;hpb=dd7e9878066b0de0d8c0acddf58aec5702e83115;p=aai%2Faai-common.git

diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
index 5465b7ce..b9cdd0e9 100644
--- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
+++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
@@ -24,15 +24,12 @@ import java.util.EnumSet;
 import java.util.Set;
 
 public enum ONAPComponents implements ONAPComponentsList {
-    OPENSTACK_ADAPTER, BPMN, GRM, AAI, DMAAP, POLICY, CATALOG_DB, REQUEST_DB, SNIRO, SDC, EXTERNAL, VNF_ADAPTER, SDNC_ADAPTER, MULTICLOUD, CLAMP, PORTAL, VID, APPC, DCAE, HOLMES, SDNC, SO, VFC, ESR, DBC, DR, MR, OPTF;
+    OPENSTACK_ADAPTER, BPMN, GRM, AAI, POLICY, CATALOG_DB, REQUEST_DB, SNIRO, SDC, EXTERNAL, VNF_ADAPTER, SDNC_ADAPTER, MULTICLOUD, CLAMP, PORTAL, VID, APPC, DCAE, HOLMES, SDNC, SO, VFC, ESR, DBC, DR, MR, OPTF;
 
     public static Set<ONAPComponents> getSOInternalComponents() {
         return EnumSet.of(OPENSTACK_ADAPTER, BPMN, CATALOG_DB, REQUEST_DB, VNF_ADAPTER, SDNC_ADAPTER);
     }
 
-    public static Set<ONAPComponents> getDMAAPInternalComponents() {
-        return EnumSet.of(DBC, DR, MR);
-    }
 
     public static Set<ONAPComponents> getAAIInternalComponents() {
         return EnumSet.of(ESR);
@@ -42,8 +39,6 @@ public enum ONAPComponents implements ONAPComponentsList {
     public String toString() {
         if (getSOInternalComponents().contains(this))
             return SO + "." + this.name();
-        else if (getDMAAPInternalComponents().contains(this))
-            return DMAAP + "." + this.name();
         else if (getAAIInternalComponents().contains(this))
             return AAI + "." + this.name();
         else