Merge "Replace type specification with operator ("<>")"

7 files changed, 14 insertions, 14 deletions

diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java
index 76ebb4c..af0f7e1 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java
@@ -30,11 +30,11 @@ public class DomainUserRolesResource extends GenericResource<Role, Roles> {
 	}
 
 	public OpenStackRequest<Void> add(String roleId) {
-		return new OpenStackRequest<Void>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
 	}
 	
 	public OpenStackRequest<Void> remove(String roleId) {
-		return new OpenStackRequest<Void>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class);
 	}
 
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java
index b353816..30c915c 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java
@@ -38,23 +38,23 @@ public class GenericResource<One, Many> {
 	}
 	
 	public OpenStackRequest<Many> list() {
-		return new OpenStackRequest<Many>(CLIENT, HttpMethod.GET, path, null, manyClass);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.GET, path, null, manyClass);
 	}
 	
 	public OpenStackRequest<One> create(One one) {
-		return new OpenStackRequest<One>(CLIENT, HttpMethod.POST, path, Entity.json(one), oneClass);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.POST, path, Entity.json(one), oneClass);
 	}
 	
 	public OpenStackRequest<One> show(String id) {
-		return new OpenStackRequest<One>(CLIENT, HttpMethod.GET, new StringBuilder(path).append("/").append(id).toString(), null, oneClass);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.GET, new StringBuilder(path).append("/").append(id).toString(), null, oneClass);
 	}
 	
 	public OpenStackRequest<One> update(String id, One one) {
-		return new OpenStackRequest<One>(CLIENT, HttpMethod.PATCH, new StringBuilder(path).append("/").append(id).toString(), Entity.json(one), oneClass);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.PATCH, new StringBuilder(path).append("/").append(id).toString(), Entity.json(one), oneClass);
 	}
 	
 	public OpenStackRequest<One> delete(String id) {
-		return new OpenStackRequest<One>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(id).toString(), null, oneClass);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(id).toString(), null, oneClass);
 	}
 	
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java
index 758d3c3..9902826 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java
@@ -33,11 +33,11 @@ public class ProjectRolesResource {
 	}
 	
 	public OpenStackRequest<Void> add(String roleId) {
-		return new OpenStackRequest<Void>(CLIENT, HttpMethod.PUT, new StringBuilder(PATH).append("/").append(roleId).toString(), Entity.json(""), Void.class);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(PATH).append("/").append(roleId).toString(), Entity.json(""), Void.class);
 	}
 	
 	public OpenStackRequest<Void> remove(String roleId) {
-		return new OpenStackRequest<Void>(CLIENT, HttpMethod.DELETE, new StringBuilder(PATH).append("/").append(roleId).toString(), null, Void.class);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(PATH).append("/").append(roleId).toString(), null, Void.class);
 	}
 
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java
index c9e9d65..255dfc1 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java
@@ -30,11 +30,11 @@ public class ProjectUserRolesResource extends GenericResource<Role, Roles> {
 	}
 	
 	public OpenStackRequest<Void> add(String roleId) {
-		return new OpenStackRequest<Void>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
 	}
 	
 	public OpenStackRequest<Void> remove(String roleId) {
-		return new OpenStackRequest<Void>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class);
+		return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class);
 	}
 
 }
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
index b6bb9fc..66d2854 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java
@@ -59,7 +59,7 @@ public class Authentication implements Serializable {
 			return identity;
 		}
 		
-		private List<String> methods = new ArrayList<String>();
+		private List<String> methods = new ArrayList<>();
 		
 		public static final class Password {
 			
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
index 782e209..b3fc00f 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java
@@ -32,7 +32,7 @@ public class Credential {
 	
 	private String userId;
 	
-	private Map<String, String> blob = new HashMap<String, String>();
+	private Map<String, String> blob = new HashMap<>();
 
 	public String getId() {
 		return id;
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java
index 1345ac2..f14a004 100644
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java
+++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java
@@ -32,7 +32,7 @@ public class Policy {
 	
 	private String userId;
 	
-	private Map<String, String> blob = new HashMap<String, String>();
+	private Map<String, String> blob = new HashMap<>();
 
 	public String getId() {
 		return id;