public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[remoteopenhab] Prefer StringContentProvider (#10001)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2021-01-31 21:15:55 +01:00 committed by GitHub
parent 024b36a814
commit 4c7f9efffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/rest/RemoteopenhabRestClient.java
View File

@ -12,9 +12,7 @@
*/ */
package org.openhab.binding.remoteopenhab.internal.rest; package org.openhab.binding.remoteopenhab.internal.rest;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
@ -39,8 +37,8 @@ import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.client.util.InputStreamContentProvider;
import org.eclipse.jetty.client.util.InputStreamResponseListener; import org.eclipse.jetty.client.util.InputStreamResponseListener;
import org.eclipse.jetty.client.util.StringContentProvider;
import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpStatus;
import org.openhab.binding.remoteopenhab.internal.data.RemoteopenhabChannelTriggerEvent; import org.openhab.binding.remoteopenhab.internal.data.RemoteopenhabChannelTriggerEvent;
@ -183,10 +181,8 @@ public class RemoteopenhabRestClient {
public void sendCommandToRemoteItem(String itemName, Command command) throws RemoteopenhabException { public void sendCommandToRemoteItem(String itemName, Command command) throws RemoteopenhabException {
try { try {
String url = String.format("%s/%s", getRestApiUrl("items"), itemName); String url = String.format("%s/%s", getRestApiUrl("items"), itemName);
InputStream stream = new ByteArrayInputStream(command.toFullString().getBytes(StandardCharsets.UTF_8)); executeUrl(HttpMethod.POST, url, "application/json", command.toFullString(), "text/plain", false);
executeUrl(HttpMethod.POST, url, "application/json", stream, "text/plain", false); } catch (RemoteopenhabException e) {
stream.close();
} catch (RemoteopenhabException | IOException e) {
throw new RemoteopenhabException("Failed to send command to the remote item " + itemName throw new RemoteopenhabException("Failed to send command to the remote item " + itemName
+ " using the items REST API: " + e.getMessage(), e); + " using the items REST API: " + e.getMessage(), e);
} }
@ -470,7 +466,7 @@ public class RemoteopenhabRestClient {
return executeUrl(HttpMethod.GET, url, acceptHeader, null, null, asyncReading); return executeUrl(HttpMethod.GET, url, acceptHeader, null, null, asyncReading);
} }
public String executeUrl(HttpMethod httpMethod, String url, String acceptHeader, @Nullable InputStream content, public String executeUrl(HttpMethod httpMethod, String url, String acceptHeader, @Nullable String content,
@Nullable String contentType, boolean asyncReading) throws RemoteopenhabException { @Nullable String contentType, boolean asyncReading) throws RemoteopenhabException {
final Request request = httpClient.newRequest(url).method(httpMethod).timeout(REQUEST_TIMEOUT, final Request request = httpClient.newRequest(url).method(httpMethod).timeout(REQUEST_TIMEOUT,
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
@ -482,10 +478,7 @@ public class RemoteopenhabRestClient {
if (content != null && (HttpMethod.POST.equals(httpMethod) || HttpMethod.PUT.equals(httpMethod)) if (content != null && (HttpMethod.POST.equals(httpMethod) || HttpMethod.PUT.equals(httpMethod))
&& contentType != null) { && contentType != null) {
try (final InputStreamContentProvider inputStreamContentProvider = new InputStreamContentProvider( request.content(new StringContentProvider(content), contentType);
content)) {
request.content(inputStreamContentProvider, contentType);
}
} }
try { try {