replacing with the diamond operators

Issue-ID: OPTFRA-635
Change-Id: I2cfd17d545a89b0be27bd4b73e402074465bcaa3
Signed-off-by: manisha07 <cmanis10@in.ibm.com>

diff --git a/cmso-robot/.gitignore b/cmso-robot/.gitignore
index 44bdbba..cd46865 100644 (file)
--- a/cmso-robot/.gitignore
+++ b/cmso-robot/.gitignore
@@ -5,4 +5,5 @@
 *.pyc
 /libspecs/
 /geckodriver.log
-/robot/library/
\ No newline at end of file
+/robot/library/
+/bin/

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..ebad49f 100644 (file)
--- 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
@@ -120,8 +120,8 @@ public class CmQueryParameters {
 \r
     private static String formatString(String urlName, List<String> values, QueryColumns qc) {\r
         StringBuilder clause = new StringBuilder();\r
-        List<String> likes = new ArrayList<String>();\r
-        List<String> in = new ArrayList<String>();\r
+        List<String> likes = new ArrayList<>();\r
+        List<String> in = new ArrayList<>();\r
         for (String value : values) {\r
             if (value.contains("%")) {\r
                 likes.add(value);\r
@@ -170,7 +170,7 @@ public class CmQueryParameters {
     }\r
 \r
     private static String formatDate(String urlName, List<String> values, QueryColumns qc) throws CmsoException {\r
-        List<String> clauses = new ArrayList<String>();\r
+        List<String> clauses = new ArrayList<>();\r
         for (String value : values) {\r
             String[] dates = value.split(",");\r
             switch (dates.length) {\r
@@ -232,19 +232,5 @@ public class CmQueryParameters {
         }\r
     }\r
 \r
-    // public static void main(String argv[])\r
-    // {\r
-    // List<String> values = new ArrayList<String>();\r
-    // values.add("2017-07-08T11:12:13Z,2017-07-08T11:12:13Z");\r
-    // values.add("2017-07-09T11:12:13Z,2017-07-09T11:12:13Z");\r
-    // values.add(",2017-07-09T11:12:13Z");\r
-    // values.add(" 2017-07-09T11:12:13Z");\r
-    // try {\r
-    // System.out.println(buildClause("request.createDateTime", values));\r
-    // } catch (SchedulerException e) {\r
-    // // TODO Auto-generated catch block\r
-    // e.printStackTrace();\r
-    // }\r
-    //\r
-    // }\r
+    \r
 }\r

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/TmClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/TmClient.java
index 1864da7..b2b4479 100644 (file)
--- a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/TmClient.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/TmClient.java
@@ -234,7 +234,7 @@ public class TmClient {
             }\r
 \r
         }\r
-        Map<String, Object> variables = new HashMap<String, Object>();\r
+        Map<String, Object> variables = new HashMap<>();\r
 \r
         variables.put(Variables.status.toString(), "Closed");\r
         variables.put(Variables.requesterId.toString(), requesterId);\r
@@ -248,7 +248,7 @@ public class TmClient {
 \r
     private Map<String, Object> getCancelVariables(Schedule schedule, String changeId) {\r
         String requesterId = schedule.getUserId();\r
-        Map<String, Object> variables = new HashMap<String, Object>();\r
+        Map<String, Object> variables = new HashMap<>();\r
         if (requesterId.length() > Variables.requesterId.getMaxLength()) {\r
             requesterId = requesterId.substring(0, Variables.requesterId.getMaxLength());\r
         }\r
@@ -259,7 +259,7 @@ public class TmClient {
 \r
     private Map<String, Object> getUpdateVariables(Schedule schedule, String changeId) {\r
         String requesterId = schedule.getUserId();\r
-        Map<String, Object> variables = new HashMap<String, Object>();\r
+        Map<String, Object> variables = new HashMap<>();\r
         if (requesterId.length() > Variables.requesterId.getMaxLength()) {\r
             requesterId = requesterId.substring(0, Variables.requesterId.getMaxLength());\r
         }\r
@@ -275,7 +275,7 @@ public class TmClient {
             Response response = null;\r
             debug.debug("postCloseChangeTicket {}", closeChangeRecord.asText());\r
             Observation.report(LogMessages.TM_CLOSE_CHANGE_RECORD, "Begin", scheduleId, changeId);\r
-            // response = vtmPost(url, closeChangeRecord, scheduleId);\r
+         \r
             response = tmPost(Endpoint.CLOSE, closeChangeRecord, scheduleId);\r
             Observation.report(LogMessages.TM_CLOSE_CHANGE_RECORD, "End", scheduleId, changeId);\r
             switch (response.getStatus()) {\r
@@ -338,7 +338,7 @@ public class TmClient {
     }\r
 \r
     private List<TmAsset> getAssetList(List<String> vnfNames) {\r
-        List<TmAsset> assetList = new ArrayList<TmAsset>();\r
+        List<TmAsset> assetList = new ArrayList<>();\r
         for (String vnfName : vnfNames) {\r
             TmAsset asset = new TmAsset();\r
             asset.setAssetId(vnfName);\r