demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

[DSL] Add the ability to send HTTP headers in sendHttpXXXRequest (#1272)

Browse Source 
* Add the ability to send HTTP headers in HTTP.sendHttpXXXRequest actions

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2019-12-19 22:36:51 +10:00 committed by Christoph Weitkamp
parent 7130988901
commit ec2958a072
2 changed files with 89 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.core.model.script/bnd.bnd
View File

@ -45,6 +45,7 @@ Import-Package: \
javax.measure.*,\
org.apache.*,\
org.eclipse.jdt.annotation;resolution:=optional,\
org.eclipse.jetty.http.*,\
org.eclipse.xtext.xbase.lib,\
org.joda.*,\
org.osgi.*,\

94
bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/HTTP.java
View File

@ -13,8 +13,11 @@
package org.eclipse.smarthome.model.script.actions;
import java.io.IOException;
import java.util.Properties;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.smarthome.io.net.http.HttpUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -53,13 +56,32 @@ public class HTTP {
static public String sendHttpGetRequest(String url, int timeout) {
String response = null;
try {
return HttpUtil.executeUrl("GET", url, timeout);
return HttpUtil.executeUrl(HttpMethod.GET.name(), url, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return response;
}
/**
* Send out a GET-HTTP request. Errors will be logged, returned values just ignored.
*
* @param url the URL to be used for the GET request.
* @param headers the HTTP headers to be sent in the request.
* @param timeout timeout in ms
* @return the response body or <code>NULL</code> when the request went wrong
*/
public static String sendHttpGetRequest(String url, Map<String, String> headers, int timeout) {
try {
Properties headerProperties = new Properties();
headerProperties.putAll(headers);
return HttpUtil.executeUrl(HttpMethod.GET.name(), url, headerProperties, null, null, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return null;
}
/**
* Send out a PUT-HTTP request. Errors will be logged, returned values just ignored.
*
@ -80,7 +102,7 @@ public class HTTP {
static public String sendHttpPutRequest(String url, int timeout) {
String response = null;
try {
response = HttpUtil.executeUrl("PUT", url, timeout);
response = HttpUtil.executeUrl(HttpMethod.PUT.name(), url, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
@ -113,13 +135,34 @@ public class HTTP {
static public String sendHttpPutRequest(String url, String contentType, String content, int timeout) {
String response = null;
try {
response = HttpUtil.executeUrl("PUT", url, IOUtils.toInputStream(content), contentType, timeout);
response = HttpUtil.executeUrl(HttpMethod.PUT.name(), url, IOUtils.toInputStream(content), contentType, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return response;
}
/**
* Send out a PUT-HTTP request. Errors will be logged, returned values just ignored.
*
* @param url the URL to be used for the PUT request.
* @param contentType the content type of the given <code>content</code>
* @param content the content to be send to the given <code>url</code> or <code>null</code> if no content should be sent.
* @param headers the HTTP headers to be sent in the request.
* @param timeout timeout in ms
* @return the response body or <code>NULL</code> when the request went wrong
*/
static public String sendHttpPutRequest(String url, String contentType, String content, Map<String, String> headers, int timeout) {
try {
Properties headerProperties = new Properties();
headerProperties.putAll(headers);
return HttpUtil.executeUrl(HttpMethod.PUT.name(), url, headerProperties, IOUtils.toInputStream(content), contentType, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return null;
}
/**
* Send out a POST-HTTP request. Errors will be logged, returned values just ignored.
*
@ -140,7 +183,7 @@ public class HTTP {
static public String sendHttpPostRequest(String url, int timeout) {
String response = null;
try {
response = HttpUtil.executeUrl("POST", url, timeout);
response = HttpUtil.executeUrl(HttpMethod.POST.name(), url, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
@ -173,13 +216,34 @@ public class HTTP {
static public String sendHttpPostRequest(String url, String contentType, String content, int timeout) {
String response = null;
try {
response = HttpUtil.executeUrl("POST", url, IOUtils.toInputStream(content), contentType, timeout);
response = HttpUtil.executeUrl(HttpMethod.POST.name(), url, IOUtils.toInputStream(content), contentType, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return response;
}
/**
* Send out a POST-HTTP request. Errors will be logged, returned values just ignored.
*
* @param url the URL to be used for the GET request.
* @param contentType the content type of the given <code>content</code>
* @param content the content to be send to the given <code>url</code> or <code>null</code> if no content should be sent.
* @param headers the HTTP headers to be sent in the request.
* @param timeout timeout in ms
* @return the response body or <code>NULL</code> when the request went wrong
*/
public static String sendHttpPostRequest(String url, String contentType, String content, Map<String, String> headers, int timeout) {
try {
Properties headerProperties = new Properties();
headerProperties.putAll(headers);
return HttpUtil.executeUrl(HttpMethod.POST.name(), url, headerProperties, IOUtils.toInputStream(content), contentType, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return null;
}
/**
* Send out a DELETE-HTTP request. Errors will be logged, returned values just ignored.
*
@ -200,11 +264,29 @@ public class HTTP {
static public String sendHttpDeleteRequest(String url, int timeout) {
String response = null;
try {
response = HttpUtil.executeUrl("DELETE", url, timeout);
response = HttpUtil.executeUrl(HttpMethod.DELETE.name(), url, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return response;
}
/**
* Send out a DELETE-HTTP request. Errors will be logged, returned values just ignored.
*
* @param url the URL to be used for the DELETE request.
* @param headers the HTTP headers to be sent in the request.
* @param timeout timeout in ms
* @return the response body or <code>NULL</code> when the request went wrong
*/
static public String sendHttpDeleteRequest(String url, Map<String, String> headers, int timeout) {
try {
Properties headerProperties = new Properties();
headerProperties.putAll(headers);
return HttpUtil.executeUrl(HttpMethod.DELETE.name(), url, headerProperties, null, null, timeout);
} catch (IOException e) {
logger.error("Fatal transport error: {}", e.getMessage());
}
return null;
}
}