You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/08/01 14:52:37 UTC
svn commit: r681678 - in /felix/trunk/ipojo:
annotations/src/main/java/org/apache/felix/ipojo/annotations/
core/src/main/java/org/apache/felix/ipojo/handlers/dependency/
manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/
tests/c...
Author: clement
Date: Fri Aug 1 05:52:36 2008
New Revision: 681678
URL: http://svn.apache.org/viewvc?rev=681678&view=rev
Log:
Fix issue Felix-655
Support a 'from' attribute to create strong coupled dependencies between service consumers and providers.
The $from from attribute is mapped on the following filter : (|(instance.name=$from)(service.pid=$from))
Add the from attribute in annotations
Commit from attribute tests.
Added:
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FromDependency.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
Modified:
felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MethodCollector.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/FilteredDependency.java
felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FilteredDependencyTestSuite.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
Modified: felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java (original)
+++ felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java Fri Aug 1 05:52:36 2008
@@ -71,5 +71,10 @@
* The indicated class must implement {@link Comparator}
*/
Class comparator() default Comparator.class;
+
+ /**
+ * Set the from attribute.
+ */
+ String from() default "";
}
Modified: felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java (original)
+++ felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java Fri Aug 1 05:52:36 2008
@@ -73,4 +73,9 @@
* The indicated class must implement {@link Comparator}
*/
Class comparator() default Comparator.class;
+
+ /**
+ * Set the from attribute.
+ */
+ String from() default "";
}
Modified: felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java (original)
+++ felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java Fri Aug 1 05:52:36 2008
@@ -72,5 +72,10 @@
* The indicated class must implement {@link Comparator}
*/
Class comparator() default Comparator.class;
+
+ /**
+ * Set the from attribute.
+ */
+ String from() default "";
}
Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java (original)
+++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java Fri Aug 1 05:52:36 2008
@@ -18,34 +18,33 @@
*/
package org.apache.felix.ipojo.handlers.dependency;
-import java.util.ArrayList;
import java.util.List;
import org.osgi.framework.ServiceReference;
/**
- * Dependency Description.
+ * Service Dependency Description.
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class DependencyDescription {
/**
- * Needed Service Interface.
+ * Required Service Interface.
*/
private String m_interface;
/**
- * Multiple ?
+ * Is the dependency aggregate?
*/
- private boolean m_multiple;
+ private boolean m_aggregate;
/**
- * Optional ?
+ * Is the dependency optional ?
*/
private boolean m_optional;
/**
- * Binding policy.
+ * Binding policy used by this service dependency.
*/
private int m_bindingPolicy;
@@ -65,7 +64,7 @@
private int m_state;
/**
- * Filter.
+ * Dependency Filter.
*/
private String m_filter;
@@ -81,12 +80,12 @@
private String m_comparator;
/**
- * Set[service reference] of the used service.
+ * List of used service references.
*/
- private List m_usedServices = new ArrayList();
+ private List m_usedServices;
/**
- * The list of service reference.
+ * List of matching service references.
*/
private List m_serviceReferences;
@@ -106,7 +105,7 @@
public DependencyDescription(String itf, boolean multiple, boolean optional, String filter, int policy, boolean nullable, String defaultImpl, String comparator, boolean frozen, int state) {
super();
m_interface = itf;
- m_multiple = multiple;
+ m_aggregate = multiple;
m_optional = optional;
m_filter = filter;
m_state = state;
@@ -117,7 +116,7 @@
m_isFrozen = frozen;
}
- public boolean isMultiple() { return m_multiple; }
+ public boolean isMultiple() { return m_aggregate; }
public boolean isOptional() { return m_optional; }
@@ -142,31 +141,40 @@
public boolean isFrozen() { return m_isFrozen; }
/**
- * Get the service reference list.
- * @return the array of service reference (only if the cardinality could be n).
+ * Gets the service reference list.
+ * @return the list of matching service reference,
+ * null if no service reference.
*/
public List getServiceReferences() { return m_serviceReferences; }
/**
- * Get the service reference if only 1 used.
- * @return the ServiceReference (only if the cardinality could be 1).
- */
- public ServiceReference getServiceReference() { return (ServiceReference) m_serviceReferences.get(0); }
+ * Gets the service reference if only one service reference is used.
+ * @return the ServiceReference (only if the cardinality could be 1),
+ * or null if no service reference.
+ */
+ public ServiceReference getServiceReference() {
+ if (m_serviceReferences == null) {
+ return null;
+ } else {
+ return (ServiceReference) m_serviceReferences.get(0);
+ }
+ }
/**
- * Set the service reference array.
+ * Sets the service reference array.
* @param refs : the list of service reference
*/
public void setServiceReferences(List refs) { m_serviceReferences = refs; }
/**
- * Get the used service set.
- * @return the list [service reference] containing the used services
+ * Gets the used service set.
+ * @return the list [service reference] containing the used services,
+ * null if no providers are used
*/
public List getUsedServices() { return m_usedServices; }
/**
- * Set the usedServices.
+ * Sets the usedServices.
* @param usages : the list of used service reference.
*/
public void setUsedServices(List usages) {
Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java (original)
+++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java Fri Aug 1 05:52:36 2008
@@ -267,7 +267,8 @@
// Get instance filters.
Dictionary filtersConfiguration = (Dictionary) configuration.get("requires.filters");
-
+ Dictionary fromConfiguration = (Dictionary) configuration.get("requires.from");
+
for (int i = 0; deps != null && i < deps.length; i++) {
// Create the dependency metadata
String field = deps[i].getAttribute("field");
@@ -308,6 +309,23 @@
filter = (String) filtersConfiguration.get(identitity);
}
+ // Compute the 'from' attribute
+ String from = deps[i].getAttribute("from");
+ if (fromConfiguration != null && identitity != null && fromConfiguration.get(identitity) != null) {
+ from = (String) fromConfiguration.get(identitity);
+ }
+ if (from != null) {
+ String fromFilter = "(|(instance.name=" + from + ")(service.pid=" + from + "))";
+ if (aggregate) {
+ warn("The 'from' attribute is incompatible with aggregate requirement : only one provider will match : " + fromFilter);
+ }
+ if (filter != null) {
+ filter = "(&" + fromFilter + filter + ")"; // Append the two filters
+ } else {
+ filter = fromFilter;
+ }
+ }
+
Filter fil = null;
if (filter != null) {
try {
@@ -316,6 +334,7 @@
throw new ConfigurationException("A requirement filter is invalid : " + filter + " - " + e.getMessage());
}
}
+
Class spec = null;
if (serviceSpecification != null) {
Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java (original)
+++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java Fri Aug 1 05:52:36 2008
@@ -157,6 +157,11 @@
private String m_comparator;
/**
+ * From attribute.
+ */
+ private String m_from;
+
+ /**
* Constructor.
* @param name : field name.
*/
@@ -205,6 +210,10 @@
m_comparator = type.getClassName();
return;
}
+ if (arg0.equals("from")) {
+ m_from = arg1.toString();
+ return;
+ }
}
/**
@@ -252,6 +261,9 @@
if (m_comparator != null) {
req.addAttribute(new Attribute("comparator", m_comparator));
}
+ if (m_from != null) {
+ req.addAttribute(new Attribute("from", m_from));
+ }
if (m_id != null) {
m_collector.getIds().put(m_id, req);
Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MethodCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MethodCollector.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MethodCollector.java (original)
+++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MethodCollector.java Fri Aug 1 05:52:36 2008
@@ -198,6 +198,11 @@
* Comparator.
*/
private String m_comparator;
+
+ /**
+ * From attribute.
+ */
+ private String m_from;
/**
* Constructor.
@@ -245,6 +250,10 @@
m_comparator = type.getClassName();
return;
}
+ if (arg0.equals("from")) {
+ m_from = arg1.toString();
+ return;
+ }
}
@@ -290,6 +299,9 @@
if (m_comparator != null) {
req.addAttribute(new Attribute("comparator", m_comparator));
}
+ if (m_from != null) {
+ req.addAttribute(new Attribute("from", m_from));
+ }
} else {
String itf = req.getAttribute("interface");
String aggregate = req.getAttribute("aggregate");
@@ -297,7 +309,7 @@
String filter = req.getAttribute("filter");
String policy = req.getAttribute("policy");
String comparator = req.getAttribute("comparator");
-
+ String from = req.getAttribute("from");
if (m_specification != null) {
if (itf == null) {
req.addAttribute(new Attribute("interface", m_specification));
@@ -346,12 +358,22 @@
if (m_comparator != null) {
if (comparator == null) {
req.addAttribute(new Attribute("comparator", m_comparator));
- } else if (! m_comparator.equals(policy)) {
+ } else if (! m_comparator.equals(comparator)) {
System.err.println("The comparator attribute is not always the same");
return;
}
}
+ if (m_from != null) {
+ if (from == null) {
+ req.addAttribute(new Attribute("from", m_from));
+ } else if (! m_from.equals(from)) {
+ System.err.println("The from attribute is not always the same");
+ return;
+ }
+
+ }
+
}
Element method = new Element("callback", "");
method.addAttribute(new Attribute("method", m_name));
Modified: felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/FilteredDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/FilteredDependency.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/FilteredDependency.java (original)
+++ felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/FilteredDependency.java Fri Aug 1 05:52:36 2008
@@ -7,10 +7,14 @@
public class FilteredDependency extends OSGiTestCase {
private Element[] deps ;
+ private Element[] froms;
public void setUp() {
Element meta = Utils.getMetatadata(context, "org.apache.felix.ipojo.test.scenarios.component.FilteredDependency");
deps = meta.getElements("requires");
+
+ Element meta2 = Utils.getMetatadata(context, "org.apache.felix.ipojo.test.scenarios.component.FromDependency");
+ froms = meta2.getElements("requires");
}
public void testField() {
@@ -49,6 +53,29 @@
assertEquals("Check filter", "(foo=bar)", opt);
}
+ public void testFromField() {
+ Element dep = getDependencyById(froms, "fs");
+ String from = dep.getAttribute("from");
+ assertEquals("Check from", "X", from);
+ }
+
+ public void testFromBind() {
+ Element dep = getDependencyById(froms, "fs2");
+ String from = dep.getAttribute("from");
+ assertEquals("Check from", "X", from);
+ }
+
+ public void testFromUnbind() {
+ Element dep = getDependencyById(froms, "inv");
+ String from = dep.getAttribute("from");
+ assertEquals("Check from", "X", from);
+ }
+
+ public void testNoFrom() {
+ Element dep = getDependencyById(froms, "Bar");
+ String from = dep.getAttribute("from");
+ assertNull("Check from", from);
+ }
private Element getDependencyById(Element[] deps, String name) {
@@ -66,24 +93,6 @@
return null;
}
- private String getBind(Element dep) {
- Element[] elem = dep.getElements("callback");
- for (int i = 0; elem != null && i < elem.length; i++) {
- if (elem[i].getAttribute("type").equalsIgnoreCase("bind")) {
- return elem[i].getAttribute("method");
- }
- }
- return null;
- }
- private String getUnbind(Element dep) {
- Element[] elem = dep.getElements("callback");
- for (int i = 0; elem != null && i < elem.length; i++) {
- if (elem[i].getAttribute("type").equalsIgnoreCase("unbind")) {
- return elem[i].getAttribute("method");
- }
- }
- return null;
- }
}
Added: felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FromDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FromDependency.java?rev=681678&view=auto
==============================================================================
--- felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FromDependency.java (added)
+++ felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FromDependency.java Fri Aug 1 05:52:36 2008
@@ -0,0 +1,64 @@
+package org.apache.felix.ipojo.test.scenarios.component;
+
+import org.apache.felix.ipojo.annotations.Bind;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Requires;
+import org.apache.felix.ipojo.annotations.Unbind;
+import org.apache.felix.ipojo.test.scenarios.annotations.service.FooService;
+
+@Component
+public class FromDependency {
+
+ @Requires(from="X")
+ public FooService fs;
+
+ @Unbind
+ public void unbindBar() {
+
+ }
+
+ @Bind
+ public void bindBar() {
+
+ }
+
+ @Unbind(from="both")
+ public void unbindBaz() {
+
+ }
+
+ @Bind(from="both")
+ public void bindBaz() {
+
+ }
+
+
+ @Requires
+ public FooService fs2;
+
+ @Bind(id="fs2", from="X")
+ public void bindFS2() {
+
+ }
+
+ @Unbind(id="fs2")
+ public void unbindFS2() {
+
+ }
+
+ @Requires(id="inv")
+ public FooService fs2inv;
+
+ @Bind(id="inv")
+ public void bindFS2Inv() {
+
+ }
+
+ @Unbind(id="inv", from="X")
+ public void unbindFS2Inv() {
+
+ }
+
+
+
+}
Modified: felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java (original)
+++ felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java Fri Aug 1 05:52:36 2008
@@ -90,6 +90,18 @@
return elem;
}
+ private Element getBadFrom() {
+ Element elem = new Element("component", "");
+ elem.addAttribute(new Attribute("classname", clazz));
+
+ Element callback = new Element("requires", "");
+ callback.addAttribute(new Attribute("field", "fs"));
+ callback.addAttribute(new Attribute("from", "ba(d&_")); // Incorrect from
+ elem.addElement(callback);
+ elem.addElement(manipulation);
+ return elem;
+ }
+
private Element getBadType() {
Element elem = new Element("component", "");
elem.addAttribute(new Attribute("classname", clazz));
@@ -212,6 +224,23 @@
}
}
+ public void testBadFrom() {
+ try {
+ ComponentFactory cf = new ComponentFactory(context, getBadFrom());
+ cf.start();
+ ComponentInstance ci = cf.createComponentInstance(props);
+ ci.dispose();
+ cf.stop();
+ fail("A service requirement with a bad from must be rejected " + cf);
+ }catch (ConfigurationException e) {
+ //OK
+ } catch (UnacceptableConfiguration e) {
+ fail("Unexpected exception when creating an instance : " + e.getMessage());
+ } catch (MissingHandlerException e) {
+ fail("Unexpected exception when creating an instance : " + e.getMessage());
+ }
+ }
+
public void testBadType() {
try {
ComponentFactory cf = new ComponentFactory(context, getBadType());
Modified: felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FilteredDependencyTestSuite.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FilteredDependencyTestSuite.java?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FilteredDependencyTestSuite.java (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FilteredDependencyTestSuite.java Fri Aug 1 05:52:36 2008
@@ -31,6 +31,7 @@
ots.addTestSuite(OptionalSimpleFilterDependencies.class);
ots.addTestSuite(MultipleFilterDependencies.class);
ots.addTestSuite(OptionalMultipleFilterDependencies.class);
+ ots.addTestSuite(FromDependencies.class);
return ots;
}
Added: felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java?rev=681678&view=auto
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java (added)
+++ felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java Fri Aug 1 05:52:36 2008
@@ -0,0 +1,308 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.ipojo.test.scenarios.service.dependency.filter;
+
+import java.util.Properties;
+
+import org.apache.felix.ipojo.ComponentInstance;
+import org.apache.felix.ipojo.architecture.Architecture;
+import org.apache.felix.ipojo.architecture.InstanceDescription;
+import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.test.scenarios.util.Utils;
+import org.osgi.framework.ServiceReference;
+
+public class FromDependencies extends OSGiTestCase {
+
+ ComponentInstance instance1, instance2, instance3, instance4;
+ ComponentInstance providerA, providerB, providerC, providerD;
+
+ public void setUp() {
+ try {
+ Properties prov = new Properties();
+ prov.put("name", "A");
+ providerA = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
+ providerA.stop();
+
+ Properties prov2 = new Properties();
+ prov2.put("name", "B");
+ providerB = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov2);
+ providerB.stop();
+
+ Properties prov3 = new Properties();
+ prov3.put("service.pid", "A");
+ providerC = Utils.getFactoryByName(context, "SimplePIDCheckServiceProvider").createComponentInstance(prov3);
+ providerC.stop();
+
+ Properties prov4 = new Properties();
+ prov4.put("service.pid", "D");
+ prov4.put("name", "D");
+ providerD = Utils.getFactoryByName(context, "SimplePIDCheckServiceProvider").createComponentInstance(prov4);
+ providerD.stop();
+
+ // Uses the component type from value
+ Properties i1 = new Properties();
+ i1.put("name", "Subscriber1");
+ instance1 = Utils.getFactoryByName(context, "SimpleFromCheckServiceSubscriber").createComponentInstance(i1);
+
+ // Uses the instance configuration from value
+ Properties i2 = new Properties();
+ i2.put("name", "Subscriber2");
+ Properties ii2 = new Properties();
+ ii2.put("id1", "B");
+ i2.put("requires.from", ii2);
+ instance2 = Utils.getFactoryByName(context, "SimpleFromCheckServiceSubscriber").createComponentInstance(i2);
+
+ // Uses the instance configuration from value (*)
+ Properties i3 = new Properties();
+ i3.put("name", "Subscriber3");
+ Properties ii3 = new Properties();
+ ii3.put("id1", "*");
+ i3.put("requires.from", ii3);
+ instance3 = Utils.getFactoryByName(context, "SimpleFromCheckServiceSubscriber").createComponentInstance(i3);
+
+ // Uses the instance configuration from value, merge filter and from
+ Properties i4 = new Properties();
+ i4.put("name", "Subscriber4");
+ Properties ii4 = new Properties();
+ ii4.put("id1", "D");
+ i4.put("requires.from", ii4);
+ Properties iii4 = new Properties();
+ iii4.put("id1", "(service.pid=D)");
+ i4.put("requires.filters", iii4);
+ instance4 = Utils.getFactoryByName(context, "SimpleFromCheckServiceSubscriber").createComponentInstance(i4);
+
+ } catch(Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage()); }
+
+ }
+
+ public void tearDown() {
+ instance1.dispose();
+ instance2.dispose();
+ instance3.dispose();
+ instance4.dispose();
+ providerA.dispose();
+ providerB.dispose();
+ providerC.dispose();
+ providerD.dispose();
+ instance1 = null;
+ instance2 = null;
+ instance3 = null;
+ instance4 = null;
+ providerA = null;
+ providerB = null;
+ providerC = null;
+ providerD = null;
+ }
+
+ public void testFromInstanceName() {
+ instance1.start();
+
+ ServiceReference arch_ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), instance1.getInstanceName());
+ assertNotNull("Check architecture availability", arch_ref);
+ InstanceDescription id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
+
+ providerB.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
+
+ providerA.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
+
+ providerA.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 4", id.getState() == ComponentInstance.INVALID);
+
+ providerA.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.VALID);
+
+
+ providerA.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 5", id.getState() == ComponentInstance.INVALID);
+
+ id = null;
+ providerB.stop();
+ context.ungetService(arch_ref);
+ }
+
+ public void testFromPID() {
+ instance1.start();
+
+ ServiceReference arch_ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), instance1.getInstanceName());
+ assertNotNull("Check architecture availability", arch_ref);
+ InstanceDescription id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
+
+ providerB.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
+
+ providerC.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
+
+ providerC.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 4", id.getState() == ComponentInstance.INVALID);
+
+ providerC.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.VALID);
+
+ providerC.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 5", id.getState() == ComponentInstance.INVALID);
+
+ id = null;
+ providerB.stop();
+ context.ungetService(arch_ref);
+ }
+
+ public void testFromInstanceNameInstanceConfiguration() {
+ instance2.start();
+
+ ServiceReference arch_ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), instance2.getInstanceName());
+ assertNotNull("Check architecture availability", arch_ref);
+ InstanceDescription id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
+
+ providerA.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
+
+ providerB.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
+
+ providerB.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 4", id.getState() == ComponentInstance.INVALID);
+
+ providerB.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.VALID);
+
+ providerB.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 5", id.getState() == ComponentInstance.INVALID);
+
+ id = null;
+ providerA.stop();
+ context.ungetService(arch_ref);
+ }
+
+ public void testFromInstanceNameStar() {
+ instance3.start();
+
+ ServiceReference arch_ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), instance3.getInstanceName());
+ assertNotNull("Check architecture availability", arch_ref);
+ InstanceDescription id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
+
+ providerA.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 0", id.getState() == ComponentInstance.VALID);
+
+ providerB.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
+
+ providerB.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 4", id.getState() == ComponentInstance.VALID);
+
+ providerA.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.INVALID);
+
+ providerB.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 5", id.getState() == ComponentInstance.VALID);
+
+ id = null;
+ providerB.stop();
+ context.ungetService(arch_ref);
+ }
+
+ public void testFromAndFilter() {
+ instance4.start();
+
+ ServiceReference arch_ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), instance4.getInstanceName());
+ assertNotNull("Check architecture availability", arch_ref);
+ InstanceDescription id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
+
+ providerA.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
+
+ providerD.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
+
+ providerD.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 4", id.getState() == ComponentInstance.INVALID);
+
+ providerD.start();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.VALID);
+
+ providerD.stop();
+
+ id = ((Architecture) context.getService(arch_ref)).getInstanceDescription();
+ assertTrue("Check instance invalidity - 5", id.getState() == ComponentInstance.INVALID);
+
+ id = null;
+ providerA.stop();
+ context.ungetService(arch_ref);
+ }
+
+
+
+}
Modified: felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml?rev=681678&r1=681677&r2=681678&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml Fri Aug 1 05:52:36 2008
@@ -17,6 +17,24 @@
</requires>
<provides />
</component>
+
+ <component
+ className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
+ name="SimpleFromCheckServiceSubscriber" architecture="true">
+ <requires field="m_foo" from="A" id="id1">
+ <callback type="bind" method="Bind" />
+ <callback type="unbind" method="Unbind" />
+ </requires>
+ <provides />
+ </component>
+
+ <component
+ className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckProvider"
+ name="SimplePIDCheckServiceProvider" architecture="true">
+ <provides>
+ <property type="String" name="service.pid" />
+ </provides>
+ </component>
<component
className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"