Fix checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/171a1446 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/171a1446 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/171a1446 Branch: refs/heads/master Commit: 171a14464075705b04494ea594f14e41d92bee4c Parents: e7d9881 Author: Kishor Patil <[email protected]> Authored: Mon Oct 30 13:05:18 2017 -0400 Committer: Kishor Patil <[email protected]> Committed: Mon Oct 30 13:05:18 2017 -0400 ---------------------------------------------------------------------- .../storm/blobstore/BlobStoreAclHandler.java | 34 +++++------ .../storm/security/auth/FixedGroupsMapping.java | 61 ++++++++++---------- 2 files changed, 48 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/171a1446/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java index f65541e..6af6064 100644 --- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java +++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java @@ -47,7 +47,7 @@ import java.util.Set; public class BlobStoreAclHandler { public static final Logger LOG = LoggerFactory.getLogger(BlobStoreAclHandler.class); private final IPrincipalToLocal _ptol; - private final IGroupMappingServiceProvider _groupMappingProvider; + private final IGroupMappingServiceProvider groupMappingServiceProvider; public static final int READ = 0x01; public static final int WRITE = 0x02; @@ -55,29 +55,29 @@ public class BlobStoreAclHandler { public static final List<AccessControl> WORLD_EVERYTHING = Arrays.asList(new AccessControl(AccessControlType.OTHER, READ | WRITE | ADMIN)); public static final List<AccessControl> DEFAULT = new ArrayList<AccessControl>(); - private Set<String> _supervisors; - private Set<String> _admins; - private Set<String> _adminsGroups; + private Set<String> supervisors; + private Set<String> admins; + private Set<String> adminsGroups; private boolean doAclValidation; public BlobStoreAclHandler(Map<String, Object> conf) { _ptol = AuthUtils.GetPrincipalToLocalPlugin(conf); if (conf.get(Config.STORM_GROUP_MAPPING_SERVICE_PROVIDER_PLUGIN) != null) { - _groupMappingProvider = AuthUtils.GetGroupMappingServiceProviderPlugin(conf); + groupMappingServiceProvider = AuthUtils.GetGroupMappingServiceProviderPlugin(conf); } else { - _groupMappingProvider = null; + groupMappingServiceProvider = null; } - _supervisors = new HashSet<String>(); - _admins = new HashSet<String>(); - _adminsGroups = new HashSet<>(); + supervisors = new HashSet<String>(); + admins = new HashSet<String>(); + adminsGroups = new HashSet<>(); if (conf.containsKey(Config.NIMBUS_SUPERVISOR_USERS)) { - _supervisors.addAll((List<String>)conf.get(Config.NIMBUS_SUPERVISOR_USERS)); + supervisors.addAll((List<String>)conf.get(Config.NIMBUS_SUPERVISOR_USERS)); } if (conf.containsKey(Config.NIMBUS_ADMINS)) { - _admins.addAll((List<String>)conf.get(Config.NIMBUS_ADMINS)); + admins.addAll((List<String>)conf.get(Config.NIMBUS_ADMINS)); } if (conf.containsKey(Config.NIMBUS_ADMINS_GROUPS)) { - _adminsGroups.addAll((List<String>)conf.get(Config.NIMBUS_ADMINS_GROUPS)); + adminsGroups.addAll((List<String>)conf.get(Config.NIMBUS_ADMINS_GROUPS)); } if (conf.containsKey(Config.STORM_BLOBSTORE_ACL_VALIDATION_ENABLED)) { doAclValidation = (boolean)conf.get(Config.STORM_BLOBSTORE_ACL_VALIDATION_ENABLED); @@ -197,19 +197,19 @@ public class BlobStoreAclHandler { private boolean isAdmin(Subject who) { Set<String> user = constructUserFromPrincipals(who); for (String u : user) { - if (_admins.contains(u)) { + if (admins.contains(u)) { return true; } - if (_adminsGroups.size() > 0 && _groupMappingProvider != null) { + if (adminsGroups.size() > 0 && groupMappingServiceProvider != null) { Set<String> userGroups = null; try { - userGroups = _groupMappingProvider.getGroups(u); + userGroups = groupMappingServiceProvider.getGroups(u); } catch (IOException e) { LOG.warn("Error while trying to fetch user groups", e); } if (userGroups != null) { for (String tgroup : userGroups) { - if (_adminsGroups.contains(tgroup)) { + if (adminsGroups.contains(tgroup)) { return true; } } @@ -230,7 +230,7 @@ public class BlobStoreAclHandler { Set<String> user = constructUserFromPrincipals(who); if (isReadOperation(operation)) { for (String u : user) { - if (_supervisors.contains(u)) { + if (supervisors.contains(u)) { return true; } } http://git-wip-us.apache.org/repos/asf/storm/blob/171a1446/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java b/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java index 4956b39..62f1d9b 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java @@ -31,38 +31,39 @@ import org.slf4j.LoggerFactory; public class FixedGroupsMapping implements IGroupMappingServiceProvider { - public static Logger LOG = LoggerFactory.getLogger(FixedGroupsMapping.class); - public static final String STORM_FIXED_GROUP_MAPPING = "storm.fixed.group.mapping"; - public Map<String, Set<String>> cachedGroups = new HashMap<String, Set<String>>(); + public static Logger LOG = LoggerFactory.getLogger(FixedGroupsMapping.class); + public static final String STORM_FIXED_GROUP_MAPPING = "storm.fixed.group.mapping"; + public Map<String, Set<String>> cachedGroups = new HashMap<String, Set<String>>(); - /** - * Invoked once immediately after construction - * @param storm_conf Storm configuration - */ - @Override - public void prepare(Map storm_conf) { - Map<?, ?> params = (Map<?, ?>) storm_conf.get(Config.STORM_GROUP_MAPPING_SERVICE_PARAMS); - Map<String, Set<String>> mapping = (Map<String, Set<String>>) params.get(STORM_FIXED_GROUP_MAPPING); - if (mapping != null) { - cachedGroups.putAll(mapping); - } else { - LOG.warn("There is no initial group mapping"); + /** + * Invoked once immediately after construction + * + * @param storm_conf Storm configuration + */ + @Override + public void prepare(Map storm_conf) { + Map<?, ?> params = (Map<?, ?>) storm_conf.get(Config.STORM_GROUP_MAPPING_SERVICE_PARAMS); + Map<String, Set<String>> mapping = (Map<String, Set<String>>) params.get(STORM_FIXED_GROUP_MAPPING); + if (mapping != null) { + cachedGroups.putAll(mapping); + } else { + LOG.warn("There is no initial group mapping"); + } } - } - /** - * Returns list of groups for a user - * - * @param user get groups for this user - * @return list of groups for a given user - */ - @Override - public Set<String> getGroups(String user) throws IOException { - if (cachedGroups.containsKey(user)) { - return cachedGroups.get(user); - } + /** + * Returns list of groups for a user + * + * @param user get groups for this user + * @return list of groups for a given user + */ + @Override + public Set<String> getGroups(String user) throws IOException { + if (cachedGroups.containsKey(user)) { + return cachedGroups.get(user); + } - // I don't have anything - return new HashSet<String>(); - } + // I don't have anything + return new HashSet<String>(); + } }
