diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java index 6d94aa059e40a6d6060c176eba243d48d2737bda..c392ef7584265c18f74afdf2a2df2dda66d4e3ce 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java @@ -16,8 +16,6 @@ package ch.systemsx.cisd.etlserver; -import java.util.LinkedHashMap; -import java.util.Map; import java.util.Properties; import org.apache.commons.lang.time.DateUtils; @@ -132,8 +130,6 @@ public class Parameters private final ThreadParameters[] threads; - private final Map<String, Properties> processorProperties; - private MaintenanceTaskParameters[] maintenancePlugins; @Option(longName = "help", skipForExample = true, usage = "Prints out a description of the options.") @@ -180,7 +176,6 @@ public class Parameters { this.serviceProperties = PropertyParametersUtil.loadServiceProperties(); PropertyUtils.trimProperties(serviceProperties); - this.processorProperties = extractProcessorProperties(serviceProperties); this.threads = createThreadParameters(serviceProperties); this.mailProperties = createMailProperties(serviceProperties); this.timingParameters = TimingParameters.create(serviceProperties); @@ -232,23 +227,6 @@ public class Parameters Long.parseLong(serviceProperties.getProperty("shutdown-timeout", "30")); } - private static Map<String, Properties> extractProcessorProperties(final Properties properties) - { - final LinkedHashMap<String, Properties> map = new LinkedHashMap<String, Properties>(); - final String processors = properties.getProperty("processors"); - if (processors != null) - { - final String[] procedureTypes = - processors.split(PropertyParametersUtil.ITEMS_DELIMITER); - for (final String procedureType : procedureTypes) - { - final String prefix = "processor." + procedureType + "."; - map.put(procedureType, ExtendedProperties.getSubset(properties, prefix, true)); - } - } - return map; - } - private static ThreadParameters[] createThreadParameters(final Properties serviceProperties) { SectionProperties[] sectionsProperties = @@ -386,14 +364,6 @@ public class Parameters return serviceProperties; } - /** - * Returns a map of all processor properties with the procedure type code as the key. - */ - public final Map<String, Properties> getProcessorProperties() - { - return processorProperties; - } - /** Returns <code>mailProperties</code>. */ public final Properties getMailProperties() {