From 9b6476f1117ef2310f5a2d7cb514b0736564c8c7 Mon Sep 17 00:00:00 2001 From: Lukasz Muszkieta Date: Thu, 21 Feb 2019 16:23:29 +0100 Subject: remove unneeded code Change-Id: Ib1a62a8cf3a0335bf163ca2634c86e95d2a258b8 Issue-ID: SO-729 Signed-off-by: Lukasz Muszkieta --- .../infrastructure/pnf/delegate/PnfCheckInputs.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-common/src/main/java/org') diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputs.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputs.java index a975339e58..1b185f7c03 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputs.java +++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputs.java @@ -31,7 +31,6 @@ import com.google.common.base.Strings; import org.camunda.bpm.engine.delegate.DelegateExecution; import org.camunda.bpm.engine.delegate.JavaDelegate; import org.onap.so.bpmn.common.scripts.ExceptionUtil; -import org.onap.so.logger.MsoLogger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -40,13 +39,12 @@ import org.springframework.stereotype.Component; public class PnfCheckInputs implements JavaDelegate { public static final String UUID_REGEX = "(?i)^[0-9a-f]{8}-[0-9a-f]{4}-[1-5]{1}[0-9a-f]{3}-[89ab]{1}[0-9a-f]{3}-[0-9a-f]{12}$"; - private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL, PnfCheckInputs.class); - private String defaultTimeout; + private String pnfEntryNotificationTimeout; @Autowired - public PnfCheckInputs(@Value("${aai.pnfEntryNotificationTimeout}") String defaultTimeout) { - this.defaultTimeout = defaultTimeout; + public PnfCheckInputs(@Value("${aai.pnfEntryNotificationTimeout}") String pnfEntryNotificationTimeout) { + this.pnfEntryNotificationTimeout = pnfEntryNotificationTimeout; } @Override @@ -75,15 +73,11 @@ public class PnfCheckInputs implements JavaDelegate { } private void validateTimeout(DelegateExecution execution) { - String timeout = (String) execution.getVariable(TIMEOUT_FOR_NOTIFICATION); - if (Strings.isNullOrEmpty(timeout)) { - LOGGER.debug("timeoutForPnfEntryNotification variable not found, setting default"); - if (defaultTimeout == null) { - new ExceptionUtil().buildAndThrowWorkflowException(execution, 9999, - "default timeoutForPnfEntryNotification value not defined"); - } - execution.setVariable(TIMEOUT_FOR_NOTIFICATION, defaultTimeout); + if (Strings.isNullOrEmpty(pnfEntryNotificationTimeout)) { + new ExceptionUtil().buildAndThrowWorkflowException(execution, 9999, + "timeoutForPnfEntryNotification value not defined"); } + execution.setVariable(TIMEOUT_FOR_NOTIFICATION, pnfEntryNotificationTimeout); } private void validateServiceInstanceId(DelegateExecution execution) { -- cgit 1.2.3-korg