hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3059 Replacing getProperty with getArrayProperty

Browse Source
This commit is contained in:
Bram Luyten
2016-02-20 18:16:18 +01:00
parent 0b80302624
commit 3a9cfbb46c
14 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java
View File

@@ -79,10 +79,10 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
@Override @Override
public void afterPropertiesSet() throws Exception { 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) { if(publicPermissionFilters != null) {
String[] publicPermisionFiltersArray = publicPermissionFilters.split(","); for(String filter : publicPermissionFilters) {
for(String filter : publicPermisionFiltersArray) {
publicFiltersClasses.add(filter.trim()); publicFiltersClasses.add(filter.trim());
} }
} }

7
dspace-api/src/main/java/org/dspace/embargo/DayTableEmbargoSetter.java
View File

@@ -77,9 +77,10 @@ public class DayTableEmbargoSetter extends DefaultEmbargoSetter
{ {
Properties termProps = new Properties(); Properties termProps = new Properties();
String terms = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("embargo.terms.days"); String terms[] = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("embargo.terms.days");
if (terms != null && terms.length() > 0) {
for (String term : terms.split(",")) { if (terms != null) {
for (String term : terms) {
String[] parts = term.trim().split(":"); String[] parts = term.trim().split(":");
termProps.setProperty(parts[0].trim(), parts[1].trim()); termProps.setProperty(parts[0].trim(), parts[1].trim());
} }

7
dspace-api/src/main/java/org/dspace/rdf/RDFConfiguration.java
View File

@@ -115,15 +115,14 @@ public class RDFConfiguration {
public static String[] getDSOTypesToConvert() public static String[] getDSOTypesToConvert()
{ {
String dsoTypes = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty( String[] dsoTypes = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty(CONVERTER_DSOTYPES_KEY);
CONVERTER_DSOTYPES_KEY); if (dsoTypes == null)
if (StringUtils.isEmpty(dsoTypes))
{ {
log.warn("Property rdf." + CONVERTER_DSOTYPES_KEY + " was not found " log.warn("Property rdf." + CONVERTER_DSOTYPES_KEY + " was not found "
+ "or is empty. Will convert all type of DSpace Objects."); + "or is empty. Will convert all type of DSpace Objects.");
return Constants.typeText; return Constants.typeText;
} }
return dsoTypes.split(",\\s*"); return dsoTypes;
} }
public static boolean isConvertType(int type) public static boolean isConvertType(int type)

7
dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java
View File

@@ -108,12 +108,11 @@ public class EmailServiceImpl
} }
// Set extra configuration properties // Set extra configuration properties
String extras = cfg.getProperty("mail.extraproperties"); String[] extras = cfg.getArrayProperty("mail.extraproperties");
if ((extras != null) && (!"".equals(extras.trim()))) if (extras != null)
{ {
String arguments[] = extras.split(",");
String key, value; String key, value;
for (String argument : arguments) for (String argument : extras)
{ {
key = argument.substring(0, argument.indexOf('=')).trim(); key = argument.substring(0, argument.indexOf('=')).trim();
value = argument.substring(argument.indexOf('=') + 1).trim(); value = argument.substring(argument.indexOf('=') + 1).trim();

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowCurationUtils.java
View File

@@ -152,8 +152,8 @@ public class FlowCurationUtils
*/ */
protected static String getUITaskName(String taskID) protected static String getUITaskName(String taskID)
{ {
String tasksString = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("curate.ui.tasknames"); String[] tasks = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("curate.ui.tasknames");
String[] tasks = tasksString.split(",");
for (String task : tasks) for (String task : tasks)
{ {
//retrieve keyValuePair (format [taskID]=[UI Task Name]) //retrieve keyValuePair (format [taskID]=[UI Task Name])

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
View File

@@ -153,10 +153,10 @@ public class CollectionViewer extends AbstractDSpaceTransformer implements Cache
HandleUtil.buildHandleTrail(context, collection,pageMeta,contextPath); HandleUtil.buildHandleTrail(context, collection,pageMeta,contextPath);
// Add RSS links if available // 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 ) if ( formats != null )
{ {
for (String format : formats.split(",")) for (String format : formats)
{ {
// Remove the protocol number, i.e. just list 'rss' or' atom' // Remove the protocol number, i.e. just list 'rss' or' atom'
String[] parts = format.split("_"); String[] parts = format.split("_");

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
View File

@@ -198,10 +198,10 @@ public class CommunityViewer extends AbstractDSpaceTransformer implements Cachea
HandleUtil.buildHandleTrail(context, community, pageMeta,contextPath); HandleUtil.buildHandleTrail(context, community, pageMeta,contextPath);
// Add RSS links if available // 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 ) if ( formats != null )
{ {
for (String format : formats.split(",")) for (String format : formats)
{ {
// Remove the protocol number, i.e. just list 'rss' or' atom' // Remove the protocol number, i.e. just list 'rss' or' atom'
String[] parts = format.split("_"); String[] parts = format.split("_");

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageFeeds.java
View File

@@ -65,10 +65,10 @@ public class FrontPageFeeds extends AbstractDSpaceTransformer implements Cacheab
pageMeta.addTrailLink(contextPath, T_dspace_home); pageMeta.addTrailLink(contextPath, T_dspace_home);
// Add RSS links if available // 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 ) if ( formats != null )
{ {
for (String format : formats.split(",")) for (String format : formats)
{ {
// Remove the protocol number, i.e. just list 'rss' or' atom' // Remove the protocol number, i.e. just list 'rss' or' atom'
String[] parts = format.split("_"); String[] parts = format.split("_");

10
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java
View File

@@ -52,17 +52,15 @@ public class SendFeedbackAction extends AbstractAction
String fromPage = request.getHeader("Referer"); String fromPage = request.getHeader("Referer");
// Prevent spammers and splogbots from poisoning the feedback page // Prevent spammers and splogbots from poisoning the feedback page
String host = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("dspace.hostname"); 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; boolean validReferral = false;
if((allowedReferrersString != null) && (allowedReferrersString.length() > 0)) if(allowedReferrers != null)
{ {
allowedReferrersSplit = allowedReferrersString.trim().split("\\s*,\\s*"); for(String allowedReferrer : allowedReferrers)
for(int i = 0; i < allowedReferrersSplit.length; i++)
{ {
if(fromPage.indexOf(allowedReferrersSplit[i]) != -1) if(fromPage.contains(allowedReferrer))
{ {
validReferral = true; validReferral = true;
break; break;

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java
View File

@@ -170,10 +170,10 @@ public class CollectionSearch extends AbstractDSpaceTransformer implements Cache
HandleUtil.buildHandleTrail(context, collection,pageMeta,contextPath); HandleUtil.buildHandleTrail(context, collection,pageMeta,contextPath);
// Add RSS links if available // 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 ) if ( formats != null )
{ {
for (String format : formats.split(",")) for (String format : formats)
{ {
// Remove the protocol number, i.e. just list 'rss' or' atom' // Remove the protocol number, i.e. just list 'rss' or' atom'
String[] parts = format.split("_"); String[] parts = format.split("_");

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteViewer.java
View File

@@ -65,10 +65,10 @@ public class SiteViewer extends AbstractDSpaceTransformer implements CacheablePr
pageMeta.addTrailLink(contextPath, T_dspace_home); pageMeta.addTrailLink(contextPath, T_dspace_home);
// Add RSS links if available // 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 ) if ( formats != null )
{ {
for (String format : formats.split(",")) for (String format : formats)
{ {
// Remove the protocol number, i.e. just list 'rss' or' atom' // Remove the protocol number, i.e. just list 'rss' or' atom'
String[] parts = format.split("_"); String[] parts = format.split("_");

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/recentSubmissions/RecentSubmissionTransformer.java
View File

@@ -94,10 +94,10 @@ public class RecentSubmissionTransformer extends AbstractDSpaceTransformer {
if(isHomePage) if(isHomePage)
{ {
// Add RSS links if available // 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 ) if ( formats != null )
{ {
for (String format : formats.split(",")) for (String format : formats)
{ {
// Remove the protocol number, i.e. just list 'rss' or' atom' // Remove the protocol number, i.e. just list 'rss' or' atom'
String[] parts = format.split("_"); String[] parts = format.split("_");

7
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/handle/HandleResolverReader.java
View File

@@ -107,11 +107,10 @@ public class HandleResolverReader extends AbstractReader implements Recyclable {
{ {
List<String> prefixes = new ArrayList<String>(); List<String> prefixes = new ArrayList<String>();
prefixes.add(handleService.getPrefix()); prefixes.add(handleService.getPrefix());
String additionalPrefixes = DSpaceServicesFactory.getInstance().getConfigurationService() String[] additionalPrefixes = DSpaceServicesFactory.getInstance().getConfigurationService().getArrayProperty("handle.additional.prefixes");
.getProperty("handle.additional.prefixes"); if (additionalPrefixes != null)
if (StringUtils.isNotBlank(additionalPrefixes))
{ {
for (String apref : additionalPrefixes.split(",")) for (String apref : additionalPrefixes)
{ {
prefixes.add(apref.trim()); prefixes.add(apref.trim());
} }

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/JSONLookupSearcher.java
View File

@@ -163,7 +163,7 @@ public class JSONLookupSearcher extends AbstractGenerator {
public String getLookupURI() { public String getLookupURI() {
if(lookupURI ==null){ if(lookupURI ==null){
lookupURI = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("publication-lookup.ublication.url"); lookupURI = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("publication-lookup.publication.url");
} }
return lookupURI; return lookupURI;
} }