From bde88b29e663fe08325cf3abd72236f96c498cd0 Mon Sep 17 00:00:00 2001 From: Munir Ahmad Date: Fri, 9 Mar 2018 19:49:54 -0500 Subject: Remove redundant type cast Change-Id: Ie00d5ec5a4677c99a9a689bf18a85055902f6384 Issue-ID: SO-437 Signed-off-by: Munir Ahmad --- .../org/openecomp/mso/bpmn/core/json/JsonUtils.java | 20 ++++++++++---------- .../core/plugins/LoggingAndURNMappingPlugin.java | 2 +- .../org/openecomp/mso/bpmn/core/TestBaseTask.java | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'bpmn/MSOCoreBPMN') diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java index b0152a1296..bfad9bac26 100644 --- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java +++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java @@ -327,7 +327,7 @@ public class JsonUtils { return null; } else { if (rawValue instanceof String) { - msoLogger.debug("getJsonValue(): the raw value is a String Object=" + ((String) rawValue)); + msoLogger.debug("getJsonValue(): the raw value is a String Object=" + rawValue); return (String) rawValue; } else { msoLogger.debug("getJsonValue(): the raw value is NOT a String Object=" + rawValue.toString()); @@ -356,7 +356,7 @@ public class JsonUtils { return null; } else { if (rawValue instanceof String) { - msoLogger.debug("getJsonNodeValue(): the raw value is a String Object=" + ((String) rawValue)); + msoLogger.debug("getJsonNodeValue(): the raw value is a String Object=" + rawValue); return (String) rawValue; } else { msoLogger.debug("getJsonNodeValue(): the raw value is NOT a String Object=" + rawValue.toString()); @@ -388,7 +388,7 @@ public class JsonUtils { return 0; } else { if (rawValue instanceof Integer) { - msoLogger.debug("getJsonValue(): the raw value is an Integer Object=" + ((String) rawValue)); + msoLogger.debug("getJsonValue(): the raw value is an Integer Object=" + rawValue); return (Integer) rawValue; } else { msoLogger.debug("getJsonValue(): the raw value is NOT an Integer Object=" + rawValue.toString()); @@ -416,7 +416,7 @@ public class JsonUtils { return false; } else { if (rawValue instanceof Boolean) { - msoLogger.debug("getJsonValue(): the raw value is a Boolean Object=" + ((String) rawValue)); + msoLogger.debug("getJsonValue(): the raw value is a Boolean Object=" + rawValue); return (Boolean) rawValue; } else { msoLogger.debug("getJsonValue(): the raw value is NOT an Boolean Object=" + rawValue.toString()); @@ -462,7 +462,7 @@ public class JsonUtils { return null; } else { if (rawValue instanceof JSONArray) { - msoLogger.debug("getJsonParamValue(): keys=" + keys + " points to JSONArray: " + ((JSONArray) rawValue).toString()); + msoLogger.debug("getJsonParamValue(): keys=" + keys + " points to JSONArray: " + rawValue.toString()); int arrayLen = ((JSONArray) rawValue).length(); if (index < 0 || arrayLen < index+1) { msoLogger.debug("getJsonParamValue(): index: " + index + " is out of bounds for array size of " + arrayLen); @@ -549,7 +549,7 @@ public class JsonUtils { msoLogger.debug("getJsonValueForKey(): iterating over the keys"); Iterator itr = jsonObj.keys(); while (itr.hasNext()) { - String nextKey = (String) itr.next(); + String nextKey = itr.next(); Object obj = jsonObj.get(nextKey); if (obj instanceof JSONObject) { msoLogger.debug("getJsonValueForKey(): key=" + nextKey + ", points to JSONObject, recursive call"); @@ -592,7 +592,7 @@ public class JsonUtils { msoLogger.debug("getJsonValueForKey(): iterating over the keys"); Iterator itr = jsonObj.keys(); while (itr.hasNext()) { - String nextKey = (String) itr.next(); + String nextKey = itr.next(); Object obj = jsonObj.get(nextKey); if (obj instanceof JSONObject) { msoLogger.debug("getJsonValueForKey(): key=" + nextKey + ", points to JSONObject, recursive call"); @@ -634,7 +634,7 @@ public class JsonUtils { msoLogger.debug("getJsonBooleanValueForKey(): iterating over the keys"); Iterator itr = jsonObj.keys(); while (itr.hasNext()) { - String nextKey = (String) itr.next(); + String nextKey = itr.next(); Object obj = jsonObj.get(nextKey); if (obj instanceof JSONObject) { msoLogger.debug("getJsonBooleanValueForKey(): key=" + nextKey + ", points to JSONObject, recursive call"); @@ -690,7 +690,7 @@ public class JsonUtils { if (!jsonValueExists(jsonStr, keys)) { return putJsonValue(jsonStr, keys, value); } else { - msoLogger.debug("addJsonValue(): JSON add failed, key=" + keys + "/value=" + (String) value + " already exists"); + msoLogger.debug("addJsonValue(): JSON add failed, key=" + keys + "/value=" + value + " already exists"); return jsonStr; } } @@ -826,7 +826,7 @@ public class JsonUtils { msoLogger.debug("putJsonValue(): key=" + keyStr + " points to json object"); jsonObj = (JSONObject) keyValue; } else { - msoLogger.debug("putJsonValue(): key=" + keyStr + " not the last key but points to non-json object: " + (String) keyValue); + msoLogger.debug("putJsonValue(): key=" + keyStr + " not the last key but points to non-json object: " + keyValue); return null; } } else { // at the last/new key value diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java index 730c1451d5..b66169db92 100644 --- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java +++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java @@ -421,7 +421,7 @@ public class LoggingAndURNMappingPlugin extends AbstractProcessEnginePlugin { try { String id = execution.getId(); if ("START".equals(event) && id != null ) { - startTimes.put(id, (Long)System.currentTimeMillis()); + startTimes.put(id, System.currentTimeMillis()); } else if ("END".equals(event) && id != null) { String prefix = (String) execution.getVariable("prefix"); diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java index 2d204c338a..d434ac702d 100644 --- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java +++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java @@ -58,8 +58,8 @@ public class TestBaseTask { Map variables = new HashMap<>(); variables.put("firstName", "Jane"); variables.put("lastName", "Doe"); - variables.put("age", (Integer)25); - variables.put("lastVisit", (Long)1438270117000L); + variables.put("age", 25); + variables.put("lastVisit", 1438270117000L); RuntimeService runtimeService = processEngineRule.getRuntimeService(); assertNotNull(runtimeService); -- cgit 1.2.3-korg