Removing Named Query

Removing all the related  files and necessary modifications for removing named query. The code now only supports Custom Query.

Issue-ID: POLICY-2125
Change-Id: I2d376eb955d69f45c39ad4d4a1cfacb4d620ca8e
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl
index 54295e971..692c74350 100644
--- a/controlloop/common/controller-usecases/src/main/resources/usecases.drl
+++ b/controlloop/common/controller-usecases/src/main/resources/usecases.drl
@@ -41,7 +41,6 @@ import org.onap.policy.controlloop.actor.so.SoActorServiceProvider;
 import org.onap.policy.controlloop.actor.cds.CdsActorServiceProvider;
 import org.onap.policy.controlloop.actor.cds.CdsActorServiceProvider.CdsActorServiceManager;
 import org.onap.policy.controlloop.actor.cds.constants.CdsActorConstants;
-import org.onap.policy.aai.AaiNqResponseWrapper;
 import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.appc.Request;
 import org.onap.policy.appc.Response;
@@ -778,7 +777,6 @@ rule "EVENT.MANAGER.OPERATION.LOCKED.GUARD_NOT_YET_QUERIED"
 
     // NOTE: The environment properties uses "guard.disabled" but the boolean is guardEnabled
     boolean guardEnabled = "false".equalsIgnoreCase(PolicyEngineConstants.getManager().getEnvironmentProperty("guard.disabled"));
-    boolean cqEnabled = "true".equalsIgnoreCase(PolicyEngineConstants.getManager().getEnvironmentProperty("aai.customQuery"));
 
     if(guardEnabled){
 
@@ -790,10 +788,6 @@ rule "EVENT.MANAGER.OPERATION.LOCKED.GUARD_NOT_YET_QUERIED"
                                                         $operation.getTargetEntity(),
                                                         $event.getRequestId().toString(),
                                                         () -> {
-                                                             if (!cqEnabled) {
-                                                                 AaiNqResponseWrapper resp = $manager.getNqVserverFromAai();
-                                                                 return(resp == null ? null : resp.countVfModules());
-                                                             } else {
                                                                  try {
                                                                      AaiCqResponse resp_cq  = $manager.getCqResponse($event);
                                                                      if (resp_cq == null){
@@ -808,7 +802,6 @@ rule "EVENT.MANAGER.OPERATION.LOCKED.GUARD_NOT_YET_QUERIED"
                                                                      logger.warn("{}: {}", $params.getClosedLoopControlName(), drools.getRule().getName(), e);
                                                                  }
                                                                  return null;
-                                                             }
                                                         }));
         t.start();
     }