Anonymous connexion added
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/BasicConfigurator.java b/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/BasicConfigurator.java
new file mode 100644
index 0000000..3b2c405
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/BasicConfigurator.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2018 CEA.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA - initial API and implementation and/or initial documentation
+ */
+package org.eclipse.sensinact.studio.http.client;
+
+import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
+import org.restlet.resource.ClientResource;
+
+/**
+ * @author Etienne Gandrille
+ */
+public class BasicConfigurator implements RequestConfigurator {
+ @Override
+ public void configure(GatewayHttpConfig gwInfo, ClientResource clientResource) {
+ // do nothing
+ }
+}
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java b/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java
index e3481d5..ed967b1 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java
+++ b/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java
@@ -57,16 +57,22 @@
public static MsgSensinact sendGetRequest(Segments segments, Map<String, String> params) throws IOException {
GatewayHttpConfig gwInfo = ConfigurationManager.getGateway(segments.getGateway());
- RequestConfiguratorToken configurator = getRequestConfiguratorToken(gwInfo);
+
+ RequestConfigurator configurator;
+ if (gwInfo.hasAuthentication())
+ configurator = getRequestConfiguratorToken(gwInfo);
+ else
+ configurator = new BasicConfigurator();
return sendGetRequest(segments, gwInfo, params, configurator);
}
private static RequestConfiguratorToken getRequestConfiguratorToken(GatewayHttpConfig gwInfo) throws IOException {
- AccessToken token = null;
if (gwInfo.hasAuthentication()) {
- token = getToken(gwInfo);
+ AccessToken token = getToken(gwInfo);
+ return new RequestConfiguratorToken(token);
+ } else {
+ throw new RuntimeException("No credentials found for retrieving token");
}
- return new RequestConfiguratorToken(token);
}
private static synchronized AccessToken getToken(GatewayHttpConfig gwInfo) throws IOException {
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java
index c477a09..c87611f 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java
@@ -69,7 +69,7 @@
dialog.run(false, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
ModelUpdater mu = ModelUpdater.getInstance();
- monitor.subTask("Fetching devices from:"+gateway.getURL());
+ monitor.subTask("Fetching devices from:" + gateway.getURL());
try {
mu.updateDevices(gateway.getName());
if (monitor.isCanceled()) {
