Author: [email protected]
Date: Tue Jan 24 14:45:13 2012
New Revision: 1988
Log:
Removed generics stuff from OSGi api.
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependencyService.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentService.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentServiceImpl.java
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
Tue Jan 24 14:45:13 2012
@@ -154,14 +154,14 @@
return getService(ConfigurationAdmin.class);
}
- private ConfigurationAdmin getConfigAdminService(ServiceReference<?> sr) {
+ private ConfigurationAdmin getConfigAdminService(ServiceReference sr) {
ConfigurationAdmin configurationAdmin = (ConfigurationAdmin)
m_bundleContext.getService(sr);
assertThat("ConfigurationAdmin service unavailable",
configurationAdmin, is(notNullValue()));
return configurationAdmin;
}
- private ServiceReference<?> getConfigAdminServiceRef() {
- ServiceReference<?> sr =
m_bundleContext.getServiceReference(ConfigurationAdmin.class.getName());
+ private ServiceReference getConfigAdminServiceRef() {
+ ServiceReference sr =
m_bundleContext.getServiceReference(ConfigurationAdmin.class.getName());
assertThat("ConfigurationAdmin serviceReference unavailable", sr,
is(notNullValue()));
return sr;
}
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
Tue Jan 24 14:45:13 2012
@@ -32,7 +32,6 @@
import java.util.Collection;
import java.util.List;
import java.util.Properties;
-import java.util.UUID;
import javax.inject.Inject;
@@ -131,7 +130,7 @@
* @return a service registration count, >= 0.
*/
private static int countAllServices(BundleContext context, Class<?>
service) {
- ServiceReference<?>[] serviceReferences = null;
+ ServiceReference[] serviceReferences = null;
try {
serviceReferences =
context.getAllServiceReferences(service.getName(), null);
}
@@ -278,7 +277,7 @@
Properties properties = createTenantConfiguration(tenantId);
updateTenantConfig(properties);
- ServiceReference<?>[] serviceRefs =
m_bundleContext.getServiceReferences(MyDependentService.class.getName(),
"(tenant_id=" + tenantId + ")");
+ ServiceReference[] serviceRefs =
m_bundleContext.getServiceReferences(MyDependentService.class.getName(),
"(tenant_id=" + tenantId + ")");
assertNull(serviceRefs);
}
@@ -295,7 +294,7 @@
Properties properties = createTenantConfiguration(tenantId);
updateTenantConfig(properties);
- ServiceReference<?> serviceRef =
m_bundleContext.getServiceReference(MyDependentService.class.getName());
+ ServiceReference serviceRef =
m_bundleContext.getServiceReference(MyDependentService.class.getName());
assertNotNull("Failed to obtain the MT-platform service?!",
serviceRef);
}
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependencyService.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependencyService.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependencyService.java
Tue Jan 24 14:45:13 2012
@@ -17,8 +17,9 @@
package org.amdatu.core.itest.tests.tenant.mock;
/**
+ * Provides a dependency for another service.
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
- *
*/
public interface MyDependencyService {
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentService.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentService.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentService.java
Tue Jan 24 14:45:13 2012
@@ -18,7 +18,7 @@
/**
- * Provides a "mock" multi-tenant aware service.
+ * Provides a "mock" multi-tenant aware service, that has a dependency on
another service.
*
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentServiceImpl.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentServiceImpl.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/mock/MyDependentServiceImpl.java
Tue Jan 24 14:45:13 2012
@@ -31,14 +31,13 @@
private volatile BundleContext m_bundleContext;
private volatile LogService m_logService;
- private ServiceReference<?> m_serviceReference;
+ private ServiceReference m_serviceReference;
/**
* Called by Felix DependencyManager upon starting this component!
*/
protected void start() throws Exception {
- ServiceReference<?>[] serviceReferences =
-
m_bundleContext.getServiceReferences(MyDependencyService.class.getName(), null);
+ ServiceReference[] serviceReferences =
m_bundleContext.getServiceReferences(MyDependencyService.class.getName(), null);
Assert.assertNotNull(serviceReferences);
Assert.assertEquals(1, serviceReferences.length);
@@ -60,7 +59,7 @@
* @param serviceRef
* @return
*/
- static String getMTServiceTag(ServiceReference<?> serviceRef, String id) {
+ static String getMTServiceTag(ServiceReference serviceRef, String id) {
StringBuilder sb = new StringBuilder("MTL:");
sb.append(id);
if (serviceRef != null) {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
