You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2017/02/06 14:37:51 UTC
svn commit: r1781908 [1/5] - in /felix/trunk/dependencymanager:
cnf/localrepo/ cnf/releaserepo/
org.apache.felix.dependencymanager.annotation/
org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/
org.apache.felix.depend...
Author: pderop
Date: Mon Feb 6 14:37:49 2017
New Revision: 1781908
URL: http://svn.apache.org/viewvc?rev=1781908&view=rev
Log:
(this is a big commit, sorry, I could not take time to commit separately those things ...)
FELIX-5515: Upgrade DM to OSGi R6 API
FELIX-5403: re-added the STARTED event which is in fact useful: the STARTED event is notified when the component start callback has been called but the component
is not yet registered in the osgi registry. and the TRACKING_OPTIONAL event is called when the component has been started, injected with optional dependency callbacks
and registered.
FELIX-5516: Allow to not dereference services internally.
FELIX-5517: @Inject annotation ignored when applied on ServiceRegistration.
FELIX-5518: Remove all eclipse warnings in DM code.
FELIX-5519: services are not ungotten when swapped by an aspect.
FELIX-5520: ComponentStateListener not supported in DM lambda.
FELIX-5521: add more callback method signature in DM lambda service dependency callbacks.
FELIX-5522: Refactor aspect service implementation.
FELIX-5523: required dependencies added to a started adapter (or aspect) are not injected.
FELIX-5524: add more signatures for aspect swap callbacks.
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/JsonWriter.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FELIX5516Test.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationCreator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/CbRefRefComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefRef.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/InstanceCbRefRefComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JsonReader.java
Modified:
felix/trunk/dependencymanager/cnf/localrepo/index.xml
felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha
felix/trunk/dependencymanager/cnf/releaserepo/index.xml
felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ServiceDependency.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/Patterns.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/dictionary/DictionaryAspectConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/org/apache/felix/dm/lambda/samples/dictionary/DictionaryConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ComponentBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceCallbacksBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/callbacks/packageinfo
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/AdapterBase.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/BundleAdapterBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ComponentBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceCallbacksBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/impl/ServiceDependencyBuilderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AspectAnnotation.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/CompositeAnnotations.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FELIX5337.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/Felix4050.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/Felix4357.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/Felix5236.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/MethodSignatures.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/OptionalConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ResourceAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ResourceAnnotation.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/SimpleAnnotations.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/Utils.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AdapterAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/CompositeAnnotationsTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ConfigurationProxyTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ExtraServicePropertiesTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FELIX5337Test.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4050Test.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4357Test.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix5236Test.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/InheritedAnnotationsTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MethodSignaturesTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/OptionalConfigurationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PropagateAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PublisherAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ResourceAnnotationTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/SimpleAnnotationsTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AbstractBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AspectServiceBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DescriptorParser.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Params.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspectConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/api/DictionaryAspectConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/api/DictionaryConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependencyConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/test/test/DMCommandTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Component.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ComponentState.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ConfigurationDependency.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/FilterIndex.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ServiceDependency.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/packageinfo
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/AbstractDecorator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/AdapterServiceImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/AspectServiceImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleEventImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/InvocationUtil.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceEventImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceUtil.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/TemporalServiceDependencyImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/AbstractFactoryFilterIndex.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/AdapterFilterIndex.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/AspectFilterIndex.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/ServiceTracker.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/ServiceTrackerCustomizer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/impl/FactoryConfigurationAdapterImplTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java
felix/trunk/dependencymanager/release/resources/deps/NOTICE
Modified: felix/trunk/dependencymanager/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/index.xml?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha (original)
+++ felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha Mon Feb 6 14:37:49 2017
@@ -1 +1 @@
-e6609c4263f8048f91643fb6bff9b13e87aef8514f01ad9518d6e59d8ad1b7a9
\ No newline at end of file
+8f67ef6be82fa5987b479c779e310085561d81c8b87d20414e5b556a00f4d7bc
\ No newline at end of file
Modified: felix/trunk/dependencymanager/cnf/releaserepo/index.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/index.xml?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha (original)
+++ felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha Mon Feb 6 14:37:49 2017
@@ -1 +1 @@
-6487494f043b4bc5f66e95a1fe88a48e7e984fbd214238fdf68f668be7bb049a
\ No newline at end of file
+490f90fa1ead1f301c0561cb1aef7d4c7a9ba9b110fca5a0acfe814229863db6
\ No newline at end of file
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd Mon Feb 6 14:37:49 2017
@@ -15,13 +15,12 @@
# limitations under the License.
#
Bundle-Version: 4.2.0
--buildpath: \
- osgi.core;version=4.2,\
- de.twentyeleven.skysail.org.json-osgi;version=20080701.0,\
- biz.aQute.bndlib;version=2.4
+-buildpath: \
+ biz.aQute.bndlib;version=2.4,\
+ osgi.core;version=6.0,\
+ osgi.cmpn;version=6.0
Private-Package: \
- org.apache.felix.dm.annotation.plugin.bnd, \
- org.json.*
+ org.apache.felix.dm.annotation.plugin.bnd
Export-Package: \
org.apache.felix.dm.annotation.api
Include-Resource: META-INF/=resources/LICENSE,\
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ServiceDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ServiceDependency.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ServiceDependency.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ServiceDependency.java Mon Feb 6 14:37:49 2017
@@ -152,4 +152,15 @@ public @interface ServiceDependency
* @return true if dependency service properties must be published along with the service, false if not.
*/
boolean propagate() default false;
+
+ /**
+ * Configures whether or not this dependency should internally obtain the service object for all tracked service references.
+ *
+ * By default, DM internally dereferences all discovered service references (using
+ * <code>BundleContext.getService(ServiceReference ref)</code> methods.
+ * However, sometimes, your callback only needs the ServiceReference, and sometimes you don't want to dereference the service.
+ * So, in this case you can use the <code>dereference(false)</code> method in order to tell to DM
+ * that it should never internally dereference the service dependency internally.
+ */
+ boolean dereference() default true;
}
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java Mon Feb 6 14:37:49 2017
@@ -49,9 +49,6 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Start;
import org.apache.felix.dm.annotation.api.Stop;
import org.apache.felix.dm.annotation.api.Unregistered;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import org.osgi.framework.Bundle;
import aQute.bnd.osgi.Annotation;
@@ -112,6 +109,7 @@ public class AnnotationCollector extends
private final Set<String> m_exportService = new HashSet<String>();
private String m_bundleContextField;
private String m_dependencyManagerField;
+ private String m_registrationField;
private String m_componentField;
private String m_registeredMethod;
private String m_unregisteredMethod;
@@ -371,7 +369,7 @@ public class AnnotationCollector extends
.findFirst();
if (! componentWriter.isPresent() || m_writers.size() == 0) {
- m_logger.info("No components found for class " + m_componentClassName);
+ m_logger.info("No components found for class %s", m_componentClassName);
return false;
}
@@ -480,8 +478,8 @@ public class AnnotationCollector extends
// impl attribute
writer.put(EntryParam.impl, m_componentClassName);
- // properties attribute
- parseProperties(annotation, writer);
+ // Parse Adapter properties, and other params common to all kind of component
+ parseCommonComponentAttributes(annotation, writer);
// provides attribute.
if (writer.putClassArray(annotation, EntryParam.provides, m_interfaces, m_exportService) == 0)
@@ -587,6 +585,11 @@ public class AnnotationCollector extends
{
writer.put(EntryParam.componentField, m_componentField);
}
+
+ if (m_registrationField != null)
+ {
+ writer.put(EntryParam.registrationField, m_registrationField);
+ }
}
/**
@@ -724,6 +727,9 @@ public class AnnotationCollector extends
// propagate attribute
writer.putString(annotation, EntryParam.propagate, null);
+
+ // dereference flag
+ writer.putString(annotation, EntryParam.dereference, null);
}
/**
@@ -857,8 +863,8 @@ public class AnnotationCollector extends
// Generate Aspect Implementation
writer.put(EntryParam.impl, m_componentClassName);
- // Parse Aspect properties.
- parseProperties(annotation, writer);
+ // Parse Adapter properties, and other params common to all kind of component
+ parseCommonComponentAttributes(annotation, writer);
// Parse field/added/changed/removed attributes
parseAspectOrAdapterCallbackMethods(annotation, writer);
@@ -939,8 +945,8 @@ public class AnnotationCollector extends
// Parse the mandatory adapted service interface.
writer.putClass(annotation, EntryParam.adapteeService);
- // Parse Adapter properties.
- parseProperties(annotation, writer);
+ // Parse Adapter properties, and other params common to all kind of component
+ parseCommonComponentAttributes(annotation, writer);
// Parse the provided adapter service (use directly implemented interface by default).
if (writer.putClassArray(annotation, EntryParam.provides, m_interfaces, m_exportService) == 0)
@@ -983,8 +989,8 @@ public class AnnotationCollector extends
writer.putString(annotation, EntryParam.stateMask, Integer.valueOf(
Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE).toString());
- // Parse Adapter properties.
- parseProperties(annotation, writer);
+ // Parse Adapter properties, and other params common to all kind of component
+ parseCommonComponentAttributes(annotation, writer);
// Parse the optional adapter service (use directly implemented interface by default).
if (writer.putClassArray(annotation, EntryParam.provides, m_interfaces, m_exportService) == 0)
@@ -1019,8 +1025,8 @@ public class AnnotationCollector extends
writer.put(EntryParam.filter, filter);
}
- // Parse Adapter properties.
- parseProperties(annotation, writer);
+ // Parse Adapter properties, and other params common to all kind of component
+ parseCommonComponentAttributes(annotation, writer);
// Parse the provided adapter service (use directly implemented interface by default).
if (writer.putClassArray(annotation, EntryParam.provides, m_interfaces, m_exportService) == 0)
@@ -1078,8 +1084,8 @@ public class AnnotationCollector extends
checkRegisteredUnregisteredNotPresent();
}
- // Parse Adapter properties.
- parseProperties(annotation, writer);
+ // Parse Adapter properties, and other params common to all kind of component
+ parseCommonComponentAttributes(annotation, writer);
// Parse optional meta types for configuration description.
parseMetaTypes(annotation, factoryPid, true);
@@ -1237,7 +1243,8 @@ public class AnnotationCollector extends
}
/**
- * Parses a Property annotation (which represents a list of key-value pair).
+ * Parses attributes common to all kind of components.
+ * First, Property annotation is parsed which represents a list of key-value pair.
* The properties are encoded using the following json form:
*
* properties ::= key-value-pair*
@@ -1260,8 +1267,9 @@ public class AnnotationCollector extends
* @param component the component annotation which contains a "properties" attribute. The component can be either a @Component, or an aspect, or an adapter.
* @param writer the object where the parsed attributes are written.
*/
- private void parseProperties(Annotation component, EntryWriter writer)
- {
+ private void parseCommonComponentAttributes(Annotation component, EntryWriter writer)
+ {
+ // Parse properties attribute.
Object[] properties = component.get(EntryParam.properties.toString());
if (properties != null)
{
@@ -1280,86 +1288,69 @@ public class AnnotationCollector extends
*/
private void parseProperty(Annotation property, EntryWriter writer)
{
- EntryParam attribute = EntryParam.properties;
- try
- {
- JSONObject properties = writer.getJsonObject(attribute);
- if (properties == null) {
- properties = new JSONObject();
- }
-
- String name = (String) property.get("name");
- String type = parseClassAttrValue(property.get("type"));
- Class<?> classType;
- try
- {
- classType = (type == null) ? String.class : Class.forName(type);
- }
- catch (ClassNotFoundException e)
- {
- // Theorically impossible
- throw new IllegalArgumentException("Invalid Property type " + type
- + " from annotation " + property + " in class " + m_componentClassName);
- }
-
- Object[] values;
+ String name = (String) property.get("name");
+ String type = parseClassAttrValue(property.get("type"));
+ Class<?> classType;
+ try
+ {
+ classType = (type == null) ? String.class : Class.forName(type);
+ }
+ catch (ClassNotFoundException e)
+ {
+ // Theorically impossible
+ throw new IllegalArgumentException("Invalid Property type " + type
+ + " from annotation " + property + " in class " + m_componentClassName);
+ }
- if ((values = property.get("value")) != null)
- {
- values = checkPropertyType(name, classType, values);
- addProperty(properties, name, values, classType);
- }
- else if ((values = property.get("values")) != null)
- { // deprecated
- values = checkPropertyType(name, classType, values);
- addProperty(properties, name, values, classType);
- }
- else if ((values = property.get("longValue")) != null)
- {
- addProperty(properties, name, values, Long.class);
- }
- else if ((values = property.get("doubleValue")) != null)
- {
- addProperty(properties, name, values, Double.class);
- }
- else if ((values = property.get("floatValue")) != null)
- {
- addProperty(properties, name, values, Float.class);
- }
- else if ((values = property.get("intValue")) != null)
- {
- addProperty(properties, name, values, Integer.class);
- }
- else if ((values = property.get("byteValue")) != null)
- {
- addProperty(properties, name, values, Byte.class);
- }
- else if ((values = property.get("charValue")) != null)
- {
- addProperty(properties, name, values, Character.class);
- }
- else if ((values = property.get("booleanValue")) != null)
- {
- addProperty(properties, name, values, Boolean.class);
- }
- else if ((values = property.get("shortValue")) != null)
- {
- addProperty(properties, name, values, Short.class);
- }
- else
- {
- throw new IllegalArgumentException(
- "Missing Property value from annotation " + property + " in class " + m_componentClassName);
- }
+ Object[] values;
- if (properties.length() > 0) {
- writer.putJsonObject(attribute, properties);
- }
- }
- catch (JSONException e)
- {
- throw new IllegalArgumentException("Unexpected exception while parsing Property from class " + m_componentClassName, e);
- }
+ if ((values = property.get("value")) != null)
+ {
+ values = checkPropertyType(name, classType, values);
+ writer.addProperty(name, values, classType);
+ }
+ else if ((values = property.get("values")) != null)
+ { // deprecated
+ values = checkPropertyType(name, classType, values);
+ writer.addProperty(name, values, classType);
+ }
+ else if ((values = property.get("longValue")) != null)
+ {
+ writer.addProperty(name, values, Long.class);
+ }
+ else if ((values = property.get("doubleValue")) != null)
+ {
+ writer.addProperty(name, values, Double.class);
+ }
+ else if ((values = property.get("floatValue")) != null)
+ {
+ writer.addProperty(name, values, Float.class);
+ }
+ else if ((values = property.get("intValue")) != null)
+ {
+ writer.addProperty(name, values, Integer.class);
+ }
+ else if ((values = property.get("byteValue")) != null)
+ {
+ writer.addProperty(name, values, Byte.class);
+ }
+ else if ((values = property.get("charValue")) != null)
+ {
+ writer.addProperty(name, values, Character.class);
+ }
+ else if ((values = property.get("booleanValue")) != null)
+ {
+ writer.addProperty(name, values, Boolean.class);
+ }
+ else if ((values = property.get("shortValue")) != null)
+ {
+ writer.addProperty(name, values, Short.class);
+ }
+ else
+ {
+ throw new IllegalArgumentException(
+ "Missing Property value from annotation " + property + " in class " + m_componentClassName);
+ }
}
/**
@@ -1470,37 +1461,6 @@ public class AnnotationCollector extends
}
/**
- * Adds a key/value(s) pair in a properties map
- * @param properties the target properties map
- * @param name the property name
- * @param value the property value(s)
- * @param type the property type
- * @throws JSONException
- */
- private void addProperty(JSONObject props, String name, Object value, Class<?> type) throws JSONException {
- if (value.getClass().isArray())
- {
- Object[] array = (Object[]) value;
- if (array.length == 1)
- {
- value = array[0];
- }
- }
-
- if (type.equals(String.class))
- {
- props.put(name, value.getClass().isArray() ? new JSONArray(value) : value);
- }
- else
- {
- JSONObject jsonValue = new JSONObject();
- jsonValue.put("type", type.getName());
- jsonValue.put("value", value.getClass().isArray() ? new JSONArray(value) : value);
- props.put(name, jsonValue);
- }
- }
-
- /**
* Parse Inject annotation, used to inject some special classes in some fields
* (BundleContext/DependencyManager etc ...)
* @param annotation the Inject annotation
@@ -1528,6 +1488,13 @@ public class AnnotationCollector extends
}
m_componentField = m_field;
}
+ else if (Patterns.SERVICE_REGISTRATION.matcher(m_descriptor).matches())
+ {
+ if (m_registrationField != null) {
+ throw new IllegalStateException("detected multiple @Inject annotation from class " + m_currentClassName + " (on from child classes)");
+ }
+ m_registrationField = m_field;
+ }
else
{
throw new IllegalArgumentException("@Inject annotation can't be applied on the field \"" + m_field
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java Mon Feb 6 14:37:49 2017
@@ -65,6 +65,8 @@ public enum EntryParam
bundleContextField,
dependencyManagerField,
componentField,
+ registrationField,
registered,
- unregistered
+ unregistered,
+ dereference
}
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java Mon Feb 6 14:37:49 2017
@@ -18,46 +18,67 @@
*/
package org.apache.felix.dm.annotation.plugin.bnd;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
import aQute.bnd.osgi.Annotation;
/**
* This class encodes a component descriptor entry line, using json.
+ * We are using a slightly adapted version of the nice JsonSerializingImpl class from the Apache Felix Converter project.
+ *
+ * Internally, we store parameters in a map. The format of key/values stored in the map is the following:
+ *
+ * The JSON object has the following form:
+ *
+ * entry ::= String | String[] | dictionary
+ * dictionary ::= key-value-pair*
+ * key-value-pair ::= key value
+ * value ::= String | String[] | value-type
+ * value-type ::= jsonObject with value-type-info
+ * value-type-info ::= "type"=primitive java type
+ * "value"=String|String[]
+ *
+ * Exemple:
+ *
+ * {"string-param" : "string-value",
+ * "string-array-param" : ["string1", "string2"],
+ * "properties" : {
+ * "string-param" : "string-value",
+ * "string-array-param" : ["str1", "str2],
+ * "long-param" : {"type":"java.lang.Long", "value":"1"}}
+ * "long-array-param" : {"type":"java.lang.Long", "value":["1"]}}
+ * }
+ * }
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class EntryWriter
{
- // Every descriptor entries contains a type parameter for identifying the kind of entry
+ /**
+ * Every descriptor entries contains a type parameter for identifying the kind of entry
+ */
private final static String TYPE = "type";
- /** All parameters as stored in a json object */
- private JSONObject m_json;
+ /**
+ * All parameters as stored in a map object
+ */
+ private final HashMap<String, Object> m_params = new HashMap<>();
/** The entry type */
- private EntryType m_type;
-
+ private final EntryType m_type;
+
/**
* Makes a new component descriptor entry.
*/
public EntryWriter(EntryType type)
{
m_type = type;
- m_json = new JSONObject();
- try
- {
- m_json.put("type", type.toString());
- }
- catch (JSONException e)
- {
- throw new RuntimeException("could not initialize json object", e);
- }
+ m_params.put("type", type.toString());
}
/**
@@ -70,71 +91,64 @@ public class EntryWriter
/**
* Returns a string representation for the given component descriptor entry.
+ * @param m_logger
*/
- @Override
public String toString()
{
- return m_json.toString();
+ return new JsonWriter(m_params).toString();
}
/**
- * Put a String parameter in this descritor entry.
+ * Adds a String parameter in this descritor entry.
*/
public void put(EntryParam param, String value)
{
checkType(param.toString());
- try
- {
- m_json.put(param.toString(), value);
- }
- catch (JSONException e)
- {
- throw new IllegalArgumentException("could not add param " + param + ":" + value, e);
- }
- }
+ m_params.put(param.toString(), value);
+ }
/**
- * Put a String[] parameter in this descriptor entry.
+ * Adds a String[] parameter in this descriptor entry.
*/
- public void put(EntryParam param, String[] array)
+ public void put(EntryParam param, String[] values)
{
checkType(param.toString());
- try
- {
- m_json.put(param.toString(), new JSONArray(Arrays.asList(array)));
- }
- catch (JSONException e)
- {
- throw new IllegalArgumentException("could not add param " + param + ":"
- + Arrays.toString(array), e);
- }
+ m_params.put(param.toString(), Arrays.asList(values));
}
/**
- * Puts a json object.
- * @throws JSONException
+ * Adds a property in this descriptor entry.
*/
- public void putJsonObject(EntryParam param, JSONObject jsonObject) throws JSONException
+ @SuppressWarnings("unchecked")
+ public void addProperty(String name, Object value, Class<?> type)
{
- m_json.put(param.toString(), jsonObject);
- }
-
- /**
- * Gets a json object associated to the given parameter name.
- * @throws JSONException
- */
- public JSONObject getJsonObject(EntryParam param)
- {
- try
+ Map<String, Object> properties = (Map<String, Object>) m_params.get(EntryParam.properties.toString());
+ if (properties == null) {
+ properties = new HashMap<>();
+ m_params.put(EntryParam.properties.toString(), properties);
+ }
+ if (value.getClass().isArray())
+ {
+ Object[] array = (Object[]) value;
+ if (array.length == 1)
+ {
+ value = array[0];
+ }
+ }
+
+ if (type.equals(String.class))
{
- return (JSONObject) m_json.get(param.toString());
+ properties.put(name, value.getClass().isArray() ? Arrays.asList((Object[]) value) : value);
}
- catch (JSONException e)
+ else
{
- return null;
+ Map<String, Object> val = new HashMap<>();
+ val.put("type", type.getName());
+ val.put("value", value.getClass().isArray() ? Arrays.asList((Object[]) value) : value);
+ properties.put(name, val);
}
}
-
+
/**
* Get a String attribute value from an annotation and write it into this descriptor entry.
*/
@@ -154,34 +168,6 @@ public class EntryWriter
}
/**
- * Get a String array attribute value from an annotation and write it into this descriptor entry.
- */
- public void putStringArray(Annotation annotation, EntryParam param, String[] def)
- {
- checkType(param.toString());
- Object value = annotation.get(param.toString());
- if (value == null && def != null)
- {
- value = def;
- }
- if (value != null)
- {
- for (Object v: ((Object[]) value))
- {
- try
- {
- m_json.append(param.toString(), v.toString());
- }
- catch (JSONException e)
- {
- throw new IllegalArgumentException("Could not add param " + param + ":"
- + value.toString(), e);
- }
- }
- }
- }
-
- /**
* Get a class attribute value from an annotation and write it into this descriptor entry.
*/
public void putClass(Annotation annotation, EntryParam param)
@@ -221,6 +207,7 @@ public class EntryWriter
+ " has not a class array type");
}
+ List<String> classes = new ArrayList<>();
for (Object v: ((Object[]) value))
{
if (! usingDefault)
@@ -228,21 +215,13 @@ public class EntryWriter
// Parse the annotation attribute value.
v = AnnotationCollector.parseClassAttrValue(v);
}
- try
- {
- m_json.append(param.toString(), v.toString());
- collect.add(v.toString());
- }
- catch (JSONException e)
- {
- throw new IllegalArgumentException("Could not add param " + param + ":"
- + value.toString(), e);
- }
+ classes.add(v.toString());
+ collect.add(v.toString());
}
+ m_params.put(param.toString(), classes);
return ((Object[]) value).length;
}
-
return 0;
}
Added: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/JsonWriter.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/JsonWriter.java?rev=1781908&view=auto
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/JsonWriter.java (added)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/JsonWriter.java Mon Feb 6 14:37:49 2017
@@ -0,0 +1,131 @@
+/*
+ * 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.dm.annotation.plugin.bnd;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * Class used to serialize a map into the json format.
+ * Code adapted from Apache Felix Converter (org.apache.felix.serializer.impl.json.JsonSerializingImpl)
+ *
+ * The JSON output is parsed into an object structure in the following way:
+ * <ul>
+ * <li>Object names are represented as a {@link String}.
+ * <li>String values are represented as a {@link String}.
+ * <li>Numeric values without a decimal separator are represented as a {@link Long}.
+ * <li>Numeric values with a decimal separator are represented as a {@link Double}.
+ * <li>Boolean values are represented as a {@link Boolean}.
+ * <li>Nested JSON objects are parsed into a {@link java.util.Map Map<String, Object>}.
+ * <li>JSON lists are parsed into a {@link java.util.List} which may contain any of the above values.
+ * </ul>
+ */
+public class JsonWriter {
+ private final Object object;
+ private final boolean ignoreNull;
+ private final Function<Object, String> converter;
+
+ JsonWriter(Object object) {
+ this(object, null, false);
+ }
+
+ JsonWriter(Object object, Function<Object, String> converter, boolean ignoreNull) {
+ this.object = object;
+ this.converter = converter;
+ this.ignoreNull = ignoreNull;
+ }
+
+ @Override
+ public String toString() {
+ return encode(object);
+ }
+
+ @SuppressWarnings("rawtypes")
+ private String encode(Object obj) {
+ if (obj == null) {
+ return ignoreNull ? "" : "null";
+ }
+
+ if (obj instanceof Map) {
+ return encodeMap((Map) obj);
+ } else if (obj instanceof Collection) {
+ return encodeCollection((Collection) obj);
+ } else if (obj.getClass().isArray()) {
+ return encodeCollection(asCollection(obj));
+ } else if (obj instanceof Number) {
+ return obj.toString();
+ } else if (obj instanceof Boolean) {
+ return obj.toString();
+ }
+
+ String result = (converter != null) ? converter.apply(obj) : obj.toString();
+ return "\"" + result + "\"";
+ }
+
+ private Collection<?> asCollection(Object arr) {
+ // Arrays.asList() doesn't work for primitive arrays
+ int len = Array.getLength(arr);
+ List<Object> l = new ArrayList<>(len);
+ for (int i=0; i<len; i++) {
+ l.add(Array.get(arr, i));
+ }
+ return l;
+ }
+
+ private String encodeCollection(Collection<?> collection) {
+ StringBuilder sb = new StringBuilder("[");
+
+ boolean first = true;
+ for (Object o : collection) {
+ if (first)
+ first = false;
+ else
+ sb.append(',');
+
+ sb.append(encode(o));
+ }
+
+ sb.append("]");
+ return sb.toString();
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ private String encodeMap(Map m) {
+ StringBuilder sb = new StringBuilder("{");
+ for (Entry entry : (Set<Entry>) m.entrySet()) {
+ if (entry.getKey() == null || entry.getValue() == null)
+ if (ignoreNull)
+ continue;
+
+ if (sb.length() > 1)
+ sb.append(',');
+ sb.append('"');
+ sb.append(entry.getKey().toString());
+ sb.append("\":");
+ sb.append(encode(entry.getValue()));
+ }
+ sb.append("}");
+
+ return sb.toString();
+ }
+}
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/Patterns.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/Patterns.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/Patterns.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/Patterns.java Mon Feb 6 14:37:49 2017
@@ -71,10 +71,16 @@ public class Patterns
public final static Pattern BUNDLE_CONTEXT = Pattern.compile("Lorg/osgi/framework/BundleContext;");
// Pattern used to parse a field whose type is DependencyManager
- public final static Pattern DEPENDENCY_MANAGER = Pattern.compile("Lorg.apache.felix.dm.DependencyManager;");
+ public final static Pattern DEPENDENCY_MANAGER = Pattern.compile("Lorg/apache/felix/dm/DependencyManager;");
// Pattern used to parse a field whose type is Component
- public final static Pattern COMPONENT = Pattern.compile("Lorg.apache.felix.dm.Component;");
+ public final static Pattern COMPONENT = Pattern.compile("Lorg/apache/felix/dm/Component;");
+
+ // Pattern used to parse a field whose type is ServiceRegistration
+ public final static Pattern SERVICE_REGISTRATION = Pattern.compile("Lorg/osgi/framework/ServiceRegistration;");
+
+ // Pattern used to check if a method returns a Map
+ public final static Pattern METHOD_RETURN_MAP = Pattern.compile("\\(\\)Ljava/util/Map;");
/**
* Parses a class.
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd Mon Feb 6 14:37:49 2017
@@ -17,10 +17,10 @@
javac.source: 1.8
javac.target: 1.8
Bundle-Version: 1.0.0
--buildpath: \
+-buildpath: \
org.apache.felix.dependencymanager;version=latest,\
- osgi.core;version=4.2,\
- osgi.cmpn;version=4.2
+ osgi.core;version=6.0,\
+ osgi.cmpn;version=6.0
-sub: \
*.bnd
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd Mon Feb 6 14:37:49 2017
@@ -21,7 +21,9 @@
org.apache.felix.configadmin;version=1.8.8,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
- biz.aQute.junit;version=3.0.0
+ biz.aQute.junit;version=3.0.0,\
+ org.apache.felix.gogo.command,\
+ org.apache.felix.gogo.shell
-runee: JavaSE-1.8
-runvm: -ea
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd Mon Feb 6 14:37:49 2017
@@ -1,3 +1,19 @@
+#
+# 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.
+#
Private-Package: org.apache.felix.dm.itest.bundle2
Bundle-Activator: org.apache.felix.dm.itest.bundle2.Activator
Export-Package: org.apache.felix.dm.itest.bundle2
\ No newline at end of file
Added: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java?rev=1781908&view=auto
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java (added)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java Mon Feb 6 14:37:49 2017
@@ -0,0 +1,97 @@
+/*
+ * 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.dm.itest.api;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
+
+/**
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+public class AspectNotAlwaysInjectedWithRequiredDependencies extends TestBase {
+ final Ensure m_e = new Ensure();
+
+ public void testAspectNotAlwaysInjectedWithRequiredDependency() {
+ DependencyManager m = getDM();
+
+ Component orig = m.createComponent()
+ .setImplementation(new OriginalServiceImpl())
+ .setInterface(OriginalService.class.getName(), null);
+
+ Component aspect = m.createAspectService(OriginalService.class, null, 10)
+ .setImplementation(new Aspect());
+
+ m.add(orig);
+ m.add(aspect);
+
+ m_e.waitForStep(2, 5000);
+
+ Component aspectDep = m.createComponent()
+ .setImplementation(new AspectDependency())
+ .setInterface(AspectDependency.class.getName(), null);
+ m.add(aspectDep);
+ m_e.waitForStep(3, 5000);
+ ServiceDependency sd = m.createServiceDependency().setService(AspectDependency.class).setRequired(true).setCallbacks("add", "remove");
+ aspect.add(sd);
+ m_e.waitForStep(4, 5000);
+ aspect.remove(sd);
+ m_e.waitForStep(5, 5000);
+ m.remove(aspect);
+ m_e.waitForStep(6, 5000);
+ }
+
+ public interface OriginalService {}
+
+ public class OriginalServiceImpl implements OriginalService {
+ void start() {
+ m_e.step(1);
+ }
+ }
+
+ class AspectDependency {
+ void start() {
+ m_e.step(3);
+ }
+ }
+
+ public class Aspect implements OriginalService {
+ void add(AspectDependency dep) {
+ m_e.step(4);
+ }
+
+ void remove(AspectDependency dep) {
+ m_e.step(5);
+ }
+
+
+ void start() {
+ m_e.step(2);
+ }
+
+ void stop() {
+ m_e.step(6);
+ }
+ }
+
+}
+
+
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java Mon Feb 6 14:37:49 2017
@@ -21,17 +21,14 @@ package org.apache.felix.dm.itest.api;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Assert;
-
import org.apache.felix.dm.Component;
import org.apache.felix.dm.itest.util.Ensure;
import org.apache.felix.dm.itest.util.TestBase;
+import org.junit.Assert;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java Mon Feb 6 14:37:49 2017
@@ -20,10 +20,7 @@ package org.apache.felix.dm.itest.api;
import java.io.IOException;
import java.util.Dictionary;
-import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
import org.apache.felix.dm.itest.util.Ensure;
import org.junit.Assert;
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java Mon Feb 6 14:37:49 2017
@@ -121,7 +121,7 @@ public class FELIX5200_FactoryPidNotRest
m_conf = m_ca.createFactoryConfiguration(m_pid, null);
Properties props = new Properties();
props.setProperty("some", "properties");
- m_conf.update(props);
+ m_conf.update(toR6Dictionary(props));
}
catch (IOException e) {
Assert.fail("Could not create configuration: " + e.getMessage());
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java Mon Feb 6 14:37:49 2017
@@ -73,6 +73,7 @@ public class FELIX5428_CleanupDependenci
}
+ @SuppressWarnings("unused")
class Consumer {
final List<Provider> m_providers = new ArrayList<>();
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java Mon Feb 6 14:37:49 2017
@@ -18,17 +18,15 @@
*/
package org.apache.felix.dm.itest.api;
-import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
-import org.junit.Assert;
-
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.itest.util.Ensure;
import org.apache.felix.dm.itest.util.TestBase;
+import org.junit.Assert;
import org.osgi.service.cm.ConfigurationAdmin;
/**
@@ -53,7 +51,7 @@ public class FactoryConfigurationAdapter
m_ensure = new Ensure();
// Create a Configuration instance, which will create/update/remove a configuration for factoryPid "MyFactoryPid"
- ConfigurationCreator configurator = new ConfigurationCreator("MyFactoryPid", "key", "value1");
+ FactoryConfigurationCreator configurator = new FactoryConfigurationCreator(m_ensure, "MyFactoryPid", 1, "key", "value1");
Component s1 = m.createComponent()
.setImplementation(configurator)
.add(m.createServiceDependency()
@@ -105,55 +103,6 @@ public class FactoryConfigurationAdapter
m.clear();
}
- public static class ConfigurationCreator {
- private volatile ConfigurationAdmin m_ca;
- private String m_key;
- private String m_value;
- private org.osgi.service.cm.Configuration m_conf;
- private String m_factoryPid;
-
- public ConfigurationCreator(String factoryPid, String key, String value) {
- m_factoryPid = factoryPid;
- m_key = key;
- m_value = value;
- }
-
- public void start() {
- try {
- m_ensure.step(1);
- m_conf = m_ca.createFactoryConfiguration(m_factoryPid, null);
- Hashtable props = new Hashtable();
- props.put(m_key, m_value);
- m_conf.update(props);
- }
- catch (IOException e) {
- Assert.fail("Could not create configuration: " + e.getMessage());
- }
- }
-
- public void update(String key, String val) {
- Hashtable props = new Hashtable();
- props.put(key, val);
- try {
- m_conf.update(props);
- }
- catch (IOException e) {
- Assert.fail("Could not update configuration: " + e.getMessage());
- }
- }
-
- public void stop() {
- try
- {
- m_conf.delete();
- }
- catch (IOException e)
- {
- Assert.fail("Could not remove configuration: " + e.toString());
- }
- }
- }
-
public interface AdapterService {
public void doService();
}
Added: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java?rev=1781908&view=auto
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java (added)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java Mon Feb 6 14:37:49 2017
@@ -0,0 +1,80 @@
+package org.apache.felix.dm.itest.api;
+
+import java.io.IOException;
+import java.util.Hashtable;
+
+import org.apache.felix.dm.itest.util.Ensure;
+import org.junit.Assert;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+/*
+ * 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.
+ */
+public class FactoryConfigurationCreator {
+ private volatile ConfigurationAdmin m_ca;
+ private volatile org.osgi.service.cm.Configuration m_conf;
+ private final String m_key;
+ private final String m_value;
+ private final String m_factoryPid;
+ private final Ensure m_e;
+ private final int m_firstStep;
+
+ public FactoryConfigurationCreator(Ensure e, String factoryPid, int firstStep, String key, String value) {
+ m_factoryPid = factoryPid;
+ m_key = key;
+ m_value = value;
+ m_e = e;
+ m_firstStep = firstStep;
+ }
+
+ public void start() {
+ try {
+ m_e.step(m_firstStep);
+ m_conf = m_ca.createFactoryConfiguration(m_factoryPid, null);
+ Hashtable<String, Object> props = new Hashtable<>();
+ props.put(m_key, m_value);
+ m_conf.update(props);
+ }
+ catch (IOException e) {
+ Assert.fail("Could not create configuration: " + e.getMessage());
+ }
+ }
+
+ public void update(String key, String val) {
+ Hashtable<String, Object> props = new Hashtable<>();
+ props.put(key, val);
+ try {
+ m_conf.update(props);
+ }
+ catch (IOException e) {
+ Assert.fail("Could not update configuration: " + e.getMessage());
+ }
+ }
+
+ public void stop() {
+ try
+ {
+ m_conf.delete();
+ }
+ catch (IOException e)
+ {
+ Assert.fail("Could not remove configuration: " + e.toString());
+ }
+ }
+}
+
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java Mon Feb 6 14:37:49 2017
@@ -77,7 +77,7 @@ public class FactoryInjectedWithConfigur
m_conf = m_ca.getConfiguration(m_pid, null);
Properties props = new Properties();
props.setProperty("testkey", "testvalue");
- m_conf.update(props);
+ m_conf.update(toR6Dictionary(props));
}
catch (IOException e) {
Assert.fail("Could not create configuration: " + e.getMessage());
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java Mon Feb 6 14:37:49 2017
@@ -162,9 +162,23 @@ public class ResourceAdapterDependencyAd
case WAITING_FOR_REQUIRED:
System.out.println("WAITING_FOR_REQUIRED");
break;
- case TRACKING_OPTIONAL:
+ case STARTING:
+ System.out.println("STARTING");
+ break;
+ case STARTED:
+ System.out.println("STARTED");
+ break;
+ case TRACKING_OPTIONAL:
System.out.println("TRACKING_OPTIONAL");
break;
+ case STOPPING:
+ System.out.println("STOPING");
+ break;
+ case STOPPED:
+ System.out.println("STOPPED");
+ break;
+ default:
+ break;
}
}
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java Mon Feb 6 14:37:49 2017
@@ -23,18 +23,15 @@ import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-
import org.apache.felix.dm.Component;
import org.apache.felix.dm.ConfigurationDependency;
import org.apache.felix.dm.ServiceDependency;
import org.apache.felix.dm.itest.util.Ensure;
import org.apache.felix.dm.itest.util.TestBase;
+import org.junit.Assert;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationException;
Added: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java?rev=1781908&view=auto
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java (added)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java Mon Feb 6 14:37:49 2017
@@ -0,0 +1,111 @@
+/*
+ * 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.dm.itest.api;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
+import org.junit.Assert;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Use case:
+ *
+ * Client depends on Provider and holds the ServiceReference to it
+ * Provider is swapped with a Provider aspect
+ * Then Client and Aspect are stopped
+ *
+ * This tests verifies that the ServiceReference originally gotten by CLient to Provider is ungotten
+ */
+public class UngetAspectServiceTest extends TestBase {
+ final Ensure m_ensure = new Ensure();
+
+ public void testUngetSwappedService() {
+ DependencyManager m = getDM();
+
+ Client clientInstance = new Client();
+ Component client = m.createComponent()
+ .setImplementation(clientInstance)
+ .add(m.createServiceDependency().setService(Provider.class).setRequired(true).setCallbacks("bind", null, null, "swap"));
+
+ Component provider = m.createComponent()
+ .setImplementation(new ProviderImpl())
+ .setInterface(Provider.class.getName(), null);
+
+ Aspect aspectInstance = new Aspect();
+ Component aspect = m.createAspectService(Provider.class, null, 1)
+ .setImplementation(aspectInstance);
+
+ // add client, provider
+ m.add(client);
+ m.add(provider);
+
+ // wait for client to be bound to provider
+ m_ensure.waitForStep(1, 5000);
+
+ // add aspect
+ m.add(aspect);
+
+ // check for client to be swapped with aspect
+ m_ensure.waitForStep(2, 5000);
+
+ // remove client, and aspect
+ m.remove(client);
+ m.remove(aspect);
+
+ // Now, no more references should point to the provider
+ Assert.assertEquals(false, this.context.ungetService(clientInstance.getServiceRef()));
+ }
+
+ public interface Provider {
+ }
+
+ public class ProviderImpl implements Provider {
+ }
+
+ public class Aspect implements Provider {
+ private ServiceReference m_ref;
+
+ void bind(ServiceReference provider) {
+ m_ref = provider;
+ }
+
+ ServiceReference getRef() {
+ return m_ref;
+ }
+ }
+
+ public class Client {
+ ServiceReference m_Aref;
+
+ void bind(ServiceReference Aref, Provider provider) {
+ m_Aref = Aref;
+ m_ensure.step(1);
+ }
+
+ void swap(Provider old, Provider replace) {
+ m_ensure.step(2);
+ }
+
+ ServiceReference getServiceRef() {
+ return m_Aref;
+ }
+ }
+}
\ No newline at end of file
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java Mon Feb 6 14:37:49 2017
@@ -31,7 +31,7 @@ import org.apache.felix.dm.itest.util.Te
public class UngetServiceTest extends TestBase {
final Ensure m_ensure = new Ensure();
- public void testAbstractClassDependency() {
+ public void testUngetService() {
DependencyManager m = getDM();
Component service = m.createComponent()
@@ -51,7 +51,9 @@ public class UngetServiceTest extends Te
// The client has been removed and the service reference must have been ungotten.
ServiceReference ref = clientImpl.getServiceRef();
- Assert.assertEquals(false, this.context.ungetService(ref));
+ Assert.assertEquals(false, this.context.ungetService(ref));
+
+ m.remove(service);
}
public class Service {
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java?rev=1781908&r1=1781907&r2=1781908&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java Mon Feb 6 14:37:49 2017
@@ -20,19 +20,16 @@ package org.apache.felix.dm.itest.util;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.Dictionary;
import java.util.Hashtable;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-import junit.framework.TestCase;
-
import org.apache.felix.dm.Component;
import org.apache.felix.dm.ComponentExecutorFactory;
import org.apache.felix.dm.DependencyManager;
+import org.junit.Assert;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -44,6 +41,8 @@ import org.osgi.framework.ServiceReferen
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.log.LogService;
+import junit.framework.TestCase;
+
/**
* Base class for all integration tests.
*
@@ -212,6 +211,16 @@ public abstract class TestBase extends T
} catch (InterruptedException e) {
}
}
+
+ /**
+ * Helper method used to convert a dictionary which with untyped keys to a dictionary having a String key.
+ * (this method is useful when converting a Properties object into a compatible Dictionary<String, Object>
+ * object that is often needed in OSGI R6 API.
+ */
+ @SuppressWarnings("unchecked")
+ public static Dictionary<String, ?> toR6Dictionary(Dictionary<?,?> properties) {
+ return (Dictionary<String, ?>) properties;
+ }
public void log(int level, String message) {
checkError(level, null);