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 2014/10/16 00:09:13 UTC
svn commit: r1632191 [1/4] - in
/felix/sandbox/pderop/dependencymanager-prototype:
org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/
org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/
org....
Author: pderop
Date: Wed Oct 15 22:09:11 2014
New Revision: 1632191
URL: http://svn.apache.org/r1632191
Log:
removed many eclipse warnings. Use generic parameters. Updated some javadocs.
Modified:
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleAdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleDependencyAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraAdapterServiceProperties.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraFactoryServiceProperties.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraServiceProperties.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FactoryConfigurationAdapterAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FactoryServiceTestWthPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/PropagateAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ResourceAdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ResourceAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ServiceFactoryAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ServiceTestWthPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FactoryConfigurationAdapterAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ServiceFactoryAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/TemporalAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/AbstractBuilder.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/FactorySet.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/SerialExecutor.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/ToggleServiceDependency.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Activator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Configurator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/DeviceImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/DeviceParameterImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/SpellChecker.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/Activator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/src/org/apache/felix/dm/shell/Activator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/src/org/apache/felix/dm/shell/DMCommand.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/test/test/DMCommandTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Component.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ComponentDeclaration.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Dependency.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyActivatorBase.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/FilterIndex.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/PropertyMetaData.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ResourceHandler.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ResourceUtil.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/ServiceDependency.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/AbstractDependency.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/DependencyContext.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Event.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/AbstractDecorator.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/AdapterServiceImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/AspectServiceImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleAdapterImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleEventImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationEventImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/DefaultNullObject.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/EventImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FieldUtil.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/InvocationUtil.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Logger.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceAdapterImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceEventImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceEventImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceUtil.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/metatype/ObjectClassDefinitionImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/AbstractCustomizerActionSet.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/AbstractTracked.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/test/ComponentTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/test/ConcurrencyTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/test/ConfigurationTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/test/ServiceRaceTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/test/test/TestBase.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java Wed Oct 15 22:09:11 2014
@@ -1158,7 +1158,7 @@ public class AnnotationCollector extends
* @param type the property type
* @throws JSONException
*/
- private void addProperty(JSONObject props, String name, Object value, Class type) throws JSONException {
+ private void addProperty(JSONObject props, String name, Object value, Class<?> type) throws JSONException {
if (value.getClass().isArray())
{
Object[] array = (Object[]) value;
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryWriter.java Wed Oct 15 22:09:11 2014
@@ -19,7 +19,6 @@
package org.apache.felix.dm.annotation.plugin.bnd;
import java.util.Arrays;
-import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -41,6 +41,7 @@ import org.apache.felix.dm.DependencyMan
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class AdapterWithModifiedInstanceBoundDependencyTest extends TestBase {
public static interface A {
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java Wed Oct 15 22:09:11 2014
@@ -39,6 +39,7 @@ import org.apache.felix.dm.DependencyMan
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class AdapterWithPropagationTest extends TestBase {
public static interface S1 {}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java Wed Oct 15 22:09:11 2014
@@ -1,5 +1,6 @@
package org.apache.felix.dm.itest;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
@@ -10,6 +11,7 @@ import org.apache.felix.dm.DependencyMan
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+@SuppressWarnings({"unchecked", "rawtypes", "unused"})
public class AspectBaseTest extends TestBase {
public void testSingleAspect() {
@@ -20,8 +22,10 @@ public class AspectBaseTest extends Test
// create a service provider and consumer
ServiceProvider p = new ServiceProvider(e, "a");
ServiceConsumer c = new ServiceConsumer(e);
+ Hashtable<String, Object> props = new Hashtable<>();
+ props.put("name", "a");
Component sp = m.createComponent()
- .setInterface(ServiceInterface.class.getName(), new Properties() {{ put("name", "a"); }})
+ .setInterface(ServiceInterface.class.getName(), props)
.setImplementation(p);
Component sc = m.createComponent()
.setImplementation(c)
@@ -54,6 +58,7 @@ public class AspectBaseTest extends Test
e.step(7);
}
+ @SuppressWarnings("serial")
public void testSingleAspectThatAlreadyExisted() {
DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
@@ -62,7 +67,7 @@ public class AspectBaseTest extends Test
// create a service provider and consumer
ServiceProvider p = new ServiceProvider(e, "a");
ServiceConsumer c = new ServiceConsumer(e);
- Component sp = m.createComponent().setImplementation(p).setInterface(ServiceInterface.class.getName(), new Properties() {{ put("name", "a"); }});
+ Component sp = m.createComponent().setImplementation(p).setInterface(ServiceInterface.class.getName(), new Hashtable() {{ put("name", "a"); }});
Component sc = m.createComponent().setImplementation(c).add(m.createServiceDependency().setService(ServiceInterface.class).setRequired(true).setCallbacks("add", "remove").setAutoConfig("m_service"));
Component sa = m.createAspectService(ServiceInterface.class, null, 20, null).setImplementation(ServiceAspect.class);
// we first add the aspect
@@ -94,6 +99,7 @@ public class AspectBaseTest extends Test
e.step(6);
}
+ @SuppressWarnings("serial")
public void testMultipleAspects() {
DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
@@ -101,8 +107,8 @@ public class AspectBaseTest extends Test
// create service providers and consumers
ServiceConsumer c = new ServiceConsumer(e);
- Component sp = m.createComponent().setImplementation(new ServiceProvider(e, "a")).setInterface(ServiceInterface.class.getName(), new Properties() {{ put("name", "a"); }});
- Component sp2 = m.createComponent().setImplementation(new ServiceProvider(e, "b")).setInterface(ServiceInterface.class.getName(), new Properties() {{ put("name", "b"); }});
+ Component sp = m.createComponent().setImplementation(new ServiceProvider(e, "a")).setInterface(ServiceInterface.class.getName(), new Hashtable() {{ put("name", "a"); }});
+ Component sp2 = m.createComponent().setImplementation(new ServiceProvider(e, "b")).setInterface(ServiceInterface.class.getName(), new Hashtable() {{ put("name", "b"); }});
Component sc = m.createComponent().setImplementation(c).add(m.createServiceDependency().setService(ServiceInterface.class).setRequired(true).setCallbacks("add", "remove"));
Component sa = m.createAspectService(ServiceInterface.class, null, 20, null).setImplementation(ServiceAspect.class);
Component sa2 = m.createAspectService(ServiceInterface.class, null, 10, null).setImplementation(ServiceAspect.class);
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java Wed Oct 15 22:09:11 2014
@@ -36,6 +36,7 @@ public class AspectChainTest extends Tes
}
static class ServiceProvider implements ServiceInterface {
+ @SuppressWarnings("unused")
private final Ensure m_ensure;
public ServiceProvider(Ensure e) {
m_ensure = e;
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java Wed Oct 15 22:09:11 2014
@@ -9,6 +9,7 @@ import org.apache.felix.dm.DependencyMan
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"rawtypes", "unchecked", "unused"})
public class AspectWhiteboardTest extends TestBase {
public void testWhiteboardConsumer() {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java Wed Oct 15 22:09:11 2014
@@ -19,6 +19,7 @@ import org.osgi.framework.ServiceRegistr
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
+@SuppressWarnings({"rawtypes", "unchecked", "unused"})
public class AspectWithPropagationTest extends TestBase {
private final static int ASPECTS = 3;
private final Set<Integer> _randoms = new HashSet<Integer>();
@@ -71,7 +72,7 @@ public class AspectWithPropagationTest e
m_invokeStep.step(1);
}
- void change(Map props, S s) {
+ void change(Map props, S s) {
switch (++m_changeCount) {
case 1:
Assert.assertEquals("aspect", props.get("p"));
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java Wed Oct 15 22:09:11 2014
@@ -1,8 +1,8 @@
package org.apache.felix.dm.itest;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -12,6 +12,7 @@ import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.Constants;
+@SuppressWarnings({"unchecked", "rawtypes"})
public class AutoConfigTest extends TestBase {
private final Ensure m_ensure = new Ensure();
@@ -116,7 +117,7 @@ public class AutoConfigTest extends Test
}
private Component createProvider(DependencyManager dm, int rank, Provider provider) {
- Properties props = new Properties();
+ Hashtable props = new Hashtable();
props.put(Constants.SERVICE_RANKING, new Integer(rank));
return dm.createComponent()
.setImplementation(provider)
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java Wed Oct 15 22:09:11 2014
@@ -7,9 +7,7 @@ import org.apache.felix.dm.DependencyMan
import org.osgi.framework.Bundle;
// TODO add more tests
-public class BundleAdapterTest extends TestBase {
- private final static String BSN = "org.apache.felix.metatype";
-
+public class BundleAdapterTest extends TestBase {
public void testBundleAdapter() {
DependencyManager m = getDM();
// create a bundle adapter service (one is created for each bundle)
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -36,8 +36,6 @@ public class BundleDependencyTest extend
public void testRequiredBundleDependency() {
DependencyManager m = getDM();
- // create a service provider and consumer
- Consumer c = new Consumer();
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java Wed Oct 15 22:09:11 2014
@@ -9,6 +9,7 @@ import junit.framework.Assert;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
+@SuppressWarnings({"unchecked", "rawtypes"})
public class ComponentTest extends TestBase {
private final Ensure m_ensure = new Ensure();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java Wed Oct 15 22:09:11 2014
@@ -30,6 +30,8 @@ public class ComponentTracker implements
case INACTIVE:
m_stopLatch.countDown();
break;
+
+ default:
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java Wed Oct 15 22:09:11 2014
@@ -56,6 +56,7 @@ public class CompositionTest extends Tes
static class ServiceConsumer {
private final Ensure m_ensure;
private ServiceConsumerComposite m_composite;
+ @SuppressWarnings("unused")
private ServiceInterface m_service;
public ServiceConsumer(Ensure e) {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -33,6 +33,7 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ManagedService;
+@SuppressWarnings({"unchecked", "rawtypes"})
public class ConfigurationDependencyTest extends TestBase {
final static String PID = "ConfigurationDependencyTest.pid";
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java Wed Oct 15 22:09:11 2014
@@ -27,6 +27,7 @@ import junit.framework.Assert;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
+@SuppressWarnings({"rawtypes"})
public class DynamicProxyAspectTest extends TestBase {
public void testImplementGenericAspectWithDynamicProxy() {
DependencyManager m = getDM();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -67,9 +67,7 @@ public class FELIX2078_ServiceDependency
}
static class ServiceProvider implements ServiceInterface {
- private final Ensure m_ensure;
public ServiceProvider(Ensure e) {
- m_ensure = e;
}
public void invoke() {
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java Wed Oct 15 22:09:11 2014
@@ -24,6 +24,7 @@ import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
+@SuppressWarnings("unused")
public class FELIX2344_ExtraDependencyWithAutoConfigTest extends TestBase {
/**
* Test if an auto config extra dependency is injected in the expected order.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java Wed Oct 15 22:09:11 2014
@@ -19,6 +19,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes", "unused"})
public class FELIX2348_ResourceAdapterTest extends TestBase {
public void testBasicResourceAdapter() throws Exception {
DependencyManager m = getDM();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -32,6 +32,7 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ManagedService;
+@SuppressWarnings("rawtypes")
public class FELIX2696_ConfigurationAndServiceDependencyTest extends TestBase {
final static String PID = "FELIX2696_ConfigurationAndServiceDependencyTest.pid";
@@ -77,6 +78,7 @@ public class FELIX2696_ConfigurationAndS
m_ensure = e;
}
+ @SuppressWarnings("unchecked")
public void init() {
try {
m_conf = m_ca.getConfiguration(PID, null);
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java Wed Oct 15 22:09:11 2014
@@ -121,7 +121,7 @@ public class FELIX2955_ShellCommandTest
"",
"");
m_ensure.step(7);
- };
+ }
};
t.start();
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java Wed Oct 15 22:09:11 2014
@@ -41,6 +41,7 @@ import org.osgi.service.cm.ManagedServic
* - S1 is then called in its updated callback
* - S2 is called in its "change" callback.
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class FELIX3337_UpdatedConfigurationDependencyWithPropagationTest extends TestBase {
/*
* This Pojo creates the configuration pid "test".
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java Wed Oct 15 22:09:11 2014
@@ -38,6 +38,7 @@ import org.apache.felix.dm.DependencyMan
*/
public class FELIX4361_ConcurrentComponentListingTest extends TestBase {
+ @SuppressWarnings("rawtypes")
public void testConcurrentGetComponentsManipulation() {
DependencyManager dm = getDM();
dm.add(dm.createComponent().setImplementation(Object.class));
@@ -55,6 +56,7 @@ public class FELIX4361_ConcurrentCompone
ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
Runnable readTask = new Runnable() {
+ @SuppressWarnings({ "rawtypes", "unused" })
public void run() {
while (isRunning.get()) {
try {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java Wed Oct 15 22:09:11 2014
@@ -4,7 +4,6 @@ import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
-import java.util.Properties;
import junit.framework.Assert;
@@ -12,6 +11,7 @@ import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.osgi.service.cm.ConfigurationAdmin;
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class FactoryConfigurationAdapterTest extends TestBase
{
private static Ensure m_ensure;
@@ -32,7 +32,7 @@ public class FactoryConfigurationAdapter
// Create an Adapter that will be instantiated, once the configuration is created.
// This Adapter provides an AdapterService, and depends on an AdapterExtraDependency service.
Component s2 = m.createFactoryConfigurationAdapterService("MyFactoryPid", "updated", true /* propagate CM settings */)
- .setInterface(AdapterService.class.getName(), new Properties() {{ put("foo", "bar"); }})
+ .setInterface(AdapterService.class.getName(), new Hashtable() {{ put("foo", "bar"); }})
.setImplementation(Adapter.class);
s2.add(m.createServiceDependency()
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java Wed Oct 15 22:09:11 2014
@@ -22,6 +22,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
public class FilterIndexResourceAdapterTest extends TestBase {
public void testBasicResourceAdapter() throws Exception {
System.setProperty("org.apache.felix.dependencymanager.filterindex", "objectClass");
@@ -59,6 +60,7 @@ public class FilterIndexResourceAdapterT
Assert.assertNotNull("resource not injected", m_resource);
m_ensure.step(2);
try {
+ @SuppressWarnings("unused")
InputStream in = m_resource.openStream();
}
catch (FileNotFoundException e) {
@@ -76,12 +78,10 @@ public class FilterIndexResourceAdapterT
static class ResourceProvider {
private volatile BundleContext m_context;
- private final Ensure m_ensure;
private final Map m_handlers = new HashMap();
private URL[] m_resources;
public ResourceProvider(Ensure ensure) throws MalformedURLException {
- m_ensure = ensure;
m_resources = new URL[] {
new URL("file://localhost/path/to/file1.txt")
};
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -19,8 +19,8 @@
package org.apache.felix.dm.itest;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
-import java.util.Properties;
import junit.framework.Assert;
@@ -32,6 +32,7 @@ import org.osgi.framework.ServiceReferen
/**
* This test does some injection tests on components being in INSTANTIATED_AND_WAITING_FOR_REQUIRED state.
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class InstanceBoundDependencyTest extends TestBase {
Ensure m_e;
@@ -46,7 +47,7 @@ public class InstanceBoundDependencyTest
m.add(c);
// Add S1 (s1_1): C.add(S1 s1) is called, then init() is called where a dependency is declared on S2
- Properties s1_1_props = new Properties();
+ Hashtable s1_1_props = new Hashtable();
s1_1_props.put("name", "s1_1");
s1_1_props.put(Constants.SERVICE_RANKING, new Integer(10));
S1Impl s1_1_impl = new S1Impl();
@@ -61,7 +62,7 @@ public class InstanceBoundDependencyTest
// At this point, MyComponent is in INSTANTIATED_AND_WAITING_FOR_REQUIRED state.
// add now add another higher ranked S1 (s1_2) instance. C.add(s1_2) method should be called (the S1 dependency
// is not instance bound), and m_s1 autoconfig field should be updated.
- Properties s1_2_props = new Properties();
+ Hashtable s1_2_props = new Hashtable();
s1_2_props.put(Constants.SERVICE_RANKING, new Integer(20));
s1_2_props.put("name", "s1_2");
S1Impl s1_2_impl = new S1Impl();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java Wed Oct 15 22:09:11 2014
@@ -27,6 +27,7 @@ import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
+@SuppressWarnings({"unchecked", "rawtypes"})
public class MultipleExtraDependenciesTest extends TestBase {
/**
* Check that list of extra dependencies (defined from init method) are handled properly.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -26,7 +26,7 @@ import org.apache.felix.dm.DependencyMan
/**
* Test which validates multi-dependencies combination.
*/
-
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class MultipleExtraDependencyTest extends TestBase {
public void testMultipleExtraDependencies()
{
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java Wed Oct 15 22:09:11 2014
@@ -18,20 +18,17 @@
*/
package org.apache.felix.dm.itest;
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.List;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceDependency;
-
-
/**
* Tests for extra dependencies which are declared from service's init method.
*/
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class MultipleExtraDependencyTest2 extends TestBase {
public void testMultipleExtraDependencies()
{
@@ -155,7 +152,6 @@ public class MultipleExtraDependencyTest
public void init(Component c)
{
DependencyManager m = c.getDependencyManager();
- List<ServiceDependency> l = new ArrayList<ServiceDependency>();
m_d1 = m.createServiceDependency()
.setService(Sequencer.class)
.setRequired(true)
@@ -205,7 +201,6 @@ public class MultipleExtraDependencyTest
{
System.out.println("ServiceProvider2.init");
DependencyManager m = c.getDependencyManager();
- List<ServiceDependency> l = new ArrayList<ServiceDependency>();
m_d1 = m.createServiceDependency()
.setService(Runnable.class, "(foo=bar)")
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -18,12 +18,13 @@
*/
package org.apache.felix.dm.itest;
-import java.util.Properties;
+import java.util.Hashtable;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.Constants;
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class MultipleServiceDependencyTest extends TestBase {
public void testMultipleServiceRegistrationAndConsumption() {
DependencyManager m = getDM();
@@ -31,7 +32,7 @@ public class MultipleServiceDependencyTe
Ensure e = new Ensure();
// create a service provider and consumer
Component provider = m.createComponent().setImplementation(new ServiceProvider(e)).setInterface(ServiceInterface.class.getName(), null);
- Component providerWithHighRank = m.createComponent().setImplementation(new ServiceProvider2(e)).setInterface(ServiceInterface.class.getName(), new Properties() {{ put(Constants.SERVICE_RANKING, Integer.valueOf(5)); }});
+ Component providerWithHighRank = m.createComponent().setImplementation(new ServiceProvider2(e)).setInterface(ServiceInterface.class.getName(), new Hashtable() {{ put(Constants.SERVICE_RANKING, Integer.valueOf(5)); }});
Component consumer = m.createComponent().setImplementation(new ServiceConsumer(e)).add(m.createServiceDependency().setService(ServiceInterface.class).setRequired(true));
m.add(provider);
m.add(providerWithHighRank);
@@ -117,8 +118,11 @@ public class MultipleServiceDependencyTe
private volatile ServiceInterface m_service;
private final Ensure m_ensure;
+ @SuppressWarnings("unused")
private void add(ServiceInterface service) { m_service = service; }
- private void remove(ServiceInterface service) { if (m_service == service) { m_service = null; }};
+
+ @SuppressWarnings("unused")
+ private void remove(ServiceInterface service) { if (m_service == service) { m_service = null; }}
public ServiceConsumer(Ensure e) { m_ensure = e; }
public void start() {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -1,6 +1,7 @@
package org.apache.felix.dm.itest;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
@@ -21,13 +22,14 @@ import org.osgi.framework.ServiceReferen
* - when we remove the dependency on provider2, then the consumer is not stopped.
* - when we remove the (instance-bound) dependency on provider3, then the consumer os not stopped.
*/
+@SuppressWarnings({"unchecked", "rawtypes", "unused"})
public class RemovedDependencyTest extends TestBase {
public void testRemoveDependencyAndConsumerMustRemainStarted() {
DependencyManager m = getDM();
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// Create two providers
- Properties props = new Properties();
+ Hashtable props = new Hashtable();
props.put("name", "provider1");
Component sp = m.createComponent().setImplementation(new ServiceProvider(e)).setInterface(ServiceInterface.class.getName(), props);
props = new Properties();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java Wed Oct 15 22:09:11 2014
@@ -20,6 +20,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes", "unused"})
public class ResourceAdapterDependencyAddAndRemoveTest extends TestBase {
public void testBasicResourceAdapter() throws Exception {
DependencyManager m = getDM();
@@ -238,6 +239,7 @@ public class ResourceAdapterDependencyAd
case INACTIVE:
System.out.println("stopped");
m_ensure.step(4);
+ default:
}
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java Wed Oct 15 22:09:11 2014
@@ -3,9 +3,9 @@ package org.apache.felix.dm.itest;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Properties;
import junit.framework.Assert;
@@ -21,6 +21,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes", "unused"})
public class ResourceAdapterDependencyAddAndRemoveTest2 extends TestBase {
public void testBasicResourceAdapter() throws Exception {
DependencyManager m = getDM();
@@ -29,15 +30,15 @@ public class ResourceAdapterDependencyAd
// create a resource provider
ResourceProvider provider = new ResourceProvider(e);
// activate it
- Properties props = new Properties();
- props.setProperty("id", "1");
+ Hashtable props = new Hashtable();
+ props.put("id", "1");
m.add(m.createComponent()
.setInterface(ServiceInterface.class.getName(), props)
.setImplementation(new ServiceProvider(e))
);
- props = new Properties();
- props.setProperty("id", "2");
+ props = new Hashtable();
+ props.put("id", "2");
m.add(m.createComponent()
.setInterface(ServiceInterface.class.getName(), props)
.setImplementation(new ServiceProvider(e))
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java Wed Oct 15 22:09:11 2014
@@ -19,6 +19,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes", "unused"})
public class ResourceAdapterTest extends TestBase {
public void testBasicResourceAdapter() throws Exception {
DependencyManager m = getDM();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -20,6 +20,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "rawtypes", "unused"})
public class ResourceDependencyTest extends TestBase {
public void testResourceDependency() {
DependencyManager m = getDM();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java Wed Oct 15 22:09:11 2014
@@ -29,6 +29,7 @@ import org.osgi.framework.ServiceReferen
/**
* Validates ServiceDependency service properties propagation.
*/
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class ServiceDependencyPropagateTest extends TestBase {
/**
* Checks that a ServiceDependency propagates the dependency service properties to the provided service properties.
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java Wed Oct 15 22:09:11 2014
@@ -22,6 +22,7 @@ import org.osgi.service.cm.Configuration
/**
* This test class simulates a client having many dependencies being registered/unregistered concurrently.
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class ServiceRaceTest extends TestBase {
volatile ConfigurationAdmin m_cm;
final static int STEP_WAIT = 5000;
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java Wed Oct 15 22:09:11 2014
@@ -27,6 +27,7 @@ import org.apache.felix.dm.tracker.Servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class ServiceTrackerTest extends TestBase {
public void testPlainServiceTracker() {
ServiceTracker st = new ServiceTracker(context, ServiceInterface.class.getName(), null);
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java Wed Oct 15 22:09:11 2014
@@ -5,6 +5,7 @@ import java.net.URL;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@@ -20,6 +21,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
public class ServiceUpdateTest extends TestBase {
public void testServiceUpdate() throws Exception {
final DependencyManager m = getDM();
@@ -49,8 +51,8 @@ public class ServiceUpdateTest extends T
// note that we can provide an actual implementation instance here because there will be only one
// adapter, normally you'd want to specify a Class here
CallbackInstance callbackInstance = new CallbackInstance(e);
- Properties serviceProps = new Properties();
- serviceProps.setProperty("number", "1");
+ Hashtable serviceProps = new Hashtable();
+ serviceProps.put("number", "1");
Component component = m.createResourceAdapterService("(&(path=/path/to/*.txt)(host=localhost))", false, callbackInstance, "changed")
.setImplementation(new ResourceAdapter(e))
.setInterface(ServiceInterface.class.getName(), serviceProps)
@@ -72,10 +74,8 @@ public class ServiceUpdateTest extends T
static class ResourceAdapter implements ServiceInterface {
protected URL m_resource; // injected by reflection.
- private Ensure m_ensure;
ResourceAdapter(Ensure e) {
- m_ensure = e;
}
public void invoke() {
@@ -86,12 +86,10 @@ public class ServiceUpdateTest extends T
static class ResourceProvider {
private volatile BundleContext m_context;
- private final Ensure m_ensure;
private final Map m_handlers = new HashMap();
private URL[] m_resources;
public ResourceProvider(Ensure ensure) throws MalformedURLException {
- m_ensure = ensure;
m_resources = new URL[] {
new URL("file://localhost/path/to/file1.txt")
};
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java Wed Oct 15 22:09:11 2014
@@ -142,7 +142,7 @@ public class ServiceUtil {
* @param exclude a list of properties to exclude, or <code>null</code> to show everything
* @return a string representation of the service properties
*/
- public static String propertiesToString(ServiceReference ref, List /* <String> */ exclude) {
+ public static String propertiesToString(ServiceReference ref, List<String> exclude) {
StringBuffer buf = new StringBuffer();
String[] keys = ref.getPropertyKeys();
for (int i = 0; i < keys.length; i++) {
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java Wed Oct 15 22:09:11 2014
@@ -8,6 +8,7 @@ import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceDependency;
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class TemporalServiceDependencyTest extends TestBase {
public void testServiceConsumptionAndIntermittentAvailability() {
final DependencyManager m = getDM();
@@ -92,7 +93,8 @@ public class TemporalServiceDependencyTe
Object consumer = new Object() {
volatile Runnable m_provider;
- void start() {
+ @SuppressWarnings("unused")
+ void start() {
try {
ensure.step(1);
m_provider.run();
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java Wed Oct 15 22:09:11 2014
@@ -66,7 +66,7 @@ public abstract class TestBase extends T
if (m_parallel) {
warn("Using threadpool ...");
m_threadPool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
- Hashtable props = new Hashtable();
+ Hashtable<String, Object> props = new Hashtable<>();
props.put("target", DependencyManager.THREADPOOL);
m_threadPoolRegistration = context.registerService(Executor.class.getName(), m_threadPool, props);
}
@@ -293,12 +293,14 @@ public abstract class TestBase extends T
}
}
+ @SuppressWarnings("unused")
protected void info(String msg, Object ... params) {
if (LOG_LEVEL >= LogService.LOG_INFO) {
log(LogService.LOG_INFO, params.length > 0 ? String.format(msg, params) : msg);
}
}
+ @SuppressWarnings("unused")
protected void debug(String msg, Object ... params) {
if (LOG_LEVEL >= LogService.LOG_DEBUG) {
log(LogService.LOG_DEBUG, params.length > 0 ? String.format(msg, params) : msg);
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterServiceTestWithPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterServiceTestWithPublisher.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterServiceTestWithPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterServiceTestWithPublisher.java Wed Oct 15 22:09:11 2014
@@ -33,6 +33,7 @@ import org.apache.felix.dm.itest.Ensure;
/**
* Test an AdapterService which provides its interface using a @ServiceLifecycle.
*/
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class AdapterServiceTestWithPublisher {
public static final String ENSURE = "AdapterServiceTestWithPublisher";
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleAdapterServiceTestWithPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleAdapterServiceTestWithPublisher.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleAdapterServiceTestWithPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleAdapterServiceTestWithPublisher.java Wed Oct 15 22:09:11 2014
@@ -34,6 +34,7 @@ import org.osgi.framework.Bundle;
/**
* Test a BundleAdapterService which provides its interface using a @ServiceLifecycle.
*/
+@SuppressWarnings({"unchecked", "rawtypes", "serial"})
public class BundleAdapterServiceTestWithPublisher {
public static final String ENSURE = "BundleAdapterServiceTestWithPublisher";
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleDependencyAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleDependencyAnnotation.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleDependencyAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleDependencyAnnotation.java Wed Oct 15 22:09:11 2014
@@ -18,8 +18,6 @@
*/
package org.apache.felix.dm.runtime.itest.components;
-import static org.apache.felix.dm.runtime.itest.components.Utils.DM_BSN;
-
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.annotation.api.BundleAdapterService;
import org.apache.felix.dm.annotation.api.BundleDependency;
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraAdapterServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraAdapterServiceProperties.java?rev=1632191&r1=1632190&r2=1632191&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraAdapterServiceProperties.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraAdapterServiceProperties.java Wed Oct 15 22:09:11 2014
@@ -32,6 +32,7 @@ import org.apache.felix.dm.itest.Ensure;
* This test validates that an adapter Service may specify some extra service properties
* from it's start callback
*/
+@SuppressWarnings({"rawtypes", "serial"})
public class ExtraAdapterServiceProperties {
public final static String ENSURE = "ExtraAdapterServiceProperties";