From 390c7a59ce5984ae87400558861e58a086841861 Mon Sep 17 00:00:00 2001 From: Jj! Date: Wed, 12 Dec 2018 12:21:04 -0600 Subject: [PATCH] [SHIBUI-1044] refactor cleanup --- .../ui/service/UsersCsvParserService.groovy | 59 ------------------- 1 file changed, 59 deletions(-) delete mode 100644 backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UsersCsvParserService.groovy diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UsersCsvParserService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UsersCsvParserService.groovy deleted file mode 100644 index d83692f50..000000000 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UsersCsvParserService.groovy +++ /dev/null @@ -1,59 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.service - -import edu.internet2.tier.shibboleth.admin.ui.security.model.Role -import edu.internet2.tier.shibboleth.admin.ui.security.model.User -import liquibase.util.StringUtils -import org.slf4j.Logger -import org.slf4j.LoggerFactory - -/** - * @author Bill Smith (wsmith@unicon.net) - */ -class UsersCsvParserService { - - private static final Logger logger = LoggerFactory.getLogger(UsersCsvParserService.class) - - //TODO: Is there a better, springy way to do this? - String getUsersCsvFilename() { - Properties properties = new Properties() - properties.load(getClass().classLoader.getResourceAsStream('application.properties')) - properties.get('bootstrap.users.csv.filename') - } - - List parseUsersFromCsv() { - def usersFilename = getUsersCsvFilename() - def users = null - if (StringUtils.isNotEmpty(usersFilename)) { - InputStream inputFile = getClass().classLoader.getResourceAsStream(usersFilename) - if (inputFile != null) { - List rows = inputFile.text.split('\n').collect { it.split(',') } - - rows.findAll { it.size() < 4 }.each { - logger.warn('Invalid entry detected in {} -> {}', usersFilename, it) - logger.warn('Entries are of the form: username,password,firstName,lastName[,role1,role2,...,roleN]') - } - users = rows.findAll { it.size() > 3 }.collect { row -> - new User().with { - username = row[0] - password = row[1] - firstName = row[2] - lastName = row[3] - roles = new HashSet() - (4..row.size() - 1).each { roleIndex -> - roles.add(new Role().with { - name = row[roleIndex] - it - }) - } - it - } - } - } else { - logger.error('The application.properties property [bootstrap.users.csv.filename] specifies a file [{}] that was not found.', usersFilename) - } - } else { - logger.info('No bootstrap.users.csv.filename specified in application.properties.') - } - users ?: new ArrayList() - } -} \ No newline at end of file