Replace with the diamnod operator

Issue-Id:SO-118

Change-Id: I96a1fb659bafd204221c5ff8f3d0b680a36dba9d
Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java
index 9a7c21f..161eb74 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java
@@ -33,19 +33,20 @@ public class LoggingFilter implements ClientRequestFilter, ClientResponseFilter,
 \r
        private InputStream logInboundEntity(final StringBuilder b, InputStream stream, final Charset charset)\r
                        throws IOException {\r
-               if (!stream.markSupported()) {\r
-                       stream = new BufferedInputStream(stream);\r
+               InputStream inputStream = stream;\r
+               if (!inputStream.markSupported()) {\r
+                       inputStream = new BufferedInputStream(inputStream);\r
                }\r
-               stream.mark(maxEntitySize + 1);\r
+               inputStream.mark(maxEntitySize + 1);\r
                final byte[] entity = new byte[maxEntitySize + 1];\r
-               final int entitySize = stream.read(entity);\r
+               final int entitySize = inputStream.read(entity);\r
                b.append(new String(entity, 0, Math.min(entitySize, maxEntitySize), charset));\r
                if (entitySize > maxEntitySize) {\r
                        b.append("...more...");\r
                }\r
                b.append('\n');\r
-               stream.reset();\r
-               return stream;\r
+               inputStream.reset();\r
+               return inputStream;\r
        }\r
 \r
        @Override\r
@@ -106,4 +107,4 @@ public class LoggingFilter implements ClientRequestFilter, ClientResponseFilter,
                        out.write(i);\r
                }\r
        }\r
-}
\ No newline at end of file
+}\r

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Body.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Body.java
index d35d390..c81ad74 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Body.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Body.java
@@ -22,7 +22,7 @@ public class Body implements Serializable
     @JsonProperty("input")
     private Input input;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = 9101706044452851559L;
 
     @JsonProperty("input")

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Input.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Input.java
index da28ac5..72e04c7 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Input.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Input.java
@@ -22,7 +22,7 @@ public class Input implements Serializable
     @JsonProperty("request-healthdiagnostic")
     private RequestHealthDiagnostic RequestHealthDiagnostic;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = 7155546785389227528L;
 
     @JsonProperty("request-healthdiagnostic")

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/RequestHealthDiagnostic.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/RequestHealthDiagnostic.java
index a1109b2..660dc4b 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/RequestHealthDiagnostic.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/RequestHealthDiagnostic.java
@@ -40,7 +40,7 @@ public class RequestHealthDiagnostic implements Serializable
     @JsonProperty("health-diagnostic-code")
     private String healthDiagnosticCode;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = 1166788526178388021L;
 
     @JsonProperty("request-client-name")

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/ResultInfo.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/ResultInfo.java
index a5199ac..64cfdc0 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/ResultInfo.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/ResultInfo.java
@@ -31,7 +31,7 @@ private String requestId;
 @JsonProperty("status")
 private String status;
 @JsonIgnore
-private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+private Map<String, Object> additionalProperties = new HashMap<>();
 
 @JsonProperty("client-name")
 public String getClientName() {