From 711bd31aa99ea5196c73261d532aac2c6a24b89e Mon Sep 17 00:00:00 2001
From: rama-huawei <rama.subba.reddy.s@huawei.com>
Date: Thu, 19 Oct 2017 11:11:24 +0530
Subject: Replace type specification with operator ("<>")

Issue-id: SO-227

Change-Id: I8d7dfee85cee23afeecac42aa8b89f40989b3706
Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>
---
 .../main/java/com/woorea/openstack/connector/HttpClientConnector.java | 1 +
 .../java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java  | 2 +-
 .../src/main/java/com/woorea/openstack/quantum/model/Network.java     | 2 +-
 .../java/com/woorea/openstack/quantum/model/NetworkForCreate.java     | 3 +++
 .../src/main/java/com/woorea/openstack/quantum/model/Networks.java    | 4 ++--
 .../src/main/java/com/woorea/openstack/quantum/model/Routers.java     | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java
index dc03f9e..84fe882 100644
--- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java
+++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java
@@ -104,6 +104,7 @@ public class HttpClientConnector implements OpenStackClientConnector {
 		return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
 	}
 
+	@Override
 	public <T> OpenStackResponse request(OpenStackRequest<T> request) {
 		
 		CloseableHttpClient httpClient = null; //HttpClients.createDefault();
diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java
index 90f5bb5..2511b0c 100644
--- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java
+++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java
@@ -62,7 +62,7 @@ public class AbsOpenStackCmd<T> extends OpenStackRequest<T> {
 
 	private Map<String, String> getObjectParamMap(T target)
 	{
-		Map<String, String> resultMap = new HashMap<String, String>();
+		Map<String, String> resultMap = new HashMap<>();
 		if (target == null)
 			return resultMap;
 
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java
index 29870a3..6c21b00 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java
@@ -319,7 +319,7 @@ public class Network implements Serializable {
      */
     @Override
     public String toString() {
-    	StringBuffer buf = new StringBuffer("Network [id=" + id + ", name=" + name + ", subnets="
+    	StringBuilder buf = new StringBuilder("Network [id=" + id + ", name=" + name + ", subnets="
                 + subnets + ", status=" + status + ", admin_state_up=" + adminStateUp + ", tenant_id=" +
                 tenantId + ", shared=" + shared + ", router:external=" + routerExternal);
     	if (getNetworkType() == NetworkType.PROVIDER)
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java
index 1a2bb67..d5f3393 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java
@@ -18,6 +18,9 @@ package com.woorea.openstack.quantum.model;
 
 import org.codehaus.jackson.map.annotate.JsonRootName;
 
+/**
+ * @deprecated
+ */
 @SuppressWarnings("serial")
 @JsonRootName("network")
 @Deprecated
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java
index 88e72e6..84e45ca 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java
@@ -41,12 +41,12 @@ public class Networks implements Iterable<Network>, Serializable{
 		this.list = list;
 	}
 
-
+	@Override
 	public String toString() {
 		return "Networks [list=" + list + "]";
 	}
 
-
+	@Override
 	public Iterator<Network> iterator() {
 		return list.iterator();
 	}
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java
index a2dbd8e..038bdb4 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java
@@ -41,12 +41,12 @@ public class Routers implements Iterable<Router>, Serializable{
 		this.list = list;
 	}
 
-
+	@Override
 	public String toString() {
 		return "Routers [list=" + list + "]";
 	}
 
-
+	@Override
 	public Iterator<Router> iterator() {
 		return list.iterator();
 	}
-- 
cgit 1.2.3-korg