3 files changed, 7 insertions, 14 deletions
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/AdminToolImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/AdminToolImpl.java
index fa182b4..79ceb44 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/AdminToolImpl.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/AdminToolImpl.java
@@ -62,8 +62,7 @@ public class AdminToolImpl implements AdminTool {
             return Response.ok("").build();
         }
         String encrypted = PropertiesManagement.getEncryptedValue(id);
-        Response response = Response.ok(encrypted).build();
-        return response;
+        return Response.ok(encrypted).build();
     }
 
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmQueryParameters.java b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmQueryParameters.java
index 1e4a46a..9ddb893 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmQueryParameters.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmQueryParameters.java
@@ -224,8 +224,7 @@ public class CmQueryParameters {
 
     private static DateTime convertDate(String utcDate, String urlName) throws CmsoException {
         try {
-            DateTime dateTime = ISODateTimeFormat.dateTimeParser().parseDateTime(utcDate);
-            return dateTime;
+            return ISODateTimeFormat.dateTimeParser().parseDateTime(utcDate);
         }
         catch (Exception e) {
             throw new CmsoException(Status.BAD_REQUEST, LogMessages.INVALID_DATE_FILTER, urlName, utcDate);
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/BuildCreateRequest.java b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/BuildCreateRequest.java
index 8c8cd6f..8ab915c 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/BuildCreateRequest.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/BuildCreateRequest.java
@@ -104,8 +104,7 @@ public class BuildCreateRequest {
     public JsonNode createChangeRecordRequest(Map<String, Object> variables, List<TmAsset> assetList,
             String workflowName) {
         JsonNode rawjson = getYaml("CreateChangeTicket");
-        JsonNode json = substituteJson(rawjson, variables);
-        return json;
+        return substituteJson(rawjson, variables);
     }
 
     /**
@@ -116,8 +115,7 @@ public class BuildCreateRequest {
      */
     public JsonNode createCloseCancelChangeRecord(Map<String, Object> variables) {
         JsonNode rawjson = getYaml("CloseCancelChangeRecord");
-        JsonNode json = substituteJson(rawjson, variables);
-        return json;
+        return substituteJson(rawjson, variables);
     }
 
     /**
@@ -128,8 +126,7 @@ public class BuildCreateRequest {
      */
     public JsonNode createCancelChangeRecord(Map<String, Object> variables) {
         JsonNode rawjson = getYaml("CancelChangeRecord");
-        JsonNode json = substituteJson(rawjson, variables);
-        return json;
+        return substituteJson(rawjson, variables);
     }
 
     /**
@@ -140,8 +137,7 @@ public class BuildCreateRequest {
      */
     public JsonNode createUpdateChangeRecord(Map<String, Object> variables) {
         JsonNode rawjson = getYaml("UpdateChangeRecord");
-        JsonNode json = substituteJson(rawjson, variables);
-        return json;
+        return substituteJson(rawjson, variables);
     }
 
     /**
@@ -152,8 +148,7 @@ public class BuildCreateRequest {
      */
     public JsonNode createGetChangeRecord(Map<String, Object> variables) {
         JsonNode rawjson = getYaml("GetChangeRecord");
-        JsonNode json = substituteJson(rawjson, variables);
-        return json;
+        return substituteJson(rawjson, variables);
     }
 
     private JsonNode substituteJson(JsonNode json, Map<String, Object> variables) {