cosmetic : remove useless comments
diff --git a/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfiguration.java b/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfiguration.java
index d3c9556..6d96bb6 100644
--- a/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfiguration.java
+++ b/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfiguration.java
@@ -32,6 +32,7 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
@@ -71,6 +72,7 @@
final static Map<String,TrustManager[]> TRUST_MANAGERS = new HashMap<>();
final static Map<String, KeyManager[]> KEY_MANAGERS = new HashMap<>();
+
abstract class BooleanProvider {
abstract boolean init();
}
@@ -84,15 +86,17 @@
* @return an appropriate {@link HttpURLConnection} according
* to the specified {@link URL}'s protocol
*/
- public static <RESPONSE extends Response, REQUEST extends Request<RESPONSE>> HttpURLConnection build(ConnectionConfiguration<RESPONSE, REQUEST> config) throws IOException {
+ public static <RESPONSE extends Response, REQUEST extends Request<RESPONSE>> HttpURLConnection build(ConnectionConfiguration<RESPONSE, REQUEST> config)
+ throws IOException {
HttpURLConnection connection = null;
String uri = config.getUri();
- if (uri == null || uri.length() == 0) {
+ if (uri == null || uri.length() == 0)
return null;
- }
+
URL url = new URL(uri);
Proxy proxy = config.getProxy();
-
+ SSLContext sc = null;
+
if (url.getProtocol().toLowerCase().equals("https")) {
connection = (HttpsURLConnection) url.openConnection(proxy);
String host = url.getHost();
@@ -126,7 +130,8 @@
trusteds = null;
}
if(trusteds == null && TRUST_ALL.equals(serverCertificateStr)) {
- trusteds = new TrustManager[]{new X509TrustManager() {
+ trusteds = new TrustManager[]{
+ new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}
@@ -149,13 +154,13 @@
}
if(clientCertificate != null) {
try {
- InputStream is = clientCertificate.openStream();
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
- KeyStore ks = KeyStore.getInstance("PKCS12");
- ks.load(is,new char[] {});
- kmf.init(ks, new char[] {});
- keys = kmf.getKeyManagers();
- KEY_MANAGERS.put(host,keys);
+ InputStream is = clientCertificate.openStream();
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ KeyStore ks = KeyStore.getInstance("PKCS12");
+ ks.load(is,new char[] {});
+ kmf.init(ks, new char[] {});
+ keys = kmf.getKeyManagers();
+ KEY_MANAGERS.put(host,keys);
} catch(NoSuchAlgorithmException | CertificateException | KeyStoreException | IOException | UnrecoverableKeyException e) {
LOG.log(Level.SEVERE,e.getMessage(), e);
keys = null;
@@ -163,16 +168,16 @@
}
}
try {
- SSLContext sc = SSLContext.getInstance("TLS"); // "TLS" "SSL"
+ sc = SSLContext.getInstance("TLS"); // "TLS" "TLSv1.2" "SSL"
sc.init(keys, trusteds, null);
((HttpsURLConnection)connection).setSSLSocketFactory(sc.getSocketFactory());
} catch (Exception e) {
LOG.log(Level.SEVERE,e.getMessage(), e);
return null;
}
- } else {
+ } else
connection = (HttpURLConnection) url.openConnection(proxy);
- }
+
connection.setConnectTimeout(config.getConnectTimeout());
connection.setReadTimeout(config.getReadTimeout());
connection.setDoInput(true);
@@ -183,13 +188,13 @@
connection.setRequestMethod(config.getHttpMethod());
String contentType = null;
- if ((contentType = config.getContentType()) != null) {
+ if ((contentType = config.getContentType()) != null)
connection.setRequestProperty("Content-type", contentType);
- }
+
String acceptType = null;
- if ((acceptType = config.getAccept()) != null) {
+ if ((acceptType = config.getAccept()) != null)
connection.setRequestProperty("Accept", acceptType);
- }
+
String data = doOutput ? String.valueOf(content) : null;
Iterator<String> iterator = config.iterator();
@@ -198,10 +203,9 @@
connection.setRequestProperty(header, config.getHeaderAsString(header));
}
connection.connect();
-
- if (data != null) {
- IOUtils.write(data.getBytes(), connection.getOutputStream());
- }
+
+ if (data != null)
+ IOUtils.write(data.getBytes(), connection.getOutputStream());
return connection;
}
}
diff --git a/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfigurationImpl.java b/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfigurationImpl.java
index fd4a163..20874e5 100644
--- a/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfigurationImpl.java
+++ b/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/client/ConnectionConfigurationImpl.java
@@ -87,10 +87,6 @@
}
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#queryParameter(java.lang.String, java.lang.String)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> queryParameter(String key, String value) {
if (key != null && key.length() > 0 && value != null) {
@@ -99,20 +95,12 @@
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setUri(java.lang.String)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setUri(String uri) {
this.uri = uri;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getUri()
- */
@Override
public String getUri() {
if (!this.parameters.isEmpty()) {
@@ -134,77 +122,45 @@
return this.uri;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setContent(java.lang.Object)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setContent(Object content) {
this.content = content;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getContent()
- */
@Override
public Object getContent() {
return this.content;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setAccept(java.lang.String)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setAccept(String acceptType) {
this.acceptType = acceptType;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getAccept()
- */
@Override
public String getAccept() {
return this.acceptType;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setContentType(java.lang.String)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setContentType(String contentType) {
this.contentType = contentType;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getContentType()
- */
@Override
public String getContentType() {
return this.contentType;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setHttpMethod(java.lang.String)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setHttpMethod(String httpMethod) {
this.httpMethod = httpMethod;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getHttpMethod()
- */
@Override
public String getHttpMethod() {
if (this.httpMethod == null) {
@@ -213,20 +169,12 @@
return this.httpMethod;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setConnectTimeout(int)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setConnectTimeout(int connectTimeout) {
this.connectTimeout = connectTimeout;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getConnectTimeout()
- */
@Override
public int getConnectTimeout() {
if (this.connectTimeout <= 0) {
@@ -235,20 +183,12 @@
return this.connectTimeout;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setReadTimeout(int)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setReadTimeout(int readTimeout) {
this.readTimeout = readTimeout;
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#getReadTimeout()
- */
@Override
public int getReadTimeout() {
if (this.readTimeout <= 0) {
@@ -257,20 +197,12 @@
return this.readTimeout;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setProxyHost(java.lang.String)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setProxyHost(String proxyHost) {
this.proxyConfiguration.setProxyHost(proxyHost);
return this;
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#setProxyPort(int)
- */
@Override
public ConnectionConfigurationImpl<RESPONSE, REQUEST> setProxyPort(int proxyPort) {
this.proxyConfiguration.setProxyPort(proxyPort);
@@ -297,32 +229,16 @@
return this.clientCertificate;
}
-
- /**
- * Returns a new {@link Proxy} instance using
- * the retrieved proxy's host and port
- * configuration
- *
- * @return a new {@link Proxy} instance
- */
@Override
public Proxy getProxy() {
return this.proxyConfiguration.getProxy();
}
- /**
- * @inheritDoc
- * @see ConnectionConfiguration#connect()
- */
@Override
public HttpURLConnection connect() throws IOException {
return ConnectionConfiguration.HttpURLConnectionBuilder.build(this);
}
- /**
- * @inheritDoc
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
diff --git a/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/server/Content.java b/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/server/Content.java
index ee9c090..058dc88 100644
--- a/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/server/Content.java
+++ b/platform/protocol/http/src/main/java/org/eclipse/sensinact/gateway/protocol/http/server/Content.java
@@ -16,6 +16,7 @@
*
*/
public interface Content extends Headers {
+
byte[] getContent();
void setContent(byte[] content);
diff --git a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractMutableSnaDAO.java b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractMutableSnaDAO.java
index 0554ef9..c7212b2 100644
--- a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractMutableSnaDAO.java
+++ b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractMutableSnaDAO.java
@@ -42,18 +42,12 @@
* @param entityType
* @throws DAOException
*/
- AbstractMutableSnaDAO(Mediator mediator, Class<E> entityType, DataStoreService dataStoreService)
- throws DAOException {
+ AbstractMutableSnaDAO(Mediator mediator, Class<E> entityType, DataStoreService dataStoreService) throws DAOException {
super(mediator, entityType, dataStoreService);
if (this.entityType.getAnnotation(Immutable.class) != null)
throw new DAOException("Mutable type expected");
}
- /**
- * @inheritDoc
- *
- * @see AbstractSnaDAO# created(SnaEntity, java.lang.Long)
- */
@Override
void created(E entity, long identifier) {
if (entity == null || identifier < 0) {
@@ -68,21 +62,11 @@
}
}
- /**
- * @inheritDoc
- *
- * @see AbstractSnaDAO# updated(java.lang.Integer)
- */
@Override
void updated(int records) {
super.mediator.debug("%s %s record(s) updated in the datastore", records, entityType.getSimpleName());
}
- /**
- * @inheritDoc
- *
- * @see AbstractSnaDAO# deleted(java.lang.Integer)
- */
@Override
void deleted(int records) {
super.mediator.debug("%s %s record(s) deleted in the datastore", records, entityType.getSimpleName());
diff --git a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractSnaDAO.java b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractSnaDAO.java
index 7d29699..528be9b 100644
--- a/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractSnaDAO.java
+++ b/platform/sensinact-security/sensinact-security-core/src/main/java/org/eclipse/sensinact/gateway/core/security/dao/AbstractSnaDAO.java
@@ -324,12 +324,6 @@
return entitiesList;
}
- /**
- * @throws DataStoreException
- * @inheritDoc
- *
- * @see SnaDAO#select(java.util.Map)
- */
@Override
public E select(List<SnaEntity.Key> keyMap) throws DAOException, DataStoreException {
KeyDirective keyDirective = KeyDirective.createKeyDirective(mediator, entityType);
@@ -435,24 +429,12 @@
return entitiesList;
}
- /**
- * @throws DataStoreException
- * @inheritDoc
- *
- * @see SnaDAO#select()
- */
@Override
public List<E> select() throws DAOException, DataStoreException {
List<E> entities = this.getEntities(this.entityType);
return entities;
}
- /**
- * @throws DataStoreException
- * @inheritDoc
- *
- * @see SnaDAO# create(SnaEntity)
- */
@Override
public void create(E entity) throws DAOException, DataStoreException {
CreateDirective createDirective = CreateDirective.getCreateDirective(this.mediator, entity);
@@ -460,24 +442,12 @@
this.created(entity, this.create(createDirective.toString()));
}
- /**
- * @throws DataStoreException
- * @inheritDoc
- *
- * @see SnaDAO# update(SnaEntity)
- */
@Override
public void update(E entity) throws DAOException, DataStoreException {
UpdateDirective updateDirective = UpdateDirective.getUpdateDirective(this.mediator, entity);
this.updated(this.update(updateDirective.toString()));
}
- /**
- * @throws DataStoreException
- * @inheritDoc
- *
- * @see SnaDAO# delete(SnaEntity)
- */
@Override
public void delete(E entity) throws DAOException, DataStoreException {
DeleteDirective deleteDirective = DeleteDirective.getDeleteDirective(this.mediator, entity);
diff --git a/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/annotation/KeyValuePair.java b/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/annotation/KeyValuePair.java
index 9d900ca..97de3ba 100644
--- a/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/annotation/KeyValuePair.java
+++ b/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/annotation/KeyValuePair.java
@@ -23,7 +23,10 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PARAMETER)
public @interface KeyValuePair {
+
String key();
String value();
+
+ String operator() default "=";
}
diff --git a/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/smpl/SimpleHttpProtocolStackEndpoint.java b/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/smpl/SimpleHttpProtocolStackEndpoint.java
index 14845fd..bb7719a 100644
--- a/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/smpl/SimpleHttpProtocolStackEndpoint.java
+++ b/platform/southbound/http/http-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/smpl/SimpleHttpProtocolStackEndpoint.java
@@ -10,6 +10,18 @@
*/
package org.eclipse.sensinact.gateway.sthbnd.http.smpl;
+import java.io.IOException;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.xml.parsers.ParserConfigurationException;
+
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
import org.eclipse.sensinact.gateway.core.ResourceConfig;
import org.eclipse.sensinact.gateway.generic.ExtModelConfiguration;
@@ -24,24 +36,12 @@
import org.eclipse.sensinact.gateway.sthbnd.http.annotation.SimpleHttpTask;
import org.eclipse.sensinact.gateway.sthbnd.http.task.HttpChainedTask;
import org.eclipse.sensinact.gateway.sthbnd.http.task.HttpChainedTasks;
-import org.eclipse.sensinact.gateway.sthbnd.http.task.HttpDiscoveryTask;
import org.eclipse.sensinact.gateway.sthbnd.http.task.HttpTask;
import org.eclipse.sensinact.gateway.sthbnd.http.task.HttpTaskImpl;
import org.eclipse.sensinact.gateway.util.ReflectUtils;
import org.eclipse.sensinact.gateway.util.UriUtils;
import org.xml.sax.SAXException;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Timer;
-import java.util.TimerTask;
-
/**
* @author <a href="mailto:christophe.munilla@cea.fr">Christophe Munilla</a>
*/
@@ -178,11 +178,7 @@
this.recurrences.add(executor);
}
- /**
- * @inheritDoc
- * @see ProtocolStackEndpoint#
- * connect(ExtModelConfiguration)
- */
+ @Override
public void connect(ExtModelConfiguration manager) throws InvalidProtocolStackException {
super.connect(manager);
@@ -264,18 +260,14 @@
}
HttpTask<?, ?> task = super.wrap(HttpTask.class, ReflectUtils.getInstance(this.getTaskType(command), new Object[]{mediator, command, this, SimpleHttpRequest.class, path, profileId, resourceConfig, parameters}));
try {
- if (task.getPacketType() == null) {
- task.setPacketType(packetType);
- }
- if (ChainedHttpTaskConfigurator.class.isAssignableFrom(configuration.getClass())) {
+ if (task.getPacketType() == null)
+ task.setPacketType(packetType);
+ if (ChainedHttpTaskConfigurator.class.isAssignableFrom(configuration.getClass()))
configuration.configure(task);
-
- } else {
+ else {
HttpTaskProcessingContext context = SimpleHttpProtocolStackEndpoint.this.createContext(configuration, task);
-
- if (context != null) {
+ if (context != null)
((HttpMediator) mediator).registerProcessingContext(task, context);
- }
}
return task;
} catch (Exception e) {
@@ -293,9 +285,8 @@
*/
protected HttpTaskProcessingContext createContext(HttpTaskConfigurator httpTaskConfigurator, HttpTask<?, ?> task) {
HttpTaskProcessingContextFactory factory = null;
- if ((factory = ((HttpMediator) mediator).getTaskProcessingContextFactory()) != null) {
+ if ((factory = ((HttpMediator) mediator).getTaskProcessingContextFactory()) != null)
return factory.newInstance(httpTaskConfigurator, this.endpointId, task);
- }
return null;
}
