Author: pderop
Date: Thu Jun 22 22:25:19 2017
New Revision: 1799632
URL: http://svn.apache.org/viewvc?rev=1799632&view=rev
Log:
Removed compilation warnings.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexPerformanceTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java
Thu Jun 22 22:25:19 2017
@@ -53,8 +53,10 @@ public class DynamicCustomIndexTest exte
BundleContext context =
FrameworkUtil.getBundle(this.getClass()).getBundleContext();
m_systemConf =
context.getProperty(DependencyManager.SERVICEREGISTRY_CACHE_INDICES);
- // Reset filter indices
- DependencyManager dm = new DependencyManager(context);
+ // Reset filter indices (we must initialize DependencyManager, so its
static initializer will register
+ // the reset backdoor.
+ @SuppressWarnings("unused")
+ DependencyManager dm = new DependencyManager(context);
Consumer<String> reset = (Consumer<String>)
System.getProperties().get("org.apache.felix.dependencymanager.filterindex.reset");
reset.accept(null); // clear filter index
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java
Thu Jun 22 22:25:19 2017
@@ -56,7 +56,8 @@ public class StaticCustomIndexTest exten
super.setUp();
}
- public void tearDown() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void tearDown() throws Exception {
super.tearDown();
System.getProperties().remove(OPENED);
Consumer<String> reset = (Consumer<String>)
System.getProperties().get("org.apache.felix.dependencymanager.filterindex.reset");
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java
Thu Jun 22 22:25:19 2017
@@ -95,18 +95,22 @@ public class FELIX5630_NullObjectTest ex
private class A {
+ @SuppressWarnings("unused")
public void init() {
System.out.println("init");
}
+ @SuppressWarnings("unused")
public void start() {
System.out.println("start");
}
+ @SuppressWarnings("unused")
public void stop() {
System.out.println("stop");
}
+ @SuppressWarnings("unused")
public void destroy() {
System.out.println("destroy");
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java
Thu Jun 22 22:25:19 2017
@@ -77,7 +77,7 @@ public class FELIX5636_PropagateServiceP
}
public static class C {
- void bind(X x, Map props) {
+ void bind(X x, Map<String, Object> props) {
System.out.println("C.bind(" + x + ", " + props);
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Activator.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Activator.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Activator.java
Thu Jun 22 22:25:19 2017
@@ -20,7 +20,6 @@ package org.apache.felix.dm.impl;
import org.apache.felix.dm.ComponentExecutorFactory;
import org.apache.felix.dm.FilterIndex;
-import org.apache.felix.dm.impl.index.ServiceRegistryCache;
import org.apache.felix.dm.impl.index.ServiceRegistryCacheManager;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java
Thu Jun 22 22:25:19 2017
@@ -287,6 +287,7 @@ public class MultiPropertyFilterIndex im
return kvc;
}
+ @SuppressWarnings("unchecked")
public Object addingService(ServiceReference reference) {
BundleContext context;
synchronized (m_lock) {
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexPerformanceTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexPerformanceTest.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexPerformanceTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexPerformanceTest.java
Thu Jun 22 22:25:19 2017
@@ -43,6 +43,7 @@ public class MultiPropertyFilterIndexPer
}
+ @SuppressWarnings("rawtypes")
private void testPerformance(MultiPropertyFilterIndex filterIndex, int
runSize, String indexName) {
System.gc();
long start = System.currentTimeMillis();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java
Thu Jun 22 22:25:19 2017
@@ -31,6 +31,7 @@ import org.osgi.framework.ServiceReferen
public class MultiPropertyFilterIndexReferencedTest {
+ @SuppressWarnings("rawtypes")
@Test
public void noContext() {
MultiPropertyFilterIndex singleValueFilterIndex = new
MultiPropertyFilterIndex("objectClass,!context");
@@ -56,6 +57,7 @@ public class MultiPropertyFilterIndexRef
}
+ @SuppressWarnings("rawtypes")
@Test
public void noContextCid() {
MultiPropertyFilterIndex multiPropertyIndex_new = new
MultiPropertyFilterIndex("objectClass,cid,!context");
@@ -90,6 +92,7 @@ public class MultiPropertyFilterIndexRef
+ @SuppressWarnings("rawtypes")
@Test
public void singleKeyfilterIndex() {
MultiPropertyFilterIndex multiPropertyIndex = new
MultiPropertyFilterIndex("objectClass");
@@ -128,6 +131,7 @@ public class MultiPropertyFilterIndexRef
assertTrue(byClazzName.get(1).equals(ref3));
}
+ @SuppressWarnings("rawtypes")
@Test
public void propertyIndexWithDoubleNoPermutationKeys() {
String filterConfig =
"objectClass,#related-concept-absoluteidentifier,#context-concept-absoluteidentifier,StoreClass";
@@ -151,6 +155,7 @@ public class MultiPropertyFilterIndexRef
assertTrue(result_new.size() == 1);
}
+ @SuppressWarnings("rawtypes")
@Test
public void propertyIndexWithDoubleMultiProperty() {
String filterConfig =
"objectClass,related-concept-absoluteidentifier,context-concept-absoluteidentifier,StoreClass";
@@ -176,6 +181,7 @@ public class MultiPropertyFilterIndexRef
}
+ @SuppressWarnings("rawtypes")
@Test
public void MultiPropertyFilterIndexTypes() {
@@ -207,6 +213,7 @@ public class MultiPropertyFilterIndexRef
assertTrue(combi.size() == 1);
}
+ @SuppressWarnings("rawtypes")
@Test
public void MultiPropertyFilterIndexKeyGen() {
String key =
"(&(objectClass=org.acme.xyz.framework.internationalization.Translatable)(component-identifier=org.acme.xyz.framework.webui.engine.impl.CompoundProcessContextGroupingPanelFactory))";
@@ -230,6 +237,7 @@ public class MultiPropertyFilterIndexRef
}
+ @SuppressWarnings("rawtypes")
class TestReference implements ServiceReference {
Properties props = new Properties();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java?rev=1799632&r1=1799631&r2=1799632&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java
Thu Jun 22 22:25:19 2017
@@ -23,6 +23,7 @@ import java.util.Properties;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
+@SuppressWarnings("rawtypes")
class TestReference implements ServiceReference {
Properties props = new Properties();
