From c2e0698897c060a91a5212f8f42d8aa2a9b96e65 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 29 Jun 2020 17:43:07 -0400 Subject: Fix build breakage in drools-apps due to pair The Pair changes made in drools-pdp also broke drools-apps builds. Replaced usage of drools.utils.Pair with apache Pair. Issue-ID: POLICY-2202 Change-Id: I50aaad47c243637688602ae6cb680a929fe3edd9 Signed-off-by: Jim Hahn --- .../controller-usecases/src/main/resources/usecases.drl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'controlloop/common/controller-usecases/src') diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl index 3fe2cddbf..dabc02f68 100644 --- a/controlloop/common/controller-usecases/src/main/resources/usecases.drl +++ b/controlloop/common/controller-usecases/src/main/resources/usecases.drl @@ -21,6 +21,8 @@ package org.onap.policy.controlloop; +import org.apache.commons.lang3.tuple.Pair; + import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput; import org.onap.policy.controlloop.drl.legacy.ControlLoopParams; import org.onap.policy.controlloop.CanonicalOnset; @@ -50,7 +52,6 @@ import org.onap.policy.appclcm.AppcLcmDmaapWrapper; import org.onap.policy.cds.CdsResponse; import org.onap.policy.cds.client.CdsProcessorGrpcClient; import org.onap.policy.cds.properties.CdsServerProperties; -import org.onap.policy.drools.utils.Pair; import org.onap.policy.sdnr.PciRequestWrapper; import org.onap.policy.sdnr.PciResponseWrapper; import org.onap.policy.sdnr.PciRequest; @@ -432,15 +433,15 @@ rule "EVENT.MANAGER" Pair oldNew = $manager.lockCurrentOperation( new LockCallbackWorkingMemory($params.getClosedLoopControlName(), drools.getWorkingMemory())); - if(oldNew.first() != null) { + if(oldNew.getLeft() != null) { logger.debug("{}: {}.{}: retracting lock={}", $clName, - $params.getPolicyName(), drools.getRule().getName(), oldNew.first()); - retract(oldNew.first()); + $params.getPolicyName(), drools.getRule().getName(), oldNew.getLeft()); + retract(oldNew.getLeft()); } - if(oldNew.second() != null) { + if(oldNew.getRight() != null) { logger.debug("{}: {}.{}: inserting lock={}", $clName, - $params.getPolicyName(), drools.getRule().getName(), oldNew.second()); - insert(oldNew.second()); + $params.getPolicyName(), drools.getRule().getName(), oldNew.getRight()); + insert(oldNew.getRight()); } // -- cgit 1.2.3-korg