remove several warnings
- serialVersionUID
- param types
Change-Id: I1b85f28693acfd10de5a5ccaf2110a9eba502286
Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
diff --git a/platform/northbound/influxdb-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/influxdb/InfluxDBStorageAgent.java b/platform/northbound/influxdb-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/influxdb/InfluxDBStorageAgent.java
index cf1a1b0..0470895 100644
--- a/platform/northbound/influxdb-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/influxdb/InfluxDBStorageAgent.java
+++ b/platform/northbound/influxdb-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/influxdb/InfluxDBStorageAgent.java
@@ -114,7 +114,9 @@
this.database = this.connector.createIfNotExists(db);
InfluxDBHistoricProvider provider = new InfluxDBHistoricProvider(connector, db, this.measurement);
- this.mediator.register(new Hashtable<String, Object>(){{
+ this.mediator.register(new Hashtable<String, Object>(){
+ private static final long serialVersionUID = 1L;
+ {
this.put(STORAGE_HISTORY_PROVIDER, measurement);
}}, provider,new Class[] { HistoricProvider.class});
diff --git a/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/component/RestAccessConfigurator.java b/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/component/RestAccessConfigurator.java
index 2af7062..39932c9 100644
--- a/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/component/RestAccessConfigurator.java
+++ b/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/component/RestAccessConfigurator.java
@@ -96,7 +96,9 @@
this.corsHeader = Boolean.valueOf((String) this.mediator.getProperty(RestAccessConstants.CORS_HEADER));
if (this.corsHeader) {
this.corsFilter = new CorsFilter();
- mediator.register(RestAccessConfigurator.this.corsFilter, Filter.class, new Hashtable() {{
+ mediator.register(RestAccessConfigurator.this.corsFilter, Filter.class, new Hashtable<String,Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(Constants.SERVICE_RANKING, 1);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/*");
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");
@@ -105,7 +107,9 @@
}
this.mediator.register(
- new Hashtable() {{
+ new Hashtable<String,Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, RestAccessConstants.WS_ROOT);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");}},
new WebSocketServlet() {
@@ -160,21 +164,27 @@
new Class[]{ Servlet.class, WebSocketServlet.class });
LOG.info(String.format("%s servlet registered", RestAccessConstants.WS_ROOT));
- this.mediator.register(new HttpLoginEndpoint(mediator), Servlet.class, new Hashtable() {{
+ this.mediator.register(new HttpLoginEndpoint(mediator), Servlet.class, new Hashtable<String, Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, RestAccessConstants.LOGIN_ENDPOINT);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");
}
});
LOG.info(String.format("%s servlet registered", RestAccessConstants.LOGIN_ENDPOINT));
- mediator.register(new HttpRegisteringEndpoint(mediator), Servlet.class, new Hashtable() {{
+ mediator.register(new HttpRegisteringEndpoint(mediator), Servlet.class, new Hashtable<String, Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, RestAccessConstants.REGISTERING_ENDPOINT);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");
}
});
LOG.info(String.format("%s servlet registered", RestAccessConstants.REGISTERING_ENDPOINT));
- mediator.register(new HttpEndpoint(mediator), Servlet.class, new Hashtable() {{
+ mediator.register(new HttpEndpoint(mediator), Servlet.class, new Hashtable<String,Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, RestAccessConstants.HTTP_ROOT);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");
}
diff --git a/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/application/ApplicationService.java b/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/application/ApplicationService.java
index 54ff0cf..9e1fcdc 100644
--- a/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/application/ApplicationService.java
+++ b/platform/sensinact-application/application-manager/src/main/java/org/eclipse/sensinact/gateway/app/manager/application/ApplicationService.java
@@ -86,7 +86,9 @@
ResourceImpl uninstallLinkedResource = this.addLinkedActionResource(AppConstant.UNINSTALL, uninstallResource, false);
LinkedActMethod method = (LinkedActMethod) uninstallLinkedResource.getAccessMethod(act);
- method.createShortcut(new Signature(super.modelInstance.mediator(), act, new Class[]{String.class}, null), new Shortcut(super.modelInstance.mediator(), act, new Class[]{}, null, new HashMap<Integer, Parameter>() {{
+ method.createShortcut(new Signature(super.modelInstance.mediator(), act, new Class[]{String.class}, null), new Shortcut(super.modelInstance.mediator(), act, new Class[]{}, null, new HashMap<Integer, Parameter>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(0, new Parameter(ApplicationService.super.modelInstance.mediator(), "name", String.class, name));
}}));
ResourceImpl status = this.addDataResource(StateVariableResource.class, AppConstant.STATUS, ApplicationStatus.class, ApplicationStatus.INSTALLED);
diff --git a/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestComponentInstance.java b/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestComponentInstance.java
index 9853526..86a78ab 100644
--- a/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestComponentInstance.java
+++ b/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestComponentInstance.java
@@ -211,7 +211,7 @@
Mockito.when(mediator.callService(Mockito.eq(Core.class), Mockito.any(Executable.class))).then(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
- Object result = ((Executable) invocation.getArguments()[1]).execute(core);
+ Object result = ((Executable<Core, ?>) invocation.getArguments()[1]).execute(core);
return result;
}
});
diff --git a/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestLifeCycle.java b/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestLifeCycle.java
index ff6cbd6..8a0eb0d 100644
--- a/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestLifeCycle.java
+++ b/platform/sensinact-application/application-manager/src/test/java/org/eclipse/sensinact/gateway/app/manager/test/TestLifeCycle.java
@@ -71,6 +71,7 @@
assertTrue(result.equals(ApplicationStatus.valueOf("RESOLVING")));
status = ApplicationStatus.valueOf("RESOLVING");
result = (ApplicationStatus) trigger.execute(new AccessMethodResponseBuilder("AppManager/test/START", null) {
+ private static final long serialVersionUID = 1L;
@Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
@@ -86,7 +87,8 @@
status = ApplicationStatus.valueOf("ACTIVE");
result = (ApplicationStatus) trigger.execute(new AccessMethodResponseBuilder("AppManager/test/STOP", null) {
- @Override
+ private static final long serialVersionUID = 1L;
+ @Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
}
@@ -100,7 +102,9 @@
assertTrue(result.equals(ApplicationStatus.valueOf("INSTALLED")));
status = ApplicationStatus.valueOf("INSTALLED");
result = (ApplicationStatus) trigger.execute(new AccessMethodResponseBuilder("AppManager/test/UNINSTALL", null) {
- @Override
+ private static final long serialVersionUID = 1L;
+
+ @Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
}
@@ -119,7 +123,8 @@
AppLifecycleTrigger trigger = new AppLifecycleTrigger(service);
status = ApplicationStatus.valueOf("INSTALLED");
ApplicationStatus result = (ApplicationStatus) trigger.execute(new AccessMethodResponseBuilder("AppManager/test/START", null) {
- @Override
+ private static final long serialVersionUID = 1L;
+ @Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
}
@@ -138,6 +143,7 @@
assertTrue(result.equals(ApplicationStatus.valueOf("UNRESOLVED")));
status = ApplicationStatus.valueOf("UNRESOLVED");
result = (ApplicationStatus) trigger.execute(new AccessMethodResponseBuilder("AppManager/test/UNINSTALL", null) {
+ private static final long serialVersionUID = 1L;
@Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
@@ -156,6 +162,7 @@
public void testIncompatibleCycle() throws Exception {
AppLifecycleTrigger trigger = new AppLifecycleTrigger(service);
AccessMethodResponseBuilder snaMethodResult = new AccessMethodResponseBuilder("AppManager/test/STOP", null) {
+ private static final long serialVersionUID = 1L;
@Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
@@ -176,7 +183,9 @@
ApplicationStatus result = (ApplicationStatus) trigger.execute(snaMethodResult);
assertTrue(result.equals(ApplicationStatus.valueOf("INSTALLED")));
snaMethodResult = new AccessMethodResponseBuilder("AppManager/test/UNINSTALL", null) {
- @Override
+ private static final long serialVersionUID = 1L;
+
+ @Override
public AccessMethodResponse<?> createAccessMethodResponse(Status status) {
return null;
}
diff --git a/platform/sensinact-common/src/main/java/org/eclipse/sensinact/gateway/common/constraint/ConstraintFactory.java b/platform/sensinact-common/src/main/java/org/eclipse/sensinact/gateway/common/constraint/ConstraintFactory.java
index c68afda..8ca2918 100644
--- a/platform/sensinact-common/src/main/java/org/eclipse/sensinact/gateway/common/constraint/ConstraintFactory.java
+++ b/platform/sensinact-common/src/main/java/org/eclipse/sensinact/gateway/common/constraint/ConstraintFactory.java
@@ -42,9 +42,9 @@
if (!factory.handle(constraint)) {
factory = null;
- ServiceLoader serviceLoader = ServiceLoader.load(ConstraintFactory.class, classloader);
+ ServiceLoader<ConstraintFactory> serviceLoader = ServiceLoader.load(ConstraintFactory.class, classloader);
- Iterator iterator = serviceLoader.iterator();
+ Iterator<ConstraintFactory> iterator = serviceLoader.iterator();
while (iterator.hasNext()) {
factory = (ConstraintFactory) iterator.next();
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 52c15b8..e98999e 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
@@ -670,7 +670,6 @@
* @throws InvalidValueException
* @throws InvalidConstraintDefinitionException
*/
- @SuppressWarnings("unchecked")
public AccessMethod<?, ?> registerExecutor(AccessMethod.Type type, Class<?>[] parameterTypes, String[] parameterNames,
AccessMethodExecutor executor, AccessMethodExecutor.ExecutionPolicy policy)
throws InvalidValueException {
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/trigger/AccessMethodTrigger.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/trigger/AccessMethodTrigger.java
index d71c4d4..548ff61 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/trigger/AccessMethodTrigger.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/method/trigger/AccessMethodTrigger.java
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:christophe.munilla@cea.fr">Christophe Munilla</a>
*/
-public interface AccessMethodTrigger extends Executable, JSONable {
+public interface AccessMethodTrigger extends Executable<Object, Object>, JSONable {
/**
* handled {@link AccessMethodTrigger} types
*/
diff --git a/platform/sensinact-core/src/test/java/org/eclipse/sensinact/gateway/core/test/TestResourceBuilder.java b/platform/sensinact-core/src/test/java/org/eclipse/sensinact/gateway/core/test/TestResourceBuilder.java
index 1405085..a0f8b50 100644
--- a/platform/sensinact-core/src/test/java/org/eclipse/sensinact/gateway/core/test/TestResourceBuilder.java
+++ b/platform/sensinact-core/src/test/java/org/eclipse/sensinact/gateway/core/test/TestResourceBuilder.java
@@ -291,7 +291,9 @@
public String getJSON() {
return null;
}
- }, new HashSet<Constraint>() {{
+ }, new HashSet<Constraint>() {
+ private static final long serialVersionUID = 1L;
+ {
this.add(new Changed(true));
}});
@@ -654,6 +656,7 @@
new Class<?>[] { int.class }, new String[] { "count" }),
new Shortcut(this.testContext.getMediator(), AccessMethod.Type.valueOf(AccessMethod.ACT),
new Class<?>[0], new String[0], new HashMap<Integer, Parameter>() {
+ private static final long serialVersionUID = 1L;
{
this.put(0, new Parameter(TestResourceBuilder.this.testContext.getMediator(),
"count", int.class, 4));
diff --git a/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/ManagedBasisActivator.java b/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/ManagedBasisActivator.java
index b4c092e..d7211a8 100644
--- a/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/ManagedBasisActivator.java
+++ b/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/ManagedBasisActivator.java
@@ -60,7 +60,9 @@
};
super.mediator.register(
this.factory,
- ManagedServiceFactory.class, new Hashtable() {{this.put(Constants.SERVICE_PID, name());}}
+ ManagedServiceFactory.class, new Hashtable<String, Object>() {
+ private static final long serialVersionUID = 1L;
+ {this.put(Constants.SERVICE_PID, name());}}
);
}
diff --git a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke/MokeTask.java b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke/MokeTask.java
index 5481092..43a6db8 100644
--- a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke/MokeTask.java
+++ b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke/MokeTask.java
@@ -61,7 +61,9 @@
@Override
public Map<String, List<String>> getOptions() {
final String taskId = getTaskIdentifier();
- return new HashMap<String, List<String>>() {{
+ return new HashMap<String, List<String>>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put("taskId", Collections.<String>singletonList(taskId));
}};
}
diff --git a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke3/MokeTask.java b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke3/MokeTask.java
index 1919f8e..b746a45 100644
--- a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke3/MokeTask.java
+++ b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke3/MokeTask.java
@@ -60,7 +60,9 @@
@Override
public Map<String, List<String>> getOptions() {
final String taskId = getTaskIdentifier();
- return new HashMap<String, List<String>>() {{
+ return new HashMap<String, List<String>>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put("taskId", Collections.<String>singletonList(taskId));
}};
}
diff --git a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke4/MokeTask.java b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke4/MokeTask.java
index 9c17fe2..65938d9 100644
--- a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke4/MokeTask.java
+++ b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/tb/moke4/MokeTask.java
@@ -60,7 +60,9 @@
@Override
public Map<String, List<String>> getOptions() {
final String taskId = getTaskIdentifier();
- return new HashMap<String, List<String>>() {{
+ return new HashMap<String, List<String>>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put("taskId", Collections.<String>singletonList(taskId));
}};
}
diff --git a/platform/sensinact-remote-osgi/src/main/java/org/eclipse/sensinact/gateway/core/remote/SensinactCoreBase.java b/platform/sensinact-remote-osgi/src/main/java/org/eclipse/sensinact/gateway/core/remote/SensinactCoreBase.java
index 0c38db7..8b625c6 100644
--- a/platform/sensinact-remote-osgi/src/main/java/org/eclipse/sensinact/gateway/core/remote/SensinactCoreBase.java
+++ b/platform/sensinact-remote-osgi/src/main/java/org/eclipse/sensinact/gateway/core/remote/SensinactCoreBase.java
@@ -186,7 +186,7 @@
private Object[] createObjectArrayParamFromJSON(String parameters){
JSONArray parameterJSONArray = new JSONArray(parameters);
String[] parametersObjectArray = new String[parameterJSONArray.length()];
- Iterator it = parameterJSONArray.iterator();
+ Iterator<?> it = parameterJSONArray.iterator();
for(int x = 0;parameters != null && (x < parameters.length()) && it.hasNext();x++){
parametersObjectArray[x]=it.next().toString();
}
diff --git a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedAccessLevelDAO.java b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedAccessLevelDAO.java
index 1d92651..e79ca53 100644
--- a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedAccessLevelDAO.java
+++ b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedAccessLevelDAO.java
@@ -70,6 +70,7 @@
protected AuthenticatedAccessLevelEntity find(final long objectIdentifier, final String publicKey)
throws DAOException, DataStoreException {
List<AuthenticatedAccessLevelEntity> userAccessLevelEntities = super.select(new HashMap<String, Object>() {
+ private static final long serialVersionUID = 1L;
{
this.put("UOID", objectIdentifier);
this.put("PUBLIC_KEY", publicKey);
@@ -101,6 +102,7 @@
protected AuthenticatedAccessLevelEntity find(final long objectIdentifier, final long userIdentifier)
throws DAOException, DataStoreException {
List<AuthenticatedAccessLevelEntity> userAccessLevelEntities = super.select(new HashMap<String, Object>() {
+ private static final long serialVersionUID = 1L;
{
this.put("UOID", objectIdentifier);
this.put("UID", userIdentifier);
diff --git a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedDAO.java b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedDAO.java
index 7deb678..266642d 100644
--- a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedDAO.java
+++ b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AuthenticatedDAO.java
@@ -161,6 +161,7 @@
throw new DAOException(String.format("Unknown element at '%s'", path));
}
List<AuthenticatedEntity> authenticatedEntities = super.select(new HashMap<String, Object>() {
+ private static final long serialVersionUID = 1L;
{
this.put("OID", objectEntity.getIdentifier());
this.put("PUBLIC_KEY", publicKey);
diff --git a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/UserDAO.java b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/UserDAO.java
index 740954b..8138ff4 100644
--- a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/UserDAO.java
+++ b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/UserDAO.java
@@ -112,7 +112,8 @@
* @throws DataStoreException
*/
public UserEntity find(final String login, final String password) throws DAOException, DataStoreException {
- List<UserEntity> userEntities = super.select(new HashMap<String, Object>() {
+ List<UserEntity> userEntities = super.select(new HashMap<String,Object>() {
+ private static final long serialVersionUID = 1L;
{
this.put("SULOGIN", login);
this.put("SUPASSWORD", password);
diff --git a/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestDAO.java b/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestDAO.java
index a727aee..a6eb212 100644
--- a/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestDAO.java
+++ b/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestDAO.java
@@ -400,29 +400,13 @@
assertNull(newEntity);
AuthenticatedDAO authenticatedDAO = new AuthenticatedDAO(dataStoreService);
- List<AuthenticatedEntity> entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", lastIdentifier);
- }
- });
+ List<AuthenticatedEntity> entities = authenticatedDAO.select(Collections.singletonMap("OID", lastIdentifier));
assertTrue(entities.isEmpty());
- entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", otherIdentifier);
- }
- });
+ entities = authenticatedDAO.select(Collections.singletonMap("OID", otherIdentifier));
assertTrue(entities.isEmpty());
- entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", newIdentifier);
- }
- });
+ entities = authenticatedDAO.select(Collections.singletonMap("OID", newIdentifier));
assertTrue(entities.isEmpty());
- entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", identifier);
- }
- });
+ entities = authenticatedDAO.select(Collections.singletonMap("OID", identifier));
assertTrue(entities.isEmpty());
}
@@ -461,29 +445,14 @@
bundleDAO.delete(bundleEntity);
AuthenticatedDAO authenticatedDAO = new AuthenticatedDAO(dataStoreService);
- List<AuthenticatedEntity> entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", lastIdentifier);
- }
- });
+ List<AuthenticatedEntity> entities = authenticatedDAO.select(Collections.singletonMap("OID", lastIdentifier));
assertTrue(entities.isEmpty());
- entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", otherIdentifier);
- }
- });
+ entities = authenticatedDAO.select(Collections.singletonMap("OID", otherIdentifier));
assertTrue(entities.isEmpty());
- entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", newIdentifier);
- }
- });
+ entities = authenticatedDAO.select(Collections.singletonMap("OID", newIdentifier));
+
assertTrue(entities.isEmpty());
- entities = authenticatedDAO.select(new HashMap<String, Object>() {
- {
- this.put("OID", identifier);
- }
- });
+ entities = authenticatedDAO.select(Collections.singletonMap("OID", identifier));
assertTrue(entities.isEmpty());
}
}
diff --git a/platform/sensinact-security/sensinact-security-keybuilder/src/main/java/org/eclipse/sensinact/gateway/core/security/user/UserKeyBuilderFactoryImpl.java b/platform/sensinact-security/sensinact-security-keybuilder/src/main/java/org/eclipse/sensinact/gateway/core/security/user/UserKeyBuilderFactoryImpl.java
index 0c1a9a5..26d1336 100644
--- a/platform/sensinact-security/sensinact-security-keybuilder/src/main/java/org/eclipse/sensinact/gateway/core/security/user/UserKeyBuilderFactoryImpl.java
+++ b/platform/sensinact-security/sensinact-security-keybuilder/src/main/java/org/eclipse/sensinact/gateway/core/security/user/UserKeyBuilderFactoryImpl.java
@@ -35,7 +35,9 @@
@Override
public void newInstance(Mediator mediator) throws SecuredAccessException {
UserKeyBuilder<Credentials,Credentials> builder = new UserKeyBuilderImpl(mediator);
- mediator.register(new Hashtable() {{
+ mediator.register(new Hashtable<String,Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put("identityMaterial",Credentials.class.getCanonicalName());
}}, builder, new Class<?>[] { UserKeyBuilder.class });
}
diff --git a/platform/sensinact-security/sensinact-security-oauth2/src/main/java/org/eclipse/sensinact/gateway/security/oauth2/osgi/Activator.java b/platform/sensinact-security/sensinact-security-oauth2/src/main/java/org/eclipse/sensinact/gateway/security/oauth2/osgi/Activator.java
index 1cdc96e..27c549e 100644
--- a/platform/sensinact-security/sensinact-security-oauth2/src/main/java/org/eclipse/sensinact/gateway/security/oauth2/osgi/Activator.java
+++ b/platform/sensinact-security/sensinact-security-oauth2/src/main/java/org/eclipse/sensinact/gateway/security/oauth2/osgi/Activator.java
@@ -44,7 +44,9 @@
super.mediator.register(
new SecurityFilter(oidcServer, oidcServer),
Filter.class,
- new Hashtable() {{
+ new Hashtable<String, Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(Constants.SERVICE_RANKING, 0);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/sensinact/*");
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");}}
@@ -52,7 +54,9 @@
super.mediator.register(
new SecurityServlet(oidcServer, oidcServer),
Servlet.class,
- new Hashtable() {{
+ new Hashtable<String, Object>() {
+ private static final long serialVersionUID = 1L;
+ {
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/sensinact.auth");
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=default)");}}
);
diff --git a/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/mail/connector/MailAccountConnectorMoke.java b/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/mail/connector/MailAccountConnectorMoke.java
index 7d45177..5feb918 100644
--- a/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/mail/connector/MailAccountConnectorMoke.java
+++ b/platform/sensinact-security/sensinact-security-test/src/test/java/org/eclipse/sensinact/gateway/mail/connector/MailAccountConnectorMoke.java
@@ -111,7 +111,7 @@
}}, MailAccountConnectorMailReplacement.class, null);
ServiceRegistration<?> registration = this.mediator.getContext().registerService(
- new String[] {CallbackService.class.getCanonicalName()}, callback, new Hashtable() {{}});
+ new String[] {CallbackService.class.getCanonicalName()}, callback, new Hashtable<String, Object>() );
userUpdater.setRegistration(registration);
diff --git a/platform/southbound/http/http-android/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/android/Activator.java b/platform/southbound/http/http-android/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/android/Activator.java
index 1928e56..6597d06 100644
--- a/platform/southbound/http/http-android/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/android/Activator.java
+++ b/platform/southbound/http/http-android/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/android/Activator.java
@@ -66,7 +66,7 @@
public LocalProtocolStackEndpoint<DevGenPacket> connector;
- @SuppressWarnings({ "unchecked","serial"})
+ @SuppressWarnings({ "serial"})
@Override
public void doStart() {
findJettyClassLoader(super.mediator.getContext());
@@ -84,7 +84,7 @@
}
super.mediator.register(
- new Hashtable() {{
+ new Hashtable<String, Object>() {{
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/androidws");
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=org.eclipse.sensinact)");}},
new WebSocketServlet() {
@@ -139,7 +139,7 @@
);
LOG.info(String.format("%s servlet registered", "/androidws"));
- super.mediator.register(new IndexFilter("/android"), Filter.class, new Hashtable() {{
+ super.mediator.register(new IndexFilter("/android"), Filter.class, new Hashtable<String, Object>() {{
this.put(Constants.SERVICE_RANKING, 3);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/android");
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=org.eclipse.sensinact)");
@@ -147,7 +147,7 @@
});
LOG.info(String.format("%s filter registered", "/android"));
- super.mediator.register(new ResourceFilter(super.mediator), Filter.class, new Hashtable() {{
+ super.mediator.register(new ResourceFilter(super.mediator), Filter.class, new Hashtable<String, Object>() {{
this.put(Constants.SERVICE_RANKING, 2);
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/android/*");
this.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,"("+HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME+"=org.eclipse.sensinact)");
diff --git a/platform/southbound/mqtt/ttn-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/ttn/osgi/TtnActivator.java b/platform/southbound/mqtt/ttn-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/ttn/osgi/TtnActivator.java
index 3cef4bf..e3aec6d 100644
--- a/platform/southbound/mqtt/ttn-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/ttn/osgi/TtnActivator.java
+++ b/platform/southbound/mqtt/ttn-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/ttn/osgi/TtnActivator.java
@@ -75,7 +75,9 @@
.port(brokerPort)
.protocol(MqttBroker.Protocol.valueOf(brokerProtocol))
.authentication(authentication)
- .topics(new ArrayList<MqttTopic>() {{
+ .topics(new ArrayList<MqttTopic>() {
+ private static final long serialVersionUID = 1L;
+ {
add(activationTopic);
add(messageTopic);
}}).build();
diff --git a/platform/tools/mqtt-server/src/main/java/io/moquette/server/netty/SensinactNettyAcceptor.java b/platform/tools/mqtt-server/src/main/java/io/moquette/server/netty/SensinactNettyAcceptor.java
index 8652d47..f4d6aba 100644
--- a/platform/tools/mqtt-server/src/main/java/io/moquette/server/netty/SensinactNettyAcceptor.java
+++ b/platform/tools/mqtt-server/src/main/java/io/moquette/server/netty/SensinactNettyAcceptor.java
@@ -307,8 +307,8 @@
if (m_bossGroup == null) {
throw new IllegalStateException("Invoked close on an Acceptor that wasn't initialized");
}
- Future workerWaiter = m_workerGroup.shutdownGracefully();
- Future bossWaiter = m_bossGroup.shutdownGracefully();
+ Future<?> workerWaiter = m_workerGroup.shutdownGracefully();
+ Future<?> bossWaiter = m_bossGroup.shutdownGracefully();
try {
workerWaiter.await(100);
} catch (InterruptedException iex) {
diff --git a/platform/tools/sensinact-test/src/test/java/org/eclipse/sensinact/gateway/test/TestPolicy.java b/platform/tools/sensinact-test/src/test/java/org/eclipse/sensinact/gateway/test/TestPolicy.java
index 73eb2c0..e5ff3fb 100644
--- a/platform/tools/sensinact-test/src/test/java/org/eclipse/sensinact/gateway/test/TestPolicy.java
+++ b/platform/tools/sensinact-test/src/test/java/org/eclipse/sensinact/gateway/test/TestPolicy.java
@@ -25,7 +25,9 @@
private static final Permission ALL_PERMISSION = new AllPermission();
private static final PermissionCollection PERMISSION_COLLECTION = new PermissionCollection() {
- final Vector<Permission> v = new Vector<Permission>();
+
+ private static final long serialVersionUID = 1L;
+ final Vector<Permission> v = new Vector<Permission>();
@Override
public void add(Permission permission) {
