GUACAMOLE-220: Remove unnecessary explicit type parameters.

This commit is contained in:
Michael Jumper
2018-11-08 19:56:17 -08:00
parent a4d6f62df0
commit b355106c77
9 changed files with 12 additions and 12 deletions

View File

@@ -108,7 +108,7 @@ public class UserGroupService {
// Do not return any user groups if base DN is not specified // Do not return any user groups if base DN is not specified
String groupBaseDN = confService.getGroupBaseDN(); String groupBaseDN = confService.getGroupBaseDN();
if (groupBaseDN == null) if (groupBaseDN == null)
return Collections.<String, UserGroup>emptyMap(); return Collections.emptyMap();
// Retrieve all visible user groups which are not guacConfigGroups // Retrieve all visible user groups which are not guacConfigGroups
Collection<String> attributes = confService.getGroupNameAttributes(); Collection<String> attributes = confService.getGroupNameAttributes();
@@ -163,7 +163,7 @@ public class UserGroupService {
// Do not return any user groups if base DN is not specified // Do not return any user groups if base DN is not specified
String groupBaseDN = confService.getGroupBaseDN(); String groupBaseDN = confService.getGroupBaseDN();
if (groupBaseDN == null) if (groupBaseDN == null)
return Collections.<LDAPEntry>emptyList(); return Collections.emptyList();
// Get all groups the user is a member of starting at the groupBaseDN, // Get all groups the user is a member of starting at the groupBaseDN,
// excluding guacConfigGroups // excluding guacConfigGroups

View File

@@ -59,7 +59,7 @@ public abstract class AbstractUser extends AbstractIdentifiable
*/ */
@Override @Override
public Map<String, String> getAttributes() { public Map<String, String> getAttributes() {
return Collections.<String, String>emptyMap(); return Collections.emptyMap();
} }
/** /**
@@ -94,7 +94,7 @@ public abstract class AbstractUser extends AbstractIdentifiable
*/ */
@Override @Override
public List<ActivityRecord> getHistory() throws GuacamoleException { public List<ActivityRecord> getHistory() throws GuacamoleException {
return Collections.<ActivityRecord>emptyList(); return Collections.emptyList();
} }
/** /**

View File

@@ -39,7 +39,7 @@ public class AbstractUserGroup extends AbstractIdentifiable implements UserGroup
*/ */
@Override @Override
public Map<String, String> getAttributes() { public Map<String, String> getAttributes() {
return Collections.<String, String>emptyMap(); return Collections.emptyMap();
} }
/** /**

View File

@@ -84,7 +84,7 @@ public interface RelatedObjectSet {
@Override @Override
public Set<String> getObjects() throws GuacamoleException { public Set<String> getObjects() throws GuacamoleException {
return Collections.<String>emptySet(); return Collections.emptySet();
} }
@Override @Override

View File

@@ -155,13 +155,13 @@ public interface ObjectPermissionSet extends PermissionSet<ObjectPermission> {
@Override @Override
public Collection<String> getAccessibleObjects(Collection<ObjectPermission.Type> permissions, public Collection<String> getAccessibleObjects(Collection<ObjectPermission.Type> permissions,
Collection<String> identifiers) throws GuacamoleException { Collection<String> identifiers) throws GuacamoleException {
return Collections.<String>emptySet(); return Collections.emptySet();
} }
@Override @Override
public Set<ObjectPermission> getPermissions() public Set<ObjectPermission> getPermissions()
throws GuacamoleException { throws GuacamoleException {
return Collections.<ObjectPermission>emptySet(); return Collections.emptySet();
} }
@Override @Override

View File

@@ -110,7 +110,7 @@ public interface SystemPermissionSet extends PermissionSet<SystemPermission> {
@Override @Override
public Set<SystemPermission> getPermissions() public Set<SystemPermission> getPermissions()
throws GuacamoleException { throws GuacamoleException {
return Collections.<SystemPermission>emptySet(); return Collections.emptySet();
} }
@Override @Override

View File

@@ -38,7 +38,7 @@ public class SimpleObjectPermissionSet implements ObjectPermissionSet {
/** /**
* The set of all permissions currently granted. * 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 * Creates a new empty SimpleObjectPermissionSet. If you are not extending

View File

@@ -34,7 +34,7 @@ public class SimpleRelatedObjectSet implements RelatedObjectSet {
/** /**
* A set containing the identifiers of all objects currently present. * 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 * Creates a new empty SimpleRelatedObjectSet. If you are not extending

View File

@@ -35,7 +35,7 @@ public class SimpleSystemPermissionSet implements SystemPermissionSet {
/** /**
* The set of all permissions currently granted. * 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 * Creates a new empty SimpleSystemPermissionSet. If you are not extending