From b18fdf8f8d7676aacc729c8189d2c862370bb912 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 18 Jul 2019 09:38:54 -0400 Subject: Rename XxxAPI to XxxApi in drools-applications Now that feature APIs have been renamed to XxxApi in drools-pdp, the same must be done with the META-INF files in drools-applications. Also updated references to XxxApi class names within java code. Change-Id: I7ccc09c36f9b903327b5e92189d0bf2956da6cea Issue-ID: POLICY-1074 Signed-off-by: Jim Hahn --- .../feature/trans/CacheBasedControlLoopMetricsManager.java | 12 ++++++------ .../controlloop/feature/trans/ControlLoopMetricsFeature.java | 6 +++--- ...rg.onap.policy.drools.features.PolicyControllerFeatureAPI | 1 - ...rg.onap.policy.drools.features.PolicyControllerFeatureApi | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureAPI create mode 100644 controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureApi (limited to 'controlloop/common/feature-controlloop-trans/src/main') diff --git a/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/CacheBasedControlLoopMetricsManager.java b/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/CacheBasedControlLoopMetricsManager.java index 672ff3fba..b2a82a29e 100644 --- a/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/CacheBasedControlLoopMetricsManager.java +++ b/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/CacheBasedControlLoopMetricsManager.java @@ -37,7 +37,7 @@ import org.onap.policy.controlloop.ControlLoopOperation; import org.onap.policy.controlloop.VirtualControlLoopNotification; import org.onap.policy.drools.persistence.SystemPersistence; import org.onap.policy.drools.system.PolicyController; -import org.onap.policy.drools.utils.logging.MDCTransaction; +import org.onap.policy.drools.utils.logging.MdcTransaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -225,7 +225,7 @@ class CacheBasedControlLoopMetricsManager implements ControlLoopMetrics { } protected void evicted(VirtualControlLoopNotification notification) { - MDCTransaction + MdcTransaction .newTransaction(notification.getRequestId().toString(), notification.getFrom()) .setServiceName(notification.getClosedLoopControlName()).setTargetEntity(notification.getTarget()) .setStartTime(notification.getNotificationTime().toInstant()).setEndTime(Instant.now()) @@ -258,7 +258,7 @@ class CacheBasedControlLoopMetricsManager implements ControlLoopMetrics { } protected void metric(VirtualControlLoopNotification notification) { - MDCTransaction trans = MDCTransaction + MdcTransaction trans = MdcTransaction .newTransaction(notification.getRequestId().toString(), notification.getFrom()) .setServiceName(notification.getClosedLoopControlName()).setTargetEntity(notification.getTarget()); @@ -289,7 +289,7 @@ class CacheBasedControlLoopMetricsManager implements ControlLoopMetrics { } } - private void metricOperation(MDCTransaction trans, List operations) { + private void metricOperation(MdcTransaction trans, List operations) { trans.setStatusCode(true); if (!operations.isEmpty()) { ControlLoopOperation operation = operations.get(operations.size() - 1); @@ -299,7 +299,7 @@ class CacheBasedControlLoopMetricsManager implements ControlLoopMetrics { trans.metric().resetTransaction(); } - protected void operation(MDCTransaction trans, List operations) { + protected void operation(MdcTransaction trans, List operations) { if (!operations.isEmpty()) { ControlLoopOperation operation = operations.get(operations.size() - 1); @@ -332,7 +332,7 @@ class CacheBasedControlLoopMetricsManager implements ControlLoopMetrics { } protected void transaction(VirtualControlLoopNotification notification, ZonedDateTime startTime) { - MDCTransaction trans = MDCTransaction + MdcTransaction trans = MdcTransaction .newTransaction(notification.getRequestId().toString(), notification.getFrom()) .setServiceName(notification.getClosedLoopControlName()).setTargetEntity(notification.getTarget()) .setStartTime(startTime.toInstant()).setEndTime(notification.getNotificationTime().toInstant()) diff --git a/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeature.java b/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeature.java index 259925324..b4057dfae 100644 --- a/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeature.java +++ b/controlloop/common/feature-controlloop-trans/src/main/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeature.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,13 +22,13 @@ package org.onap.policy.drools.apps.controlloop.feature.trans; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.controlloop.VirtualControlLoopNotification; -import org.onap.policy.drools.features.PolicyControllerFeatureAPI; +import org.onap.policy.drools.features.PolicyControllerFeatureApi; import org.onap.policy.drools.system.PolicyController; /** * Feature that tracks Transactions by observing Notification Patterns. */ -public class ControlLoopMetricsFeature implements PolicyControllerFeatureAPI { +public class ControlLoopMetricsFeature implements PolicyControllerFeatureApi { /** * Feature Sequence Priority. diff --git a/controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureAPI b/controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureAPI deleted file mode 100644 index 1e9fde6ba..000000000 --- a/controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureAPI +++ /dev/null @@ -1 +0,0 @@ -org.onap.policy.drools.apps.controlloop.feature.trans.ControlLoopMetricsFeature diff --git a/controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureApi b/controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureApi new file mode 100644 index 000000000..1e9fde6ba --- /dev/null +++ b/controlloop/common/feature-controlloop-trans/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyControllerFeatureApi @@ -0,0 +1 @@ +org.onap.policy.drools.apps.controlloop.feature.trans.ControlLoopMetricsFeature -- cgit 1.2.3-korg