Adapt vCPE example for Rhino Javascript

Minor changes to Javascript source for execution under the Rhino script
engine.

Issue-ID: POLICY-2106
Change-Id: Ib7e30ce0067a11ea1bb3ca8d197c796dba9ea091
Signed-off-by: liamfallon <liam.fallon@est.tech>

14 files changed, 69 insertions, 44 deletions

diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js
index 88bf72671..6d5df84c3 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +29,8 @@ var blackFlag = executor.getContextAlbum("ServiceIdWhiteBlackListAlbum").get(ser
 
 executor.logger.info("vnfId=" + vnfId + ", serviceId=" + serviceId + ", blackFlag=" + blackFlag);
 
-if (blackFlag != null && blackFlag === true) {
-    vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+if (blackFlag != null && blackFlag == true) {
+    vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
     vcpeClosedLoopStatus.put("notification", "BLACKLIST");
     var message = vcpeClosedLoopStatus.get("message");
 
@@ -43,4 +44,5 @@ if (blackFlag != null && blackFlag === true) {
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
+
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js
index d4e3f30dc..7bca8659b 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +27,9 @@ var blackFlag = executor.getContextAlbum("VnfIdWhiteBlackListAlbum").get(vnfId);
 
 executor.logger.info("vnfId=" + vnfId + ", blackFlag=" + blackFlag);
 
-if (blackFlag != null && blackFlag === true) {
+if (blackFlag != null && blackFlag == true) {
     var vcpeClosedLoopStatus = executor.getContextAlbum("ControlLoopStatusAlbum").get(vnfId);
-    vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+    vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
     vcpeClosedLoopStatus.put("notification", "BLACKLIST");
     var message = vcpeClosedLoopStatus.get("message");
 
@@ -42,4 +43,4 @@ if (blackFlag != null && blackFlag === true) {
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js
index 785d93f25..843011024 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +29,8 @@ var blackFlag = executor.getContextAlbum("VServerIdWhiteBlackListAlbum").get(vSe
 
 executor.logger.info("vnfId=" + vnfId + ", vServerId=" + vServerId + ", blackFlag=" + blackFlag);
 
-if (blackFlag != null && blackFlag === true) {
-    vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+if (blackFlag != null && blackFlag == true) {
+    vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
     vcpeClosedLoopStatus.put("notification", "BLACKLIST");
     var message = vcpeClosedLoopStatus.get("message");
 
@@ -43,4 +44,5 @@ if (blackFlag != null && blackFlag === true) {
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
+
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js
index 2d41e5f90..b16404292 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,21 +30,24 @@ var targetType = executor.inFields.get("targetType");
 var target = executor.inFields.get("target");
 var black = executor.inFields.get("black");
 
-var returnValue = executor.isTrue;
+var returnValue = true;
 
-if (targetType === "VNF") {
+if (targetType == "VNF") {
     executor.getContextAlbum("VnfIdWhiteBlackListAlbum").put(target, black);
     executor.logger.info("added VNF ID \"" + target + "\" with black flag \"" + black + "\" to VNF ID list");
 }
-else if (targetType === "Service") {
+else if (targetType == "Service") {
     executor.getContextAlbum("ServiceIdWhiteBlackListAlbum").put(target, black);
     executor.logger.info("added Service ID \"" + target + "\" with black flag \"" + black + "\" to Service ID list");
 }
-else if (targetType === "VServer") {
+else if (targetType == "VServer") {
     executor.getContextAlbum("VServerIdWhiteBlackListAlbum").put(target, black);
     executor.logger.info("added VServer ID \"" + target + "\" with black flag \"" + black + "\" to VServer ID list");
 }
 else {
     executor.logger.warn("unknown target type \"" + targetType + "\" specified");
-    returnValue = executor.isFalse;
+    returnValue = false;
 }
+
+returnValue;
+
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js
index ca2166c75..615901c4b 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,4 +73,4 @@ executor.outFields.put("VirtualControlLoopNotification", clNotification);
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js
index b6d4cae38..457b80193 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +45,7 @@ controllerRequestBodyInput.put("action", "Restart");
 controllerRequestBodyInput.put("action_DasH_identifiers", new java.util.HashMap());
 controllerRequestBodyInput.get("action_DasH_identifiers").put("vnf-id", executor.inFields.get("vnfID").toString());
 
-controllerRequestBodyInputCommonHeader.put("timestamp", java.lang.System.currentTimeMillis());
+controllerRequestBodyInputCommonHeader.put("timestamp",  java.lang.Long.valueOf(Date.now()));
 controllerRequestBodyInputCommonHeader.put("api_DasH_ver", "2.00");
 controllerRequestBodyInputCommonHeader.put("originator_DasH_id", executor.inFields.get("requestID").toString());
 controllerRequestBodyInputCommonHeader.put("request_DasH_id", executor.inFields.get("requestID").toString());
@@ -62,10 +63,11 @@ executor.getContextAlbum("RequestIDVNFIDAlbum").put(executor.inFields.get("reque
         executor.inFields.get("vnfID"));
 
 vcpeClosedLoopStatus.put("notification", "OPERATION");
-vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
 
 executor.outFields.put("ControllerRequest", controllerRequest);
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
+
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js
index 5a8703780..8cb3e4e41 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,13 +36,13 @@ executor.logger.info("requestIDString =\"" + requestIDString + "\"");
 var vnfID = executor.getContextAlbum("RequestIDVNFIDAlbum").get(requestIDString);
 executor.logger.info("vnfID = " + vnfID);
 
-var returnValue = executor.isTrue;
+var returnValue = true
 
 if (vnfID != null) {
     var vcpeClosedLoopStatus = executor.getContextAlbum("ControlLoopStatusAlbum").get(vnfID.toString());
     var requestId = java.util.UUID.fromString(vcpeClosedLoopStatus.get("requestID"));
 
-    vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+    vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
 
     var returnedCode = controllerResponse.get("body").get("output").get("status").get("code");
     var responseStatus = null;
@@ -66,11 +67,11 @@ if (vnfID != null) {
 
     executor.logger.info("Got from APPC code: " + responseStatus);
 
-    if (responseStatus === "SUCCESS") {
+    if (responseStatus == "SUCCESS") {
         vcpeClosedLoopStatus.put("notification", "OPERATION_SUCCESS");
         vcpeClosedLoopStatus.put("message", "vCPE restarted");
         executor.getContextAlbum("RequestIDVNFIDAlbum").remove(requestIDString);
-    } else if (responseStatus === "ACCEPTED" || responseStatus === "REJECT") {
+    } else if (responseStatus == "ACCEPTED" || responseStatus == "REJECT") {
         executor.logger.info("Got ACCEPTED 100 or REJECT 312, keep the context, wait for next response. Code is: "
                 + responseStatus);
     } else {
@@ -84,7 +85,9 @@ if (vnfID != null) {
     executor.outFields.put("vnfID", vnfID);
 } else {
     executor.message = "VNF ID not found in context album for request ID " + requestIDString;
-    returnValue = executor.isFalse;
+    returnValue = false;
 }
 
 executor.logger.info(executor.outFields);
+
+returnValue;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js
index c24e76523..998f6a20a 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,4 +25,4 @@ executor.logger.info(executor.inFields);
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js
index 003942e22..77155645d 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,4 +26,4 @@ executor.logger.info(executor.inFields);
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js
index a8bb40c80..a74f39789 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +22,14 @@
 executor.logger.info(executor.subject.id);
 executor.logger.info(executor.inFields);
 
-var returnValue = executor.isTrue;
 var status = null;
 
-if (executor.inFields.get("action") === "ControllerRequestAction") {
+if (executor.inFields.get("action") == "ControllerRequestAction") {
     executor.subject.getTaskKey("DoControllerRequestActionTask").copyTo(executor.selectedTask);
 } else {
     executor.subject.getTaskKey("DoLogActionTask").copyTo(executor.selectedTask);
 }
 
 executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask);
+
+true;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js
index 1567608bb..13129f224 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +26,8 @@
 executor.logger.info(executor.subject.id);
 executor.logger.info(executor.inFields);
 
-var utf8Type = Java.type("org.apache.avro.util.Utf8");
-var uuidType = Java.type("java.util.UUID");
+var utf8Type = org.apache.avro.util.Utf8;
+var uuidType = java.util.UUID;
 
 var clEvent = executor.inFields.get("VirtualControlLoopEvent");
 
@@ -61,7 +62,7 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) !=
         vcpeClosedLoopStatus.put("policyName", "ONAPvCPEPolicyModel");
         vcpeClosedLoopStatus.put("policyVersion", "0.0.1");
         vcpeClosedLoopStatus.put("notification", "ACTIVE");
-        vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+        vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
         vcpeClosedLoopStatus.put("message", "");
 
         var aaiInfo = executor.getContextAlbum("ControlLoopStatusAlbum").getSchemaHelper().createNewSubInstance(
@@ -130,7 +131,7 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) !=
         vcpeClosedLoopStatus.put("policyName", "ONAPvCPEPolicyModel");
         vcpeClosedLoopStatus.put("policyVersion", "0.0.1");
         vcpeClosedLoopStatus.put("notification", "ACTIVE");
-        vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+        vcpeClosedLoopStatus.put("notificationTime",  java.lang.Long.valueOf(Date.now()));
         vcpeClosedLoopStatus.put("message", "");
 
         var aaiInfo = executor.getContextAlbum("ControlLoopStatusAlbum").getSchemaHelper().createNewSubInstance(
@@ -154,4 +155,5 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) !=
     executor.logger.info(executor.outFields);
 }
 
-var returnValue = executor.isTrue;
+true;
+
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js
index 0303bc9a4..d5c3999b6 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@ var vcpeClosedLoopStatus = executor.getContextAlbum("ControlLoopStatusAlbum").ge
 
 var eventList = executor.subject.getOutFieldSchemaHelper("ActionEventList").createNewInstance();
 
-var eventType = Java.type("org.onap.policy.apex.service.engine.event.ApexEvent");
+var eventType = org.onap.policy.apex.service.engine.event.ApexEvent;
 
 var controllerRequestActionEvent = new eventType("ActionEvent", "0.0.1", "org.onap.policy.apex.onap.vcpe", "APEX",
         "APEX");
@@ -51,4 +52,5 @@ executor.outFields.put("ActionEventList", eventList);
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;
+
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js
index 46a65add3..a291f6afb 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
 executor.logger.info(executor.subject.id);
 executor.logger.info(executor.inFields);
 
-var returnValue = executor.isTrue;
+var returnValue = true;
 
 if( executor.inFields.get("vnfID") == null) {
    executor.logger.info("ControlLoopStatusAlbum: vnfID is null");
@@ -36,20 +37,20 @@ if( executor.inFields.get("vnfID") == null) {
 var status = vcpeClosedLoopStatus.get("closedLoopEventStatus").toString();
 var notification = vcpeClosedLoopStatus.get("notification");
 
-var returnValue = executor.isTrue;
-
-if (notification != null && notification === "BLACKLIST") {
+if (notification != null && notification == "BLACKLIST") {
     executor.subject.getTaskKey("StopAndLogTask").copyTo(executor.selectedTask);
 }
 else {
-    if (status === "ONSET") {
+    if (status == "ONSET") {
         executor.subject.getTaskKey("InitiateActionsTask").copyTo(executor.selectedTask);
-    } else if (status === "ABATED") {
+    } else if (status == "ABATED") {
         executor.subject.getTaskKey("StopAndLogTask").copyTo(executor.selectedTask);
     } else {
         executor.message = "closedLoopEventStatus is \"" + status + "\", it must be either \"ONSET\" or \"ABATED\"";
-        returnValue = executor.isFalse;
+        returnValue = false;
     }
 }
 
 executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask);
+
+returnValue;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js
index af57bf1f7..2b062fd8e 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +33,10 @@ if (executor.inFields.get("vnfID") == null) {
             .get(executor.inFields.get("vnfID").toString());
 }
 
-vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
+vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now()));
 
 var message = vcpeClosedLoopStatus.get("message");
-if (message == null || message === "") {
+if (message == null || message == "") {
     vcpeClosedLoopStatus.put("message", "situation has been abated");
 }
 else {
@@ -44,4 +45,4 @@ else {
 
 executor.logger.info(executor.outFields);
 
-var returnValue = executor.isTrue;
+true;