aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-02-26 08:03:49 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-26 08:03:49 +0000
commit2d0e820a2e1caccf77e4e151c267e086f2cb97dd (patch)
tree0724cc97f762a0bc78cfd59d51a1784363d224e8
parent0e8dbede217edecaab527d6a84d010a685014b56 (diff)
parentdd7360a8dac33b478273bdb0d03aef910cfe53f6 (diff)
Merge "Add the correct literal ending for long"
-rw-r--r--adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java2
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java4
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java6
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java6
4 files changed, 9 insertions, 9 deletions
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
index a292c76825..b8a5d9b117 100644
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
@@ -465,7 +465,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
private boolean callHeatbridge(String heatStackId) {
String executionDir = "/usr/local/lib/python2.7/dist-packages/heatbridge";
String openstackIdentityUrl = "", username = "", password = "", tenant = "", region = "", owner = "";
- long waitTimeMs = 10000l;
+ long waitTimeMs = 10000L;
try {
String[] cmdarray = {"/usr/bin/python", "HeatBridgeMain.py", openstackIdentityUrl, username, password, tenant, region, owner, heatStackId};
String[] envp = null;
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
index 3c5c89fc92..89d4d0c98f 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
@@ -184,7 +184,7 @@ UriInfo uriInfo = null;
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
@@ -206,7 +206,7 @@ UriInfo uriInfo = null;
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
index 2d3a2a47a5..205bb8d910 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
@@ -182,7 +182,7 @@ public class VnfRequestHandlerTest {
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
@@ -207,7 +207,7 @@ public class VnfRequestHandlerTest {
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
@@ -229,7 +229,7 @@ public class VnfRequestHandlerTest {
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
index bf4d7c4d98..fa6b06b4b2 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
@@ -156,7 +156,7 @@ public class VolumeRequestHandlerTest {
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
@@ -177,7 +177,7 @@ public class VolumeRequestHandlerTest {
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));
@@ -197,7 +197,7 @@ public class VolumeRequestHandlerTest {
req.setAaiServiceId("299392");
req.setAction("CREATE");
req.setRequestStatus("COMPLETE");
- req.setProgress(10001l);
+ req.setProgress(10001L);
req.setSource("test");
req.setStartTime(new Timestamp(10020100));
req.setEndTime(new Timestamp(20020100));