Replace type specification with operator "<>"

Issue-id: SO-224

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

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java
index ac10843..f68b2be 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java
@@ -61,7 +61,7 @@ public class ImageUpload {
         */
        public Map<String, Object> getProperties() {
                if(properties == null) {
-                       properties = new HashMap<String, Object>();
+                       properties = new HashMap<>();
                }
                return properties;
        }

diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java
index 2fa1535..724f6de 100644 (file)
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java
@@ -225,7 +225,7 @@ public class Stack {
        {
                try {
                        String s = mapper.writeValueAsString(_findOutputValue(key));
-                       return (mapper.readValue(s, type));
+                       return mapper.readValue(s, type);
                }
                catch (IOException e) {
                        return null;
@@ -233,7 +233,7 @@ public class Stack {
        }
        
        @JsonProperty("parameters")
-       private Map<String,Object> parameters = new HashMap<String,Object>();
+       private Map<String,Object> parameters = new HashMap<>();
        
        public void setParameters (Map<String,Object> params)
        {

diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
index 9fd4754..58c11e1 100644 (file)
--- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
+++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
@@ -55,6 +55,7 @@ public class RESTEasyConnector implements OpenStackClientConnector {
                        super();
 
                        addContextResolver(new ContextResolver<ObjectMapper>() {
+                               @Override
                                public ObjectMapper getContext(Class<?> type) {
                                        return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
                                }
@@ -95,6 +96,7 @@ public class RESTEasyConnector implements OpenStackClientConnector {
                providerFactory = new OpenStackProviderFactory();
        }
 
+       @Override
        public <T> OpenStackResponse request(OpenStackRequest<T> request) {
                ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + "/" + request.path()),
                                ClientRequest.getDefaultExecutor(), providerFactory);

diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java
index dc57d88..344317f 100644 (file)
--- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java
+++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java
@@ -62,7 +62,7 @@ public class RESTEasyResponse implements OpenStackResponse {
 
     @Override
     public Map<String, String> headers() {
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
         MultivaluedMap<String, Object> responseHeaders = response.getHeaders();
 
         for (String key : responseHeaders.keySet()) {