From 218eb3e2c66c33a636130115f4b4e1465ca5026a Mon Sep 17 00:00:00 2001 From: rama-huawei Date: Wed, 27 Sep 2017 15:37:33 +0530 Subject: Replace with the diamnod operator Issue-Id:SO-118 Change-Id: I96a1fb659bafd204221c5ff8f3d0b680a36dba9d Signed-off-by: rama-huawei --- .../org/openecomp/mso/client/policy/LoggingFilter.java | 15 ++++++++------- .../src/main/java/org/openecomp/mso/client/sdno/Body.java | 2 +- .../main/java/org/openecomp/mso/client/sdno/Input.java | 2 +- .../mso/client/sdno/RequestHealthDiagnostic.java | 2 +- .../java/org/openecomp/mso/client/sdno/ResultInfo.java | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) (limited to 'bpmn') 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 9a7c21fba1..161eb74d94 100644 --- 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, private InputStream logInboundEntity(final StringBuilder b, InputStream stream, final Charset charset) throws IOException { - if (!stream.markSupported()) { - stream = new BufferedInputStream(stream); + InputStream inputStream = stream; + if (!inputStream.markSupported()) { + inputStream = new BufferedInputStream(inputStream); } - stream.mark(maxEntitySize + 1); + inputStream.mark(maxEntitySize + 1); final byte[] entity = new byte[maxEntitySize + 1]; - final int entitySize = stream.read(entity); + final int entitySize = inputStream.read(entity); b.append(new String(entity, 0, Math.min(entitySize, maxEntitySize), charset)); if (entitySize > maxEntitySize) { b.append("...more..."); } b.append('\n'); - stream.reset(); - return stream; + inputStream.reset(); + return inputStream; } @Override @@ -106,4 +107,4 @@ public class LoggingFilter implements ClientRequestFilter, ClientResponseFilter, out.write(i); } } -} \ No newline at end of file +} 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 d35d3906f2..c81ad7481a 100644 --- 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 additionalProperties = new HashMap(); + private Map 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 da28ac507a..72e04c7243 100644 --- 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 additionalProperties = new HashMap(); + private Map 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 a1109b2dfd..660dc4bf9b 100644 --- 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 additionalProperties = new HashMap(); + private Map 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 a5199acad7..64cfdc00ad 100644 --- 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 additionalProperties = new HashMap(); +private Map additionalProperties = new HashMap<>(); @JsonProperty("client-name") public String getClientName() { -- cgit 1.2.3-korg