diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java index be51362609..7f0fd34e13 100644 --- a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java @@ -79,10 +79,10 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB @Override public void afterPropertiesSet() throws Exception { - String publicPermissionFilters = configurationService.getProperty("filter.org.dspace.app.mediafilter.publicPermission"); + String[] publicPermissionFilters = configurationService.getArrayProperty("filter.org.dspace.app.mediafilter.publicPermission"); + if(publicPermissionFilters != null) { - String[] publicPermisionFiltersArray = publicPermissionFilters.split(","); - for(String filter : publicPermisionFiltersArray) { + for(String filter : publicPermissionFilters) { publicFiltersClasses.add(filter.trim()); } } diff --git a/dspace-api/src/main/java/org/dspace/embargo/DayTableEmbargoSetter.java b/dspace-api/src/main/java/org/dspace/embargo/DayTableEmbargoSetter.java index d74831353b..6353ad97d5 100644 --- a/dspace-api/src/main/java/org/dspace/embargo/DayTableEmbargoSetter.java +++ b/dspace-api/src/main/java/org/dspace/embargo/DayTableEmbargoSetter.java @@ -77,9 +77,10 @@ public class DayTableEmbargoSetter extends DefaultEmbargoSetter { Properties termProps = new Properties(); - String terms = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("embargo.terms.days"); - if (terms != null && terms.length() > 0) { - for (String term : terms.split(",")) { + String terms[] = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("embargo.terms.days"); + + if (terms != null) { + for (String term : terms) { String[] parts = term.trim().split(":"); termProps.setProperty(parts[0].trim(), parts[1].trim()); } diff --git a/dspace-api/src/main/java/org/dspace/rdf/RDFConfiguration.java b/dspace-api/src/main/java/org/dspace/rdf/RDFConfiguration.java index 0220e43403..1864f25f11 100644 --- a/dspace-api/src/main/java/org/dspace/rdf/RDFConfiguration.java +++ b/dspace-api/src/main/java/org/dspace/rdf/RDFConfiguration.java @@ -115,15 +115,14 @@ public class RDFConfiguration { public static String[] getDSOTypesToConvert() { - String dsoTypes = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty( - CONVERTER_DSOTYPES_KEY); - if (StringUtils.isEmpty(dsoTypes)) + String[] dsoTypes = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty(CONVERTER_DSOTYPES_KEY); + if (dsoTypes == null) { log.warn("Property rdf." + CONVERTER_DSOTYPES_KEY + " was not found " + "or is empty. Will convert all type of DSpace Objects."); return Constants.typeText; } - return dsoTypes.split(",\\s*"); + return dsoTypes; } public static boolean isConvertType(int type) diff --git a/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java b/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java index a4e6187f7f..6a5dc1de74 100644 --- a/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java +++ b/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java @@ -108,12 +108,11 @@ public class EmailServiceImpl } // Set extra configuration properties - String extras = cfg.getProperty("mail.extraproperties"); - if ((extras != null) && (!"".equals(extras.trim()))) + String[] extras = cfg.getArrayProperty("mail.extraproperties"); + if (extras != null) { - String arguments[] = extras.split(","); String key, value; - for (String argument : arguments) + for (String argument : extras) { key = argument.substring(0, argument.indexOf('=')).trim(); value = argument.substring(argument.indexOf('=') + 1).trim(); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowCurationUtils.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowCurationUtils.java index 7f25c7cd35..9fcc5263d0 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowCurationUtils.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowCurationUtils.java @@ -152,8 +152,8 @@ public class FlowCurationUtils */ protected static String getUITaskName(String taskID) { - String tasksString = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("curate.ui.tasknames"); - String[] tasks = tasksString.split(","); + String[] tasks = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("curate.ui.tasknames"); + for (String task : tasks) { //retrieve keyValuePair (format [taskID]=[UI Task Name]) diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java index 7c14693a61..e6c26ece01 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java @@ -153,10 +153,10 @@ public class CollectionViewer extends AbstractDSpaceTransformer implements Cache HandleUtil.buildHandleTrail(context, collection,pageMeta,contextPath); // Add RSS links if available - String formats = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("webui.feed.formats"); + String[] formats = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("webui.feed.formats"); if ( formats != null ) { - for (String format : formats.split(",")) + for (String format : formats) { // Remove the protocol number, i.e. just list 'rss' or' atom' String[] parts = format.split("_"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java index fba9856805..04338729b0 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java @@ -198,10 +198,10 @@ public class CommunityViewer extends AbstractDSpaceTransformer implements Cachea HandleUtil.buildHandleTrail(context, community, pageMeta,contextPath); // Add RSS links if available - String formats = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("webui.feed.formats"); + String[] formats = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("webui.feed.formats"); if ( formats != null ) { - for (String format : formats.split(",")) + for (String format : formats) { // Remove the protocol number, i.e. just list 'rss' or' atom' String[] parts = format.split("_"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageFeeds.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageFeeds.java index 2c031f5ec5..fb1b5deac5 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageFeeds.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageFeeds.java @@ -65,10 +65,10 @@ public class FrontPageFeeds extends AbstractDSpaceTransformer implements Cacheab pageMeta.addTrailLink(contextPath, T_dspace_home); // Add RSS links if available - String formats = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("webui.feed.formats"); + String[] formats = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("webui.feed.formats"); if ( formats != null ) { - for (String format : formats.split(",")) + for (String format : formats) { // Remove the protocol number, i.e. just list 'rss' or' atom' String[] parts = format.split("_"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java index 9a00588077..6d428ab95a 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java @@ -52,17 +52,15 @@ public class SendFeedbackAction extends AbstractAction String fromPage = request.getHeader("Referer"); // Prevent spammers and splogbots from poisoning the feedback page String host = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("dspace.hostname"); - String allowedReferrersString = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("mail.allowed.referrers"); + String[] allowedReferrers = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("mail.allowed.referrers"); - String[] allowedReferrersSplit = null; boolean validReferral = false; - if((allowedReferrersString != null) && (allowedReferrersString.length() > 0)) + if(allowedReferrers != null) { - allowedReferrersSplit = allowedReferrersString.trim().split("\\s*,\\s*"); - for(int i = 0; i < allowedReferrersSplit.length; i++) + for(String allowedReferrer : allowedReferrers) { - if(fromPage.indexOf(allowedReferrersSplit[i]) != -1) + if(fromPage.contains(allowedReferrer)) { validReferral = true; break; diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java index 337c86beba..2c956a608e 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java @@ -170,10 +170,10 @@ public class CollectionSearch extends AbstractDSpaceTransformer implements Cache HandleUtil.buildHandleTrail(context, collection,pageMeta,contextPath); // Add RSS links if available - String formats = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("webui.feed.formats"); + String[] formats = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("webui.feed.formats"); if ( formats != null ) { - for (String format : formats.split(",")) + for (String format : formats) { // Remove the protocol number, i.e. just list 'rss' or' atom' String[] parts = format.split("_"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteViewer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteViewer.java index c597f4659b..93f49f40ee 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteViewer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteViewer.java @@ -65,10 +65,10 @@ public class SiteViewer extends AbstractDSpaceTransformer implements CacheablePr pageMeta.addTrailLink(contextPath, T_dspace_home); // Add RSS links if available - String formats = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("webui.feed.formats"); + String[] formats = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("webui.feed.formats"); if ( formats != null ) { - for (String format : formats.split(",")) + for (String format : formats) { // Remove the protocol number, i.e. just list 'rss' or' atom' String[] parts = format.split("_"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/recentSubmissions/RecentSubmissionTransformer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/recentSubmissions/RecentSubmissionTransformer.java index c255568390..45c66d0865 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/recentSubmissions/RecentSubmissionTransformer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/recentSubmissions/RecentSubmissionTransformer.java @@ -94,10 +94,10 @@ public class RecentSubmissionTransformer extends AbstractDSpaceTransformer { if(isHomePage) { // Add RSS links if available - String formats = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("webui.feed.formats"); + String[] formats = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("webui.feed.formats"); if ( formats != null ) { - for (String format : formats.split(",")) + for (String format : formats) { // Remove the protocol number, i.e. just list 'rss' or' atom' String[] parts = format.split("_"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/handle/HandleResolverReader.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/handle/HandleResolverReader.java index 359507726e..3ebbb2d76f 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/handle/HandleResolverReader.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/handle/HandleResolverReader.java @@ -107,11 +107,10 @@ public class HandleResolverReader extends AbstractReader implements Recyclable { { List prefixes = new ArrayList(); prefixes.add(handleService.getPrefix()); - String additionalPrefixes = DSpaceServicesFactory.getInstance().getConfigurationService() - .getProperty("handle.additional.prefixes"); - if (StringUtils.isNotBlank(additionalPrefixes)) + String[] additionalPrefixes = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("handle.additional.prefixes"); + if (additionalPrefixes != null) { - for (String apref : additionalPrefixes.split(",")) + for (String apref : additionalPrefixes) { prefixes.add(apref.trim()); } diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/JSONLookupSearcher.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/JSONLookupSearcher.java index c2887b332f..de102f903d 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/JSONLookupSearcher.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/JSONLookupSearcher.java @@ -163,7 +163,7 @@ public class JSONLookupSearcher extends AbstractGenerator { public String getLookupURI() { if(lookupURI ==null){ - lookupURI = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("publication-lookup.ublication.url"); + lookupURI = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("publication-lookup.publication.url"); } return lookupURI; }