You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/11/24 10:45:56 UTC
svn commit: r1771109 - in
/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it:
ConfigInstallTest.java EventsDetector.java OsgiInstallerTestBase.java
Author: rombert
Date: Thu Nov 24 10:45:56 2016
New Revision: 1771109
URL: http://svn.apache.org/viewvc?rev=1771109&view=rev
Log:
installer.it: remove unchecked warnings
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java?rev=1771109&r1=1771108&r2=1771109&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java Thu Nov 24 10:45:56 2016
@@ -451,21 +451,21 @@ public class ConfigInstallTest extends O
public void testDeferredConfigRemove() throws Exception {
final AtomicInteger transformerCount = new AtomicInteger();
- final ServiceTracker st = new ServiceTracker(bundleContext,
- ResourceTransformer.class.getName(), new ServiceTrackerCustomizer() {
+ final ServiceTracker<ResourceTransformer, ResourceTransformer> st = new ServiceTracker<ResourceTransformer, ResourceTransformer>(bundleContext,
+ ResourceTransformer.class, new ServiceTrackerCustomizer<ResourceTransformer, ResourceTransformer>() {
@Override
- public void removedService(ServiceReference reference, Object service) {
+ public void removedService(ServiceReference<ResourceTransformer> reference, ResourceTransformer service) {
bundleContext.ungetService(reference);
transformerCount.decrementAndGet();
}
@Override
- public void modifiedService(ServiceReference reference, Object service) {
+ public void modifiedService(ServiceReference<ResourceTransformer> reference, ResourceTransformer service) {
}
@Override
- public Object addingService(ServiceReference reference) {
+ public ResourceTransformer addingService(ServiceReference<ResourceTransformer> reference) {
transformerCount.incrementAndGet();
return bundleContext.getService(reference);
}
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java?rev=1771109&r1=1771108&r2=1771109&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java Thu Nov 24 10:45:56 2016
@@ -33,7 +33,7 @@ import org.osgi.service.cm.Configuration
class EventsDetector implements FrameworkListener, BundleListener, ConfigurationListener, ServiceListener {
private long lastEvent;
- private final ServiceRegistration configReg;
+ private final ServiceRegistration<ConfigurationListener> configReg;
private final BundleContext ctx;
EventsDetector(BundleContext ctx) {
@@ -41,7 +41,7 @@ class EventsDetector implements Framewor
ctx.addBundleListener(this);
ctx.addFrameworkListener(this);
ctx.addServiceListener(this);
- configReg = ctx.registerService(ConfigurationListener.class.getName(), this, null);
+ configReg = ctx.registerService(ConfigurationListener.class, this, null);
}
void close() {
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1771109&r1=1771108&r2=1771109&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Thu Nov 24 10:45:56 2016
@@ -74,7 +74,7 @@ public class OsgiInstallerTestBase imple
public final static String JAR_EXT = ".jar";
private volatile int packageRefreshEventsCount;
- private volatile ServiceTracker configAdminTracker;
+ private volatile ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> configAdminTracker;
protected volatile OsgiInstaller installer;
@@ -102,11 +102,10 @@ public class OsgiInstallerTestBase imple
/**
* Helper method to get a service of the given type
*/
- @SuppressWarnings("unchecked")
protected <T> T getService(Class<T> clazz) {
- final ServiceReference ref = bundleContext.getServiceReference(clazz.getName());
+ final ServiceReference<T> ref = bundleContext.getServiceReference(clazz);
assertNotNull("getService(" + clazz.getName() + ") must find ServiceReference", ref);
- final T result = (T)(bundleContext.getService(ref));
+ final T result = bundleContext.getService(ref);
assertNotNull("getService(" + clazz.getName() + ") must find service", result);
return result;
}
@@ -120,7 +119,7 @@ public class OsgiInstallerTestBase imple
@Before
public void setup() {
- configAdminTracker = new ServiceTracker(bundleContext, ConfigurationAdmin.class.getName(), null);
+ configAdminTracker = new ServiceTracker<ConfigurationAdmin, ConfigurationAdmin>(bundleContext, ConfigurationAdmin.class, null);
configAdminTracker.open();
}
@@ -444,7 +443,7 @@ public class OsgiInstallerTestBase imple
final long waitUntil = System.currentTimeMillis() + (timeout * 1000L);
boolean isPresent;
do {
- result = (ConfigurationAdmin)configAdminTracker.getService();
+ result = configAdminTracker.getService();
isPresent = result != null;
if ( shouldBePresent == isPresent ) {
return result;