[http-client] Fix Non-Json bodytypes/Add InputStream body method

http-client/src/main/java/io/avaje/http/client/DHttpClientRequest.java

@@ -312,6 +312,12 @@ public HttpClientRequest body(Supplier<? extends InputStream> streamSupplier) {
     return this;
   }
 
+  @Override
+  public HttpClientRequest body(InputStream stream) {
+    this.body = HttpRequest.BodyPublishers.ofInputStream(() -> stream);
+    return this;
+  }
+
   @Override
   public HttpClientRequest body(Path file) {
     try {

http-client/src/main/java/io/avaje/http/client/HttpClientRequest.java

@@ -364,6 +364,14 @@ default HttpClientRequest queryParam(String name, Collection<String> values) {
    */
   HttpClientRequest body(Supplier<? extends InputStream> supplier);
 
+  /**
+   * Set the body content with supplied InputStream.
+   *
+   * @param supplier The InputStream content to send as body content
+   * @return The request being built
+   */
+  HttpClientRequest body(InputStream stream);
+
   /**
    * Set the body content with supplied InputStream.
    *

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

@@ -55,7 +55,11 @@ private void methodStart(Append writer) {
       if (count++ > 0) {
         writer.append(", ");
       }
-      writer.append(param.utype().shortType()).append(" ");
+      var paramType =
+          "java.util.function.Supplier<?extendsjava.io.InputStream>".equals(param.utype().full())
+              ? "Supplier<? extends InputStream>"
+              : param.utype().shortType();
+      writer.append(paramType).append(" ");
       writer.append(param.name());
     }
     writer.append(") {").eol();
@@ -250,10 +254,29 @@ private void writeFormParam(MethodParam param, ParamType paramType) {
   private void writeBody() {
     for (MethodParam param : method.params()) {
       ParamType paramType = param.paramType();
+
       if (paramType == ParamType.BODY) {
-        writer.append("      .body(%s, ", param.name());
-        writeGeneric(param.utype());
-        writer.append(")").eol();
+
+        var type = param.utype().full();
+        if ("java.net.http.HttpRequest.BodyPublisher".equals(type)
+            || "java.lang.String".equals(type)
+            || "byte[]".equals(type)
+            || "java.io.InputStream".equals(type)
+            || "java.util.function.Supplier<?extendsjava.io.InputStream>".equals(type)
+            || "java.util.function.Supplier<java.io.InputStream>".equals(type)
+            || "java.nio.file.Path".equals(type)
+            || "io.avaje.http.client.BodyContent".equals(type)) {
+
+          writer.append("      .body(%s)", param.name()).eol();
+
+        } else {
+
+          writer.append("      .body(%s, ", param.name());
+          writeGeneric(param.utype());
+          writer.append(")").eol();
+        }
+
+        return;
       }
     }
   }

http-generator-core/src/main/java/io/avaje/http/generator/core/UType.java

@@ -203,12 +203,13 @@ public Set<String> importTypes() {
       for (String type : allTypes) {
         if (!type.startsWith("java.lang.") && type.indexOf('.') > -1) {
           if (type.startsWith("java")) {
-            set.add(type.replace("[]", ""));
+            set.add(type.replace("[]", "").replace("?extends", ""));
           } else {
-            set.add(innerTypesImport(type).replace("[]", ""));
+            set.add(innerTypesImport(type).replace("[]", "").replace("?extends", ""));
           }
         }
       }
+      set.remove("?");
       return set;
     }