Updated the getRequest() and getResponse() methods in the Connection class to use classes in the java.net.http package

pborissow · pborissow · commit 47aff963c395 · 2024-02-20T11:10:29.000-05:00
diff --git a/src/javaxt/azure/graph/Connection.java b/src/javaxt/azure/graph/Connection.java
@@ -1,5 +1,11 @@
 package javaxt.azure.graph;
 
+import java.util.*;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import static java.nio.charset.StandardCharsets.*;
+
 import javaxt.json.*;
 import static javaxt.utils.Console.console;
 
@@ -100,13 +106,34 @@ public JSONObject getResponse(String url, JSONObject payload) throws Exception {
   //**************************************************************************
     public JSONObject getResponse(String url, JSONObject payload, String method) throws Exception {
 
-        javaxt.http.Request request = getRequest(url);
-        if (method!=null) request.setRequestMethod(method);
-        if (payload!=null) request.write(payload);
 
-        javaxt.http.Response response = request.getResponse();
-        JSONObject json = response.getJSONObject();
-        int status = response.getStatus();
+      //Get request builder
+        HttpRequest.Builder request = getRequest(url);
+
+
+      //Set payload and method as needed
+        if (payload!=null){
+            if (method==null) method = "POST";
+            else method = method.toUpperCase();
+
+            request.header("Content-Type", "application/json;charset=UTF-8");
+            request.method(method, HttpRequest.BodyPublishers.ofByteArray(
+                payload.toString().getBytes(UTF_8))
+            );
+        }
+
+
+      //Get response
+        HttpResponse<String> response = HttpClient.newBuilder()
+        .followRedirects(HttpClient.Redirect.NEVER)
+        .build()
+        .send(request.build(), HttpResponse.BodyHandlers.ofString(UTF_8));
+
+
+
+      //Parse and return response
+        JSONObject json = new JSONObject(response.body());
+        int status = response.statusCode();
         if (status==200){
             return json;
         }
@@ -115,17 +142,19 @@ else if (status==429){
             return getResponse(url);
         }
         else{
-            System.out.println(response.toString());
+
+            //console.log(response.headers().map());
+            //System.out.println(response.toString());
             System.out.println(json.toString(4));
             throw new Exception();
         }
     }
 
 
   //**************************************************************************
-  //** get
+  //** getRequest
   //**************************************************************************
-    private synchronized javaxt.http.Request getRequest(String url) throws Exception {
+    private synchronized HttpRequest.Builder getRequest(String url) throws Exception {
 
       //Update url as needed
         if (!url.startsWith(graphURL) && !url.startsWith("http")){
@@ -141,10 +170,9 @@ private synchronized javaxt.http.Request getRequest(String url) throws Exception
 
 
       //Execute http request and return response
-        javaxt.http.Request request = new javaxt.http.Request(url);
-        request.setHeader("Authorization", tokenType + " " + accessToken);
-        request.setNumRedirects(0);
-        return request;
+        return HttpRequest.newBuilder()
+        .uri(java.net.URI.create(url))
+        .header("Authorization", tokenType + " " + accessToken);
     }
 
 }
