From 7b86bb9d084bb9642616e80c0980696aa55eade2 Mon Sep 17 00:00:00 2001 From: rama-huawei Date: Wed, 18 Oct 2017 11:29:23 +0530 Subject: Added the "@Override" annotation Issue-id: SO-224 Change-Id: Ia7802db1ba32a97340bca8d0c71714b988abb6e5 Signed-off-by: rama-huawei --- .../src/main/java/com/woorea/openstack/connector/JerseyConnector.java | 2 +- .../main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java | 3 ++- .../src/main/java/com/woorea/openstack/connector/JerseyResponse.java | 2 +- .../src/main/java/com/woorea/openstack/connector/OpenStack.java | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java index e621910..eb1b3d5 100644 --- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java +++ b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java @@ -78,7 +78,7 @@ public class JerseyConnector implements OpenStackClientConnector { headers.add("Content-Type", "application/json"); } try { - ClientResponse response = null; + ClientResponse response; if (request.entity() != null && request.entity().getEntity() != null) { response = target.getHeadHandler().handle(new ClientRequestImpl(target.getURI(), request.method().name(), request.entity().getEntity(), headers)); } else { diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java index 7c8cdc6..18f0d84 100644 --- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java +++ b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java @@ -100,6 +100,7 @@ public class JerseyLoggingFilter extends ClientFilter { this.b = b; } + @Override public OutputStream adapt(ClientRequest request, OutputStream out) throws IOException { return new LoggingOutputStream(getAdapter().adapt(request, out), b); } @@ -292,4 +293,4 @@ public class JerseyLoggingFilter extends ClientFilter { entityString = entityString.replaceAll(PASSWORD_PATTERN, "\"password\" : \"******\""); b.append(entityString).append("\n"); } -} \ No newline at end of file +} diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyResponse.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyResponse.java index a2ca2c2..b6ccd04 100644 --- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyResponse.java +++ b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyResponse.java @@ -73,7 +73,7 @@ public class JerseyResponse implements OpenStackResponse { @Override public Map headers() { - Map headers = new HashMap(); + Map headers = new HashMap<>(); for(String k : response.getHeaders().keySet()) { headers.put(k, response.getHeaders().getFirst(k)); } diff --git a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java index 4add865..2ec564c 100644 --- a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java +++ b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java @@ -67,7 +67,7 @@ public class OpenStack { try { - SSLContext context = null; + SSLContext context; context = SSLContext.getInstance("SSL"); context.init(null, null, null); @@ -103,6 +103,7 @@ public class OpenStack { CLIENT.register(new JacksonFeature()).register(new ContextResolver() { + @Override public ObjectMapper getContext(Class type) { return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER; } @@ -111,6 +112,7 @@ public class OpenStack { CLIENT.register(new ClientRequestFilter() { + @Override public void filter(ClientRequestContext requestContext) throws IOException { requestContext.getHeaders().remove("Content-Language"); requestContext.getHeaders().remove("Content-Encoding"); -- cgit 1.2.3-korg