From: Toine Siebelink <toine.siebelink@est.tech>
Date: Thu, 30 Jun 2022 08:43:50 +0000 (+0000)
Subject: Merge "Kafka consumer can not be turned off"
X-Git-Tag: 3.1.0~89
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=66b29582d457c5255e24c4327406b436d856138e;p=cps.git

Merge "Kafka consumer can not be turned off"
---

66b29582d457c5255e24c4327406b436d856138e
diff --cc cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java
index 7abefe6791,5703d5e86b..e0488c2279
--- a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java
+++ b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java
@@@ -75,11 -72,12 +74,12 @@@ public class NetworkCmProxyController i
  
      private final DeprecationHelper deprecationHelper;
      private final NcmpRestInputMapper ncmpRestInputMapper;
 -    private final RestOutputCmHandleStateMapper restOutputCmHandleStateMapper;
 +    private final CmHandleStateMapper cmHandleStateMapper;
      private final CpsNcmpTaskExecutor cpsNcmpTaskExecutor;
- 
      @Value("${notification.async.executor.time-out-value-in-ms:2000}")
      private int timeOutInMilliSeconds;
+     @Value("${notification.enabled:true}")
+     private boolean asyncEnabled;
  
      /**
       * Get resource data from operational datastore.