remove several warnings
- unused fields
- parameterized types
Change-Id: I4ddc3c373336686d37ddab887974c50870a6e9af
diff --git a/platform/northbound/sensinact-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/endpoint/test/NorthboundRequestHandlerTest.java b/platform/northbound/sensinact-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/endpoint/test/NorthboundRequestHandlerTest.java
index 7788a0d..92bb312 100644
--- a/platform/northbound/sensinact-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/endpoint/test/NorthboundRequestHandlerTest.java
+++ b/platform/northbound/sensinact-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/endpoint/test/NorthboundRequestHandlerTest.java
@@ -85,7 +85,7 @@
NorthboundRequestBuilder builder = handler.handle();
NorthboundRequest request = builder.build();
NorthboundEndpoint endpoint = new NorthboundEndpoint((NorthboundMediator) testContext.getMediator(), null);
- AccessMethodResponse response = endpoint.execute(request);
+ AccessMethodResponse<?> response = endpoint.execute(request);
String obj = response.getJSON();
System.out.println(obj);
diff --git a/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppManagerFactory.java b/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppManagerFactory.java
index 09760c8..c49f9c7 100644
--- a/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppManagerFactory.java
+++ b/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppManagerFactory.java
@@ -80,7 +80,7 @@
installResource.registerExecutor(new Signature(mediator, act, new Class[]{String.class, JSONObject.class}, null), installExecutor, AccessMethodExecutor.ExecutionPolicy.AFTER);
//installResource.getAccessMethod(act).invoke()
ResourceImpl uninstallResource = adminService.addActionResource(AppConstant.UNINSTALL, ActionResource.class);
- uninstallExecutor = new AppUninstallExecutor(mediator, this.serviceProvider, persistenceService);
+ uninstallExecutor = new AppUninstallExecutor(this.serviceProvider, persistenceService);
uninstallResource.registerExecutor(new Signature(mediator, act, new Class[]{String.class}, null), uninstallExecutor, AccessMethodExecutor.ExecutionPolicy.AFTER);
ResourceImpl resource = adminService.addDataResource(PropertyResource.class, AppConstant.KEYWORDS, JSONArray.class, null);
this.jsonSchemaListener = new AppJsonSchemaListener(mediator, resource);
diff --git a/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppUninstallExecutor.java b/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppUninstallExecutor.java
index 7eb0c80..153b66e 100644
--- a/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppUninstallExecutor.java
+++ b/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/internal/AppUninstallExecutor.java
@@ -14,7 +14,6 @@
import org.eclipse.sensinact.gateway.app.api.persistence.ApplicationPersistenceService;
import org.eclipse.sensinact.gateway.app.api.persistence.exception.ApplicationPersistenceException;
import org.eclipse.sensinact.gateway.app.api.persistence.listener.ApplicationAvailabilityListenerAbstract;
-import org.eclipse.sensinact.gateway.app.manager.osgi.AppServiceMediator;
import org.eclipse.sensinact.gateway.core.ServiceProviderImpl;
import org.eclipse.sensinact.gateway.core.method.AccessMethodExecutor;
import org.eclipse.sensinact.gateway.core.method.AccessMethodResponseBuilder;
@@ -28,7 +27,6 @@
*/
public class AppUninstallExecutor extends ApplicationAvailabilityListenerAbstract implements AccessMethodExecutor {
private static Logger LOG = LoggerFactory.getLogger(AppUninstallExecutor.class);
- private final AppServiceMediator mediator;
private final ServiceProviderImpl device;
private final ApplicationPersistenceService persistenceService;
@@ -37,8 +35,7 @@
*
* @param device the AppManager service provider
*/
- AppUninstallExecutor(AppServiceMediator mediator, ServiceProviderImpl device, ApplicationPersistenceService persistenceService) {
- this.mediator = mediator;
+ AppUninstallExecutor(ServiceProviderImpl device, ApplicationPersistenceService persistenceService) {
this.device = device;
this.persistenceService = persistenceService;
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceImpl.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceImpl.java
index 49da47d..52c15b8 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceImpl.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceImpl.java
@@ -187,7 +187,7 @@
AccessMethod.Type[] types = AccessMethod.Type.values();
for (; index < types.length; index++) {
- AccessMethod m = proxy.getAccessMethod(types[index].name());
+ AccessMethod<?, ?> m = proxy.getAccessMethod(types[index].name());
if (m != null && m.size() > 0) {
buffer.append(pos > 0 ? JSONUtils.COMMA : JSONUtils.EMPTY);
buffer.append(m.getDescription().getJSONDescription());
@@ -209,7 +209,7 @@
/**
* {@link AccessMethod}s of this {@link Resource}
*/
- protected final Map<AccessMethod.Type, AccessMethod> methods;
+ protected final Map<AccessMethod.Type, AccessMethod<?,?>> methods;
/**
* Path of registered {@link LinkedResourceImpl} referring to this resource
@@ -242,7 +242,7 @@
*/
protected ResourceImpl(ModelInstance<?> modelInstance, ResourceConfig resourceConfig, ServiceImpl service) {
super(modelInstance, service, UriUtils.getUri(new String[] { service.getPath(), resourceConfig.buildName(service.getName())}));
- this.methods = new HashMap<AccessMethod.Type, AccessMethod>();
+ this.methods = new HashMap<AccessMethod.Type, AccessMethod<?,?>>();
this.links = new ArrayList<String>();
this.resourceType = resourceConfig.getTypeConfig().getResourceImplementedInterface();
this.setUpdatePolicy(resourceConfig.getUpdatePolicy());
@@ -652,7 +652,7 @@
*
* @return the {@link AccessMethod} of this resource of the specified type
*/
- public AccessMethod getAccessMethod(AccessMethod.Type method) {
+ public AccessMethod<?, ?> getAccessMethod(AccessMethod.Type method) {
return this.methods.get(method);
}
@@ -671,12 +671,12 @@
* @throws InvalidConstraintDefinitionException
*/
@SuppressWarnings("unchecked")
- public AccessMethod registerExecutor(AccessMethod.Type type, Class<?>[] parameterTypes, String[] parameterNames,
+ public AccessMethod<?, ?> registerExecutor(AccessMethod.Type type, Class<?>[] parameterTypes, String[] parameterNames,
AccessMethodExecutor executor, AccessMethodExecutor.ExecutionPolicy policy)
throws InvalidValueException {
- AccessMethod method = this.getAccessMethod(type);
+ AccessMethod<?,?> method = this.getAccessMethod(type);
if (method != null)
- ((AbstractAccessMethod) method).addSignature(parameterTypes, parameterNames, executor, policy);
+ ((AbstractAccessMethod<?,?>) method).addSignature(parameterTypes, parameterNames, executor, policy);
return method;
}
@@ -694,11 +694,11 @@
* @throws InvalidConstraintDefinitionException
* @throws InvalidValueException
*/
- public AccessMethod registerExecutor(Signature signature, AccessMethodExecutor executor,
+ public AccessMethod<?,?> registerExecutor(Signature signature, AccessMethodExecutor executor,
AccessMethodExecutor.ExecutionPolicy policy) {
- AccessMethod method = this.getAccessMethod(AccessMethod.Type.valueOf(signature.getName()));
+ AccessMethod<?,?> method = this.getAccessMethod(AccessMethod.Type.valueOf(signature.getName()));
if (method != null) {
- ((AbstractAccessMethod) method).addSignature(signature, executor, policy);
+ ((AbstractAccessMethod<?,?>) method).addSignature(signature, executor, policy);
}
return method;
}
@@ -843,7 +843,7 @@
int index = 0;
int length = types == null ? 0 : types.length;
for (; index < length; index++) {
- AccessMethod method = this.methods.remove(types[index].name());
+ AccessMethod<?,?> method = this.methods.remove(types[index].name());
if (method != null) {
((AbstractAccessMethod) method).stop();
@@ -874,7 +874,7 @@
* @param method
* the {@link AccessMethod} to register
*/
- void registerMethod(AccessMethod.Type type, AccessMethod method) {
+ void registerMethod(AccessMethod.Type type, AccessMethod<?,?> method) {
if (this.methods.get(type) == null) {
this.methods.put(type, method);
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceProxy.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceProxy.java
index eec1e24..2734f4c 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceProxy.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ResourceProxy.java
@@ -30,7 +30,7 @@
/**
* {@link AccessMethod}s of this ResourceProxy
*/
- protected final Map<String, AccessMethod> methods;
+ protected final Map<String, AccessMethod<?,?>> methods;
/**
* Constructor
@@ -41,14 +41,14 @@
ResourceProxy(Mediator mediator, ResourceImpl resource, List<MethodAccessibility> methodAccessibilities) {
super(mediator, Resource.class, resource.getPath());
- Map<String, AccessMethod> methods = new HashMap<String, AccessMethod>();
+ Map<String, AccessMethod<?,?>> methods = new HashMap<String, AccessMethod<?,?>>();
AccessMethod.Type[] existingTypes = AccessMethod.Type.values();
int index = 0;
int length = existingTypes == null ? 0 : existingTypes.length;
for (; index < length; index++) {
- AccessMethod method = null;
+ AccessMethod<?,?> method = null;
if ((method = resource.getAccessMethod(existingTypes[index])) == null) {
continue;
}
@@ -61,11 +61,11 @@
methods.put(existingTypes[index].name(), method);
}
}
- this.methods = Collections.<String, AccessMethod>unmodifiableMap(methods);
+ this.methods = Collections.<String, AccessMethod<?,?>>unmodifiableMap(methods);
}
@Override
- public AccessMethod getAccessMethod(String type) {
+ public AccessMethod<?,?> getAccessMethod(String type) {
return this.methods.get(type);
}
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderProxy.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderProxy.java
index 09c5777..67f9100 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderProxy.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderProxy.java
@@ -29,7 +29,7 @@
}
@Override
- public AccessMethod getAccessMethod(String name) {
+ public AccessMethod<?,?> getAccessMethod(String name) {
return null;
}
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProxy.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProxy.java
index a63b2c4..9044bb1 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProxy.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProxy.java
@@ -34,7 +34,7 @@
/**
* {@link AccessMethod}s of this ModelElementProxy
*/
- protected final Map<String, AccessMethod> methods;
+ protected final Map<String, AccessMethod<?,?>> methods;
/**
* Constructor
@@ -45,11 +45,11 @@
*/
ServiceProxy(Mediator mediator, String path) throws InvalidServiceException {
super(mediator, Service.class, path);
- this.methods = new HashMap<String, AccessMethod>();
+ this.methods = new HashMap<String, AccessMethod<?,?>>();
}
@Override
- public AccessMethod getAccessMethod(String method) {
+ public AccessMethod<?,?> getAccessMethod(String method) {
return this.methods.get(method);
}
@@ -63,7 +63,7 @@
* @param method
* the {@link AccessMethod} to register
*/
- void registerMethod(String methodType, AccessMethod method) {
+ void registerMethod(String methodType, AccessMethod<?,?> method) {
if (this.methods.get(methodType) == null) {
this.methods.put(methodType, method);
}
@@ -150,7 +150,7 @@
registerMethod(AccessMethod.GET, getMethod);
} else {
- AccessMethod snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
+ AccessMethod<?,?> snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
AccessMethod.Type.valueOf(AccessMethod.GET));
registerMethod(AccessMethod.GET, snaMethod);
}
@@ -160,7 +160,7 @@
registerMethod(AccessMethod.SET, setMethod);
} else {
- AccessMethod snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
+ AccessMethod<?,?> snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
AccessMethod.Type.valueOf(AccessMethod.SET));
registerMethod(AccessMethod.SET, snaMethod);
}
@@ -170,7 +170,7 @@
registerMethod(AccessMethod.ACT, actMethod);
} else {
- AccessMethod snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
+ AccessMethod<?,?> snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
AccessMethod.Type.valueOf(AccessMethod.ACT));
registerMethod(AccessMethod.ACT, snaMethod);
}
@@ -191,7 +191,7 @@
registerMethod(AccessMethod.SUBSCRIBE, subscribeMethod);
} else {
- AccessMethod snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
+ AccessMethod<?,?> snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
AccessMethod.Type.valueOf(AccessMethod.SUBSCRIBE));
registerMethod(AccessMethod.SUBSCRIBE, snaMethod);
}
@@ -206,7 +206,7 @@
registerMethod(AccessMethod.UNSUBSCRIBE, unsubscribeMethod);
} else {
- AccessMethod snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
+ AccessMethod<?,?> snaMethod = new UnaccessibleAccessMethod(mediator, getPath(),
AccessMethod.Type.valueOf(AccessMethod.UNSUBSCRIBE));
registerMethod(AccessMethod.UNSUBSCRIBE, snaMethod);
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/UnaccessibleModelElementProxy.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/UnaccessibleModelElementProxy.java
index 10ed92a..6c27428 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/UnaccessibleModelElementProxy.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/UnaccessibleModelElementProxy.java
@@ -57,7 +57,7 @@
* @see SensiNactResourceModelElementProxy# getAccessMethod(AccessMethod.Type)
*/
@Override
- public AccessMethod getAccessMethod(String method) {
+ public AccessMethod<?,?> getAccessMethod(String method) {
return null;
}
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/AccessMethodDescription.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/AccessMethodDescription.java
index 4a7bea5..8790171 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/AccessMethodDescription.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/AccessMethodDescription.java
@@ -35,7 +35,7 @@
* @param method
* the {@link AccessMethod} to describe
*/
- protected AccessMethodDescription(AccessMethod method) {
+ protected AccessMethodDescription(AccessMethod<?, ?> method) {
this.signatures = method.getSignatures();
this.name = method.getName();
}
diff --git a/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestThirdPartyAccessToken.java b/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestThirdPartyAccessToken.java
index d0a24b8..e2e24d3 100644
--- a/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestThirdPartyAccessToken.java
+++ b/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestThirdPartyAccessToken.java
@@ -552,7 +552,6 @@
configuration.put("felix.log.level", "4");
}
- @SuppressWarnings("rawtypes")
@Disabled
@Test
public void testThirdPartyIdentityProvider(@InjectService Core core) throws Throwable {
@@ -577,7 +576,7 @@
Session session = core.getAnonymousSession();
assertNotNull(session);
- Set providers = session.serviceProviders();
+ Set<ServiceProvider> providers = session.serviceProviders();
System.out.println(providers);
assertTrue(providers.isEmpty());
diff --git a/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java b/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java
index fca3475..fd9b0b5 100644
--- a/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java
+++ b/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java
@@ -639,16 +639,16 @@
*/
public static <F> F getTheBestInstance(Class<F> clazz, Object[] parameters) {
F instance = null;
- Constructor[] constructors = clazz.getConstructors();
+ Constructor<?>[] constructors = clazz.getConstructors();
int index = constructors.length - 1;
//order constructors by decreasing arguments number
//to use the maximum number of passed parameters
for (; index >= 0; index--) {
int pos = index;
- Constructor current = constructors[index];
+ Constructor<?> current = constructors[index];
while (pos > 0) {
- Constructor previous = constructors[pos - 1];
+ Constructor<?> previous = constructors[pos - 1];
if (previous.getParameterTypes().length < current.getParameterTypes().length) {
constructors[pos] = previous;
constructors[pos - 1] = current;
