diff options
Diffstat (limited to 'policy-endpoints/src/main')
2 files changed, 12 insertions, 24 deletions
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/features/NetLoggerFeatureProviders.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/features/NetLoggerFeatureProviders.java index db2b05d1..8b09f386 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/features/NetLoggerFeatureProviders.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/features/NetLoggerFeatureProviders.java @@ -32,7 +32,7 @@ public class NetLoggerFeatureProviders { * Feature providers implementing this interface. */ @Getter - private static OrderedServiceImpl<NetLoggerFeatureApi> providers = + private static final OrderedServiceImpl<NetLoggerFeatureApi> providers = new OrderedServiceImpl<>(NetLoggerFeatureApi.class); private NetLoggerFeatureProviders() { diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/NetLoggerUtil.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/NetLoggerUtil.java index d8f48a26..c7dd516f 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/NetLoggerUtil.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/utils/NetLoggerUtil.java @@ -21,8 +21,8 @@ package org.onap.policy.common.endpoints.utils; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.features.NetLoggerFeatureApi; import org.onap.policy.common.endpoints.features.NetLoggerFeatureProviders; +import org.onap.policy.common.utils.services.FeatureApiUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -111,17 +111,11 @@ public class NetLoggerUtil { */ private static boolean featureBeforeLog(Logger eventLogger, EventType type, CommInfrastructure protocol, String topic, String message) { - for (NetLoggerFeatureApi feature : NetLoggerFeatureProviders.getProviders().getList()) { - try { - if (feature.beforeLog(eventLogger, type, protocol, topic, message)) { - return true; - } - } catch (Exception e) { - logger.error("feature {} before-log failure because of {}", feature.getClass().getName(), - e.getMessage(), e); - } - } - return false; + + return FeatureApiUtils.apply(NetLoggerFeatureProviders.getProviders().getList(), + feature -> feature.beforeLog(eventLogger, type, protocol, topic, message), + (feature, ex) -> logger.error("feature {} before-log failure because of {}", + feature.getClass().getName(), ex.getMessage(), ex)); } /** @@ -138,17 +132,11 @@ public class NetLoggerUtil { */ private static boolean featureAfterLog(Logger eventLogger, EventType type, CommInfrastructure protocol, String topic, String message) { - for (NetLoggerFeatureApi feature : NetLoggerFeatureProviders.getProviders().getList()) { - try { - if (feature.afterLog(eventLogger, type, protocol, topic, message)) { - return true; - } - } catch (Exception e) { - logger.error("feature {} after-log failure because of {}", feature.getClass().getName(), e.getMessage(), - e); - } - } - return false; + + return FeatureApiUtils.apply(NetLoggerFeatureProviders.getProviders().getList(), + feature -> feature.afterLog(eventLogger, type, protocol, topic, message), + (feature, ex) -> logger.error("feature {} after-log failure because of {}", + feature.getClass().getName(), ex.getMessage(), ex)); } } |