Fix FELIX-2688 iPojo "requires.filters" - Array object instead of Dictionary object
I just applied the patch.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1033179 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
index 98834dd..b676324 100644
--- a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
+++ b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
@@ -21,6 +21,7 @@
import java.util.Collection;
import java.util.Comparator;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -369,7 +370,7 @@
Element[] deps = componentMetadata.getElements("Requires");
// Get instance filters.
- Dictionary filtersConfiguration = (Dictionary) configuration.get("requires.filters");
+ Dictionary filtersConfiguration = getRequiresFilters(configuration.get("requires.filters"));
Dictionary fromConfiguration = (Dictionary) configuration.get("requires.from");
for (int i = 0; deps != null && i < deps.length; i++) {
@@ -523,6 +524,38 @@
m_description = new DependencyHandlerDescription(this, m_dependencies); // Initialize the description.
}
+ /**
+ * Gets the requires filter configuration from the given object.
+ * The given object must come from the instance configuration.
+ * This method was made to fix FELIX-2688. It supports filter configuration using
+ * an array:
+ * <code>{"myFirstDep", "(property1=value1)", "mySecondDep", "(property2=value2)"});</code>
+ * @param requiresFiltersValue the value contained in the instance
+ * configuration.
+ * @return the dictionary. If the object in already a dictionary, just returns it,
+ * if it's an array, builds the dictionary.
+ * @throws ConfigurationException the dictionary cannot be built
+ */
+ private Dictionary getRequiresFilters(Object requiresFiltersValue)
+ throws ConfigurationException {
+ if (requiresFiltersValue != null
+ && requiresFiltersValue.getClass().isArray()) {
+ String[] filtersArray = (String[]) requiresFiltersValue;
+ if (filtersArray.length % 2 != 0) {
+ throw new ConfigurationException(
+ "A requirement filter is invalid : "
+ + requiresFiltersValue);
+ }
+ Dictionary requiresFilters = new Hashtable();
+ for (int i = 0; i < filtersArray.length; i += 2) {
+ requiresFilters.put(filtersArray[i], filtersArray[i + 1]);
+ }
+ return requiresFilters;
+ }
+
+ return (Dictionary) requiresFiltersValue;
+ }
+
/**
* Handler start method.
* @see org.apache.felix.ipojo.Handler#start()