Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C2714200C13 for ; Mon, 6 Feb 2017 15:37:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C0D96160B49; Mon, 6 Feb 2017 14:37:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 196FF160B62 for ; Mon, 6 Feb 2017 15:37:54 +0100 (CET) Received: (qmail 74854 invoked by uid 500); 6 Feb 2017 14:37:54 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 74732 invoked by uid 99); 6 Feb 2017 14:37:54 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2017 14:37:54 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 16AF73A23EC for ; Mon, 6 Feb 2017 14:37:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1781908 [3/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... Date: Mon, 06 Feb 2017 14:37:51 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170206143753.16AF73A23EC@svn01-us-west.apache.org> archived-at: Mon, 06 Feb 2017 14:37:56 -0000 Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AdapterAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AdapterAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AdapterAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AdapterAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -32,6 +32,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class AdapterAnnotationTest extends TestBase { /** * Check if an adapter gets injected with its adaptee using default auto config mode. Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -32,6 +32,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class AspectAnnotationTest extends TestBase { public void testAspectChain() throws Throwable { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -30,9 +30,10 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class AspectLifecycleAnnotationTest extends TestBase { - public void testAnnotatedAspect() { + public void testAnnotatedAspect() { Ensure e = new Ensure(); // Provide the Sequencer server to the ServiceProvider service ServiceRegistration sr1 = register(e, ServiceProvider.ENSURE); Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -30,6 +30,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class AspectLifecycleWithDynamicProxyAnnotationTest extends TestBase { public void testAnnotatedAspect() { Ensure e = new Ensure(); Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -29,6 +29,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class BundleDependencyAnnotationTest extends TestBase { /** Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/CompositeAnnotationsTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/CompositeAnnotationsTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/CompositeAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/CompositeAnnotationsTest.java Mon Feb 6 14:37:49 2017 @@ -30,6 +30,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class CompositeAnnotationsTest extends TestBase { public void testComposite() { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ConfigurationProxyTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ConfigurationProxyTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ConfigurationProxyTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ConfigurationProxyTest.java Mon Feb 6 14:37:49 2017 @@ -28,6 +28,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class ConfigurationProxyTest extends TestBase { /** * Validates ServiceDependency method signatures. Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ExtraServicePropertiesTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ExtraServicePropertiesTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ExtraServicePropertiesTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ExtraServicePropertiesTest.java Mon Feb 6 14:37:49 2017 @@ -31,6 +31,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class ExtraServicePropertiesTest extends TestBase { /** Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FELIX5337Test.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FELIX5337Test.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FELIX5337Test.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FELIX5337Test.java Mon Feb 6 14:37:49 2017 @@ -27,6 +27,7 @@ import org.osgi.framework.ServiceRegistr /** * Test test validates that we can lookup ALL existing services using annotation, and "(objectClass=*)" filter. */ +@SuppressWarnings("rawtypes") public class FELIX5337Test extends TestBase { public void testCatchAllServicesUsingAnnotation() { Ensure e = new Ensure(); Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4050Test.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4050Test.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4050Test.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4050Test.java Mon Feb 6 14:37:49 2017 @@ -30,6 +30,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class Felix4050Test extends TestBase { public void testFelix4050() { Ensure e = new Ensure(); Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4357Test.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4357Test.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4357Test.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4357Test.java Mon Feb 6 14:37:49 2017 @@ -29,6 +29,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class Felix4357Test extends TestBase { public void testSingleProperty() { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix5236Test.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix5236Test.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix5236Test.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix5236Test.java Mon Feb 6 14:37:49 2017 @@ -29,6 +29,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class Felix5236Test extends TestBase { public void testPropertiesWithTypes() { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/InheritedAnnotationsTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/InheritedAnnotationsTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/InheritedAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/InheritedAnnotationsTest.java Mon Feb 6 14:37:49 2017 @@ -28,6 +28,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class InheritedAnnotationsTest extends TestBase { public void testInheritedAnnotation() throws Throwable { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MethodSignaturesTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MethodSignaturesTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MethodSignaturesTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MethodSignaturesTest.java Mon Feb 6 14:37:49 2017 @@ -28,6 +28,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class MethodSignaturesTest extends TestBase { /** * Validates ServiceDependency method signatures. Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java Mon Feb 6 14:37:49 2017 @@ -28,6 +28,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class MultipleAnnotationsTest extends TestBase { public void testMultipleAnnotations() { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/OptionalConfigurationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/OptionalConfigurationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/OptionalConfigurationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/OptionalConfigurationTest.java Mon Feb 6 14:37:49 2017 @@ -23,6 +23,7 @@ import org.apache.felix.dm.itest.util.Te import org.apache.felix.dm.runtime.itest.components.OptionalConfiguration; import org.osgi.framework.ServiceRegistration; +@SuppressWarnings("rawtypes") public class OptionalConfigurationTest extends TestBase { public void testOptionalConfig() throws Throwable { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PropagateAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PropagateAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PropagateAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PropagateAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -28,6 +28,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class PropagateAnnotationTest extends TestBase { public void testServiceDependencyPropagate() { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PublisherAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PublisherAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PublisherAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PublisherAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -32,6 +32,7 @@ import org.osgi.framework.ServiceRegistr /** * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class PublisherAnnotationTest extends TestBase { /** Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ResourceAnnotationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ResourceAnnotationTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ResourceAnnotationTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ResourceAnnotationTest.java Mon Feb 6 14:37:49 2017 @@ -28,6 +28,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class ResourceAnnotationTest extends TestBase { /** Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/SimpleAnnotationsTest.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/SimpleAnnotationsTest.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/SimpleAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/SimpleAnnotationsTest.java Mon Feb 6 14:37:49 2017 @@ -29,6 +29,7 @@ import org.osgi.framework.ServiceRegistr * * @author Felix Project Team */ +@SuppressWarnings("rawtypes") public class SimpleAnnotationsTest extends TestBase { public void testSimpleAnnotations() throws Throwable { Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd Mon Feb 6 14:37:49 2017 @@ -18,12 +18,10 @@ Bundle-Version: 4.0.4 -buildpath: \ osgi.core;version=4.2,\ osgi.cmpn;version=4.2,\ - org.apache.felix.dependencymanager;version=latest,\ - de.twentyeleven.skysail.org.json-osgi;version=20080701.0 + org.apache.felix.dependencymanager;version=latest Bundle-Activator:org.apache.felix.dm.runtime.Activator Private-Package: \ - org.apache.felix.dm.runtime,\ - org.json + org.apache.felix.dm.runtime Export-Package: \ org.apache.felix.dm.runtime.api Provide-Capability: osgi.extender; osgi.extender="org.apache.felix.dependencymanager.runtime";\ Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AbstractBuilder.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AbstractBuilder.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AbstractBuilder.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AbstractBuilder.java Mon Feb 6 14:37:49 2017 @@ -86,6 +86,13 @@ public abstract class AbstractBuilder if (componentField != null) { c.setAutoConfig(Component.class, componentField); + } + + // See if Service Registration must be auto configured + String registrationField = srvMeta.getString(Params.registrationField, null); + if (registrationField != null) + { + c.setAutoConfig(ServiceRegistration.class, registrationField); } // Now, if the component has a @Started annotation, then add our component state listener, Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AspectServiceBuilder.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AspectServiceBuilder.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AspectServiceBuilder.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AspectServiceBuilder.java Mon Feb 6 14:37:49 2017 @@ -74,17 +74,8 @@ public class AspectServiceBuilder extend } else { - if (added != null || changed != null || removed != null || swap != null) - { - c = dm.createAspectService(serviceInterface, serviceFilter, ranking, added, changed, removed, swap) - .setServiceProperties(aspectProperties); - } - else - { - c = dm.createAspectService(serviceInterface, serviceFilter, ranking) - .setServiceProperties(aspectProperties); - } - + c = dm.createAspectService(serviceInterface, serviceFilter, ranking, null, added, changed, removed, swap) + .setServiceProperties(aspectProperties); } setCommonServiceParams(c, srvMeta); Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java Mon Feb 6 14:37:49 2017 @@ -104,17 +104,18 @@ public class DependencyBuilder String autoConfigField = m_metaData.getString(Params.autoConfig, null); boolean required = "true".equals(m_metaData.getString(Params.required, "true")); boolean propagate = "true".equals(m_metaData.getString(Params.propagate, "false")); + boolean dereference = "true".equals(m_metaData.getString(Params.dereference, "true")); Dependency dp = createServiceDependency(dm, serviceClass, serviceFilter, defaultServiceImplClass, added, changed, - removed, autoConfigField, timeout, required, propagate); + removed, autoConfigField, timeout, required, propagate, dereference); return dp; } private Dependency createServiceDependency(DependencyManager dm, Class serviceClass, String serviceFilter, Class defaultServiceImplClass, String added, String changed, String removed, String autoConfigField, long timeout, boolean required, - boolean propagate) + boolean propagate, boolean dereference) { ServiceDependency sd = timeout != -1 ? dm.createTemporalServiceDependency(timeout) : dm.createServiceDependency(); @@ -134,6 +135,7 @@ public class DependencyBuilder } sd.setPropagate(propagate); + sd.setDereference(dereference); return sd; } Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DescriptorParser.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DescriptorParser.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DescriptorParser.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DescriptorParser.java Mon Feb 6 14:37:49 2017 @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import org.apache.felix.dm.DependencyManager; -import org.json.JSONObject; import org.osgi.framework.Bundle; /** @@ -51,15 +50,9 @@ public class DescriptorParser // The first line is a Service Component (a Service, an Aspect Service, etc ...) line = reader.readLine(); Log.instance().debug("DescriptorParser: parsing service %s", line); - JSONObject json = new JSONObject(line); - JSONMetaData serviceMetaData = new JSONMetaData(json); + JSONMetaData serviceMetaData = new JSONMetaData(line); - String type = (String) json.get("type"); - if (type == null) - { - throw new IllegalArgumentException("Invalid descriptor" - + ": no \"type\" parameter found in first line"); - } + String type = serviceMetaData.getString(Params.type); AbstractBuilder builder = m_builders.get(type); if (builder == null) @@ -73,8 +66,7 @@ public class DescriptorParser while ((line = reader.readLine()) != null) { Log.instance().debug("Parsing dependency %s", line); - JSONObject dep = new JSONObject(line); - serviceDependencies.add(new JSONMetaData(dep)); + serviceDependencies.add(new JSONMetaData(line)); } // and Invoke the builder Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java Mon Feb 6 14:37:49 2017 @@ -52,17 +52,11 @@ public class FactoryConfigurationAdapter Dictionary properties = srvMeta.getDictionary(Params.properties, null); boolean propagate = "true".equals(srvMeta.getString(Params.propagate, "false")); String configProxyClassName = srvMeta.getString(Params.configType, null); + Component c = null; - if (configProxyClassName != null) - { - Class configProxyClass = b.loadClass(configProxyClassName); - c = dm.createFactoryConfigurationAdapterService(factoryPid, updated, propagate, configProxyClass); - } - else - { - c = dm.createFactoryConfigurationAdapterService(factoryPid, updated, propagate); - } + Class configProxyClass = configProxyClassName != null ? b.loadClass(configProxyClassName) : null; + c = dm.createFactoryConfigurationAdapterService(factoryPid, updated, propagate, null, configProxyClass); c.setInterface(provides, properties); String factoryMethod = srvMeta.getString(Params.factoryMethod, null); Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java?rev=1781908&r1=1781907&r2=1781908&view=diff ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java (original) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java Mon Feb 6 14:37:49 2017 @@ -22,14 +22,11 @@ import java.lang.reflect.Array; import java.util.Dictionary; import java.util.HashMap; import java.util.Hashtable; -import java.util.Iterator; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; +import java.util.List; +import java.util.Map; /** - * Thsi class represents the parsed data found from meta-inf dependencymanager descriptors. + * This class represents the parsed data found from meta-inf dependencymanager descriptors. * * @author Felix Project Team */ @@ -65,65 +62,66 @@ public class JSONMetaData implements Met * } * } * - * @param jso the JSON object that corresponds to a dependency manager descriptor entry line. - * @throws JSONException + * @param input the JSON string that corresponds to a dependency manager descriptor entry line. + * @throws Exception */ @SuppressWarnings("unchecked") - public JSONMetaData(JSONObject jso) throws JSONException + public JSONMetaData(String input) throws Exception { - // Decode json object into our internal map. - Iterator it = jso.keys(); - while (it.hasNext()) - { - String key = it.next(); - Object value = jso.get(key); - if (value instanceof String) - { + JsonReader jreader = new JsonReader(input); + Map m = jreader.getParsed(); + + for (Map.Entry e : m.entrySet()) + { + String key = e.getKey(); + Object value = e.getValue(); + if (value instanceof String) + { m_metadata.put(key, value); - } - else if (value instanceof JSONArray) - { - m_metadata.put(key, decodeStringArray((JSONArray) value)); - } - else if (value instanceof JSONObject) - { - m_metadata.put(key, parseProperties((JSONObject) value)); - } + } else if (value instanceof List) + { + // String array + m_metadata.put(key, decodeStringArray((List) value)); + } else if (value instanceof Map) + { + // properties + m_metadata.put(key, parseProperties((Map) value)); + } } } - private Hashtable parseProperties(JSONObject properties) throws JSONException { + @SuppressWarnings("unchecked") + private Hashtable parseProperties(Map properties) throws Exception { Hashtable parsedProps = new Hashtable(); - @SuppressWarnings("unchecked") - Iterator it = properties.keys(); - while (it.hasNext()) - { - String key = it.next(); - Object value = properties.get(key); + + for (Map.Entry entry : properties.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + if (value instanceof String) { // This property type is a simple string - parsedProps.put(key, value); + parsedProps.put(key, value); } - else if (value instanceof JSONArray) + else if (value instanceof List) { // This property type is a simple string array - parsedProps.put(key, decodeStringArray((JSONArray) value)); + parsedProps.put(key, decodeStringArray((List) value)); } - else if (value instanceof JSONObject) + else if (value instanceof Map) { // This property type is a typed value, encoded as a JSONObject with two keys: "type"/"value" - JSONObject json = ((JSONObject) value); - String type = json.getString("type"); + Map json = ((Map) value); + String type = json.get("type").toString(); Object typeValue = json.get("value"); if (type == null) { - throw new JSONException("missing type attribute in json metadata for key " + key); + throw new Exception("missing type attribute in json metadata for key " + key); } if (typeValue == null) { - throw new JSONException("missing type value attribute in json metadata for key " + key); + throw new Exception("missing type value attribute in json metadata for key " + key); } Class typeClass; @@ -133,24 +131,25 @@ public class JSONMetaData implements Met } catch (ClassNotFoundException e) { - throw new JSONException("invalid type attribute (" + type + ") in json metadata for key " + throw new Exception("invalid type attribute (" + type + ") in json metadata for key " + key); } - if (typeValue instanceof JSONArray) + if (typeValue instanceof List) { - parsedProps.put(key, toPrimitiveTypeArray(typeClass, (JSONArray) typeValue)); + parsedProps.put(key, toPrimitiveTypeArray(typeClass, (List) typeValue)); } - else + else { parsedProps.put(key, toPrimitiveType(typeClass, typeValue.toString())); } } } + return parsedProps; } - private Object toPrimitiveType(Class type, String value) throws JSONException { + private Object toPrimitiveType(Class type, String value) throws Exception { if (type.equals(String.class)) { return value; @@ -189,71 +188,71 @@ public class JSONMetaData implements Met } else { - throw new JSONException("invalid type (" + type + ") attribute in json metadata"); + throw new Exception("invalid type (" + type + ") attribute in json metadata"); } } - private Object toPrimitiveTypeArray(Class type, JSONArray array) throws JSONException { - int len = array.length(); + private Object toPrimitiveTypeArray(Class type, List array) throws Exception { + int len = array.size(); Object result = Array.newInstance(type, len); if (type.equals(String.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, array.getString(i)); + Array.set(result, i, array.get(i).toString()); } } else if (type.equals(Long.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Long.valueOf(array.getString(i))); + Array.set(result, i, Long.valueOf(array.get(i).toString())); } } else if (type.equals(Double.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Double.valueOf(array.getString(i))); + Array.set(result, i, Double.valueOf(array.get(i).toString())); } } else if (type.equals(Float.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Float.valueOf(array.getString(i))); + Array.set(result, i, Float.valueOf(array.get(i).toString())); } } else if (type.equals(Integer.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Integer.valueOf(array.getString(i))); + Array.set(result, i, Integer.valueOf(array.get(i).toString())); } } else if (type.equals(Byte.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Byte.valueOf(array.getString(i))); + Array.set(result, i, Byte.valueOf(array.get(i).toString())); } } else if (type.equals(Character.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Character.valueOf((char) Integer.parseInt(array.getString(i)))); + Array.set(result, i, Character.valueOf((char) Integer.parseInt(array.get(i).toString()))); } } else if (type.equals(Boolean.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Boolean.valueOf(array.getString(i))); + Array.set(result, i, Boolean.valueOf(array.get(i).toString())); } } else if (type.equals(Short.class)) { for (int i = 0; i < len; i ++) { - Array.set(result, i, Short.valueOf(array.getString(i))); + Array.set(result, i, Short.valueOf(array.get(i).toString())); } } else { - throw new JSONException("invalid type (" + type + ") attribute in json metadata"); + throw new Exception("invalid type (" + type + ") attribute in json metadata"); } return result; } @@ -269,7 +268,7 @@ public class JSONMetaData implements Met clone.m_metadata = (HashMap) m_metadata.clone(); return clone; } - + public String getString(Params key) { Object value = m_metadata.get(key.toString()); @@ -465,18 +464,8 @@ public class JSONMetaData implements Met /** * Decodes a JSONArray into a String array (all JSON array values are supposed to be strings). */ - private String[] decodeStringArray(JSONArray array) throws JSONException + private String[] decodeStringArray(List array) { - String[] arr = new String[array.length()]; - for (int i = 0; i < array.length(); i++) - { - Object value = array.get(i); - if (!(value instanceof String)) - { - throw new IllegalArgumentException("JSON array is not an array of Strings: " + array); - } - arr[i] = value.toString(); - } - return arr; + return array.stream().map(x -> x.toString()).toArray(String[]::new); } } Added: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JsonReader.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JsonReader.java?rev=1781908&view=auto ============================================================================== --- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JsonReader.java (added) +++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JsonReader.java Mon Feb 6 14:37:49 2017 @@ -0,0 +1,290 @@ +/* + * 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.runtime; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Stack; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * A very small JSON parser. + * Code adapted from the org.apache.felix.serializer.impl.json.JsonParser.java, + * from the Apache Felix Converter proejct. + * + * The JSON input is parsed into an object structure in the following way: + *

Object names are represented as a {@link String}. + *
String values are represented as a {@link String}. + *
Numeric values without a decimal separator are represented as a {@link Long}. + *
Numeric values with a decimal separator are represented as a {@link Double}. + *
Boolean values are represented as a {@link Boolean}. + *
Nested JSON objects are parsed into a {@link java.util.Map Map<String, Object>}. + *
JSON lists are parsed into a {@link java.util.List} which may contain any of the above values. + *

+ */ +public class JsonReader { + private static final Pattern KEY_VALUE_PATTERN = Pattern.compile("^\\s*[\"](.+?)[\"]\\s*[:]\\s*(.+)$"); + + private enum Scope { QUOTE, CURLY, BRACKET; + static Scope getScope(char c) { + switch (c) { + case '"': + return QUOTE; + case '[': + case ']': + return BRACKET; + case '{': + case '}': + return CURLY; + default: + return null; + } + } + } + + static class Pair { + final K key; + final V value; + + Pair(K k, V v) { + key = k; + value = v; + } + } + + private final Map parsed; + + public JsonReader(CharSequence json) { + String str = json.toString(); + str = str.trim().replace('\n', ' '); + parsed = parseObject(str); + } + + public JsonReader(InputStream is) throws IOException { + this(readStreamAsString(is)); + } + + public Map getParsed() { + return parsed; + } + + private static Pair parseKeyValue(String jsonKeyValue) { + Matcher matcher = KEY_VALUE_PATTERN.matcher(jsonKeyValue); + if (!matcher.matches() || matcher.groupCount() < 2) { + throw new IllegalArgumentException("Malformatted JSON key-value pair: " + jsonKeyValue); + } + + return new Pair<>(matcher.group(1), parseValue(matcher.group(2))); + } + + private static Object parseValue(String jsonValue) { + jsonValue = jsonValue.trim(); + + switch (jsonValue.charAt(0)) { + case '\"': + if (!jsonValue.endsWith("\"")) + throw new IllegalArgumentException("Malformatted JSON string: " + jsonValue); + + return jsonValue.substring(1, jsonValue.length() - 1); + case '[': + List