NIFI-13982 - Web client - body as string and get request URI for response entity

nifi-commons/nifi-web-client-api/src/main/java/org/apache/nifi/web/client/api/HttpRequestBodySpec.java

@@ -31,4 +31,14 @@ public interface HttpRequestBodySpec extends HttpRequestHeadersSpec {
      * @return HTTP Request Headers Specification builder
      */
     HttpRequestHeadersSpec body(InputStream inputStream, OptionalLong contentLength);
+
+    /**
+     * Set Request Body as provided string encoded as UTF-8.
+     * This should be used only when the payload is small. For large amount of data,
+     * @see HttpRequestBodySpec#body(InputStream, OptionalLong)
+     *
+     * @param body String representation of the payload encoded as UTF-8
+     * @return HTTP Request Headers Specification builder
+     */
+    HttpRequestHeadersSpec body(String body);
 }

nifi-commons/nifi-web-client-api/src/main/java/org/apache/nifi/web/client/api/HttpResponseEntity.java

@@ -18,6 +18,7 @@
 
 import java.io.Closeable;
 import java.io.InputStream;
+import java.net.URI;
 
 /**
  * HTTP Response Entity extends Closeable to handle closing Response Body
@@ -43,4 +44,11 @@ public interface HttpResponseEntity extends Closeable {
      * @return HTTP Response Body stream can be empty
      */
     InputStream body();
+
+    /**
+     * Get the endpoint URI that was accessed to generate this HTTP response
+     *
+     * @return HTTP URI from which the response was retrieved
+     */
+    URI getUri();
 }

nifi-commons/nifi-web-client/src/main/java/org/apache/nifi/web/client/StandardHttpResponseEntity.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 /**
  * Standard implementation of HTTP Response Entity for Standard Web Client Service
@@ -32,14 +33,18 @@ class StandardHttpResponseEntity implements HttpResponseEntity {
 
     private final InputStream body;
 
+    private final URI uri;
+
     StandardHttpResponseEntity(
             final int statusCode,
             final HttpEntityHeaders headers,
-            final InputStream body
+            final InputStream body,
+            final URI uri
     ) {
         this.statusCode = statusCode;
         this.headers = headers;
         this.body = body;
+        this.uri = uri;
     }
 
     @Override
@@ -61,4 +66,9 @@ public InputStream body() {
     public void close() throws IOException {
         body.close();
     }
+
+    @Override
+    public URI getUri() {
+        return uri;
+    }
 }

nifi-commons/nifi-web-client/src/main/java/org/apache/nifi/web/client/StandardWebClientService.java

@@ -31,7 +31,6 @@
 import org.apache.nifi.web.client.ssl.StandardSSLContextProvider;
 import org.apache.nifi.web.client.ssl.TlsContext;
 
-import javax.net.ssl.SSLContext;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.IOException;
@@ -48,12 +47,15 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.concurrent.Flow;
 
+import javax.net.ssl.SSLContext;
+
 /**
  * Standard implementation of Web Client Service using Java HttpClient
  */
@@ -317,6 +319,12 @@ public HttpRequestHeadersSpec body(final InputStream body, final OptionalLong co
             return this;
         }
 
+        @Override
+        public HttpRequestHeadersSpec body(final String body) {
+            final byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
+            return body(new ByteArrayInputStream(bytes), OptionalLong.of(bytes.length));
+        }
+
         @Override
         public HttpRequestBodySpec header(final String headerName, final String headerValue) {
             Objects.requireNonNull(headerName, "Header Name required");
@@ -338,7 +346,7 @@ public HttpResponseEntity retrieve() {
             final InputStream responseBody = response.body();
             final InputStream body = responseBody == null ? new ByteArrayInputStream(EMPTY_BYTES) : responseBody;
 
-            return new StandardHttpResponseEntity(code, headers, body);
+            return new StandardHttpResponseEntity(code, headers, body, response.uri());
         }
 
         private HttpResponse<InputStream> getResponse(final HttpRequest request) {