GUACAMOLE-220: Remove unnecessary explicit type parameters.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/b355106c Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/b355106c Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/b355106c Branch: refs/heads/staging/1.0.0 Commit: b355106c77387973842cd4122d62201eaa22a7dd Parents: a4d6f62 Author: Michael Jumper <[email protected]> Authored: Thu Nov 8 19:56:17 2018 -0800 Committer: Michael Jumper <[email protected]> Committed: Thu Nov 8 20:11:17 2018 -0800 ---------------------------------------------------------------------- .../org/apache/guacamole/auth/ldap/group/UserGroupService.java | 4 ++-- .../main/java/org/apache/guacamole/net/auth/AbstractUser.java | 4 ++-- .../java/org/apache/guacamole/net/auth/AbstractUserGroup.java | 2 +- .../java/org/apache/guacamole/net/auth/RelatedObjectSet.java | 2 +- .../guacamole/net/auth/permission/ObjectPermissionSet.java | 4 ++-- .../guacamole/net/auth/permission/SystemPermissionSet.java | 2 +- .../guacamole/net/auth/simple/SimpleObjectPermissionSet.java | 2 +- .../apache/guacamole/net/auth/simple/SimpleRelatedObjectSet.java | 2 +- .../guacamole/net/auth/simple/SimpleSystemPermissionSet.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java index fbfeaaf..14cfd8e 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java @@ -108,7 +108,7 @@ public class UserGroupService { // Do not return any user groups if base DN is not specified String groupBaseDN = confService.getGroupBaseDN(); if (groupBaseDN == null) - return Collections.<String, UserGroup>emptyMap(); + return Collections.emptyMap(); // Retrieve all visible user groups which are not guacConfigGroups Collection<String> attributes = confService.getGroupNameAttributes(); @@ -163,7 +163,7 @@ public class UserGroupService { // Do not return any user groups if base DN is not specified String groupBaseDN = confService.getGroupBaseDN(); if (groupBaseDN == null) - return Collections.<LDAPEntry>emptyList(); + return Collections.emptyList(); // Get all groups the user is a member of starting at the groupBaseDN, // excluding guacConfigGroups http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java index 0a1acbf..b502f7a 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java @@ -59,7 +59,7 @@ public abstract class AbstractUser extends AbstractIdentifiable */ @Override public Map<String, String> getAttributes() { - return Collections.<String, String>emptyMap(); + return Collections.emptyMap(); } /** @@ -94,7 +94,7 @@ public abstract class AbstractUser extends AbstractIdentifiable */ @Override public List<ActivityRecord> getHistory() throws GuacamoleException { - return Collections.<ActivityRecord>emptyList(); + return Collections.emptyList(); } /** http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUserGroup.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUserGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUserGroup.java index 725984d..f63bfae 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUserGroup.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUserGroup.java @@ -39,7 +39,7 @@ public class AbstractUserGroup extends AbstractIdentifiable implements UserGroup */ @Override public Map<String, String> getAttributes() { - return Collections.<String, String>emptyMap(); + return Collections.emptyMap(); } /** http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/RelatedObjectSet.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/RelatedObjectSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/RelatedObjectSet.java index f49876d..05f4c24 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/RelatedObjectSet.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/RelatedObjectSet.java @@ -84,7 +84,7 @@ public interface RelatedObjectSet { @Override public Set<String> getObjects() throws GuacamoleException { - return Collections.<String>emptySet(); + return Collections.emptySet(); } @Override http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java index d9ce666..638f952 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java @@ -155,13 +155,13 @@ public interface ObjectPermissionSet extends PermissionSet<ObjectPermission> { @Override public Collection<String> getAccessibleObjects(Collection<ObjectPermission.Type> permissions, Collection<String> identifiers) throws GuacamoleException { - return Collections.<String>emptySet(); + return Collections.emptySet(); } @Override public Set<ObjectPermission> getPermissions() throws GuacamoleException { - return Collections.<ObjectPermission>emptySet(); + return Collections.emptySet(); } @Override http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java index b58baa6..52b62cd 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java @@ -110,7 +110,7 @@ public interface SystemPermissionSet extends PermissionSet<SystemPermission> { @Override public Set<SystemPermission> getPermissions() throws GuacamoleException { - return Collections.<SystemPermission>emptySet(); + return Collections.emptySet(); } @Override http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java index 1fd9ac7..cbb298e 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java @@ -38,7 +38,7 @@ public class SimpleObjectPermissionSet implements ObjectPermissionSet { /** * The set of all permissions currently granted. */ - private Set<ObjectPermission> permissions = Collections.<ObjectPermission>emptySet(); + private Set<ObjectPermission> permissions = Collections.emptySet(); /** * Creates a new empty SimpleObjectPermissionSet. If you are not extending http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleRelatedObjectSet.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleRelatedObjectSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleRelatedObjectSet.java index e1352cd..3796c43 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleRelatedObjectSet.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleRelatedObjectSet.java @@ -34,7 +34,7 @@ public class SimpleRelatedObjectSet implements RelatedObjectSet { /** * A set containing the identifiers of all objects currently present. */ - private Set<String> identifiers = Collections.<String>emptySet(); + private Set<String> identifiers = Collections.emptySet(); /** * Creates a new empty SimpleRelatedObjectSet. If you are not extending http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b355106c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java index dd0479b..24c6d2d 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java @@ -35,7 +35,7 @@ public class SimpleSystemPermissionSet implements SystemPermissionSet { /** * The set of all permissions currently granted. */ - private Set<SystemPermission> permissions = Collections.<SystemPermission>emptySet(); + private Set<SystemPermission> permissions = Collections.emptySet(); /** * Creates a new empty SimpleSystemPermissionSet. If you are not extending
