Changing Armeria file to the same as it is in master

scribejava · nikola20145 · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024
commit d040a99c7b1087c45f94bcdd319d1f8ea4d0bdf5
diff --git a/...ent-armeria/src/main/java/com/github/scribejava/httpclient/armeria/ArmeriaHttpClient.java b/...ent-armeria/src/main/java/com/github/scribejava/httpclient/armeria/ArmeriaHttpClient.java
@@ -32,8 +32,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Supplier;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * An implementation of {@link AbstractAsyncOnlyHttpClient} based on
  * <a href="https://line.github.io/armeria/">Armeria HTTP client</a>.
@@ -45,16 +44,15 @@ public class ArmeriaHttpClient extends AbstractAsyncOnlyHttpClient {
      */
     private final ArmeriaWebClientBuilder clientBuilder;
     /**
-     * A list of cached Endpoints. It helps avoiding building a new Endpoint per each request.
+     * A list of cached Endpoints. It helps avoiding building a new Endpoint per
+     * each request.
      */
     private final Map<String, WebClient> httpClients = new HashMap<>();
     /**
      * A read/write lock to access the list of cached Endpoints concurrently.
      */
     private final ReentrantReadWriteLock httpClientsLock = new ReentrantReadWriteLock();
 
-
-
     public ArmeriaHttpClient() {
         this(ArmeriaHttpClientConfig.defaultConfig());
     }
@@ -63,25 +61,6 @@ public ArmeriaHttpClient(ArmeriaHttpClientConfig config) {
         clientBuilder = config.createClientBuilder();
     }
 
-    // data structure for info about the branches  
-    private static final ConcurrentHashMap<String, AtomicBoolean> branchCoverage = new ConcurrentHashMap<>();
-
-     static {
-        branchCoverage.put("branch_1", new AtomicBoolean(false));
-        branchCoverage.put("branch_2", new AtomicBoolean(false));
-        branchCoverage.put("branch_3", new AtomicBoolean(false));
-        branchCoverage.put("branch_4", new AtomicBoolean(false));
-        branchCoverage.put("branch_5", new AtomicBoolean(false));
-        branchCoverage.put("branch_6", new AtomicBoolean(false));
-
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            System.out.println("Branch coverage results:");
-            branchCoverage.forEach((branch, covered) -> {
-                System.out.println(branch + ": " + (covered.get() ? "Taken" : "Not taken"));
-            });
-        }));
-    }
-
     /**
      * Cleans up the list of cached Endpoints.
      */
@@ -125,60 +104,54 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
                 converter);
     }
 
-    // branch coverage: Nikola
-   private <T> CompletableFuture<T> doExecuteAsync(String userAgent, Map<String, String> headers, Verb httpVerb,
-        String completeUrl, Supplier<HttpData> contentSupplier, OAuthAsyncRequestCallback<T> callback,
-        OAuthRequest.ResponseConverter<T> converter) {
+    private <T> CompletableFuture<T> doExecuteAsync(String userAgent, Map<String, String> headers, Verb httpVerb,
+            String completeUrl, Supplier<HttpData> contentSupplier, OAuthAsyncRequestCallback<T> callback,
+            OAuthRequest.ResponseConverter<T> converter) {
+        // Get the URI and Path
+        final URI uri = URI.create(completeUrl);
+        final String path = getServicePath(uri);
 
-    final URI uri = URI.create(completeUrl);
-    final String path = getServicePath(uri);
-    final WebClient client = getClient(uri);
-    final RequestHeadersBuilder headersBuilder = RequestHeaders.of(getHttpMethod(httpVerb), path).toBuilder();
+        // Fetch/Create WebClient instance for a given Endpoint
+        final WebClient client = getClient(uri);
 
-    headersBuilder.add(headers.entrySet());
-    if (userAgent != null) {
-        headersBuilder.add(OAuthConstants.USER_AGENT_HEADER_NAME, userAgent);
-    }
+        // Build HTTP request
+        final RequestHeadersBuilder headersBuilder = RequestHeaders.of(getHttpMethod(httpVerb), path).toBuilder();
 
-    final HttpResponse response;
-    // ID: branch_1
-    if (httpVerb.isPermitBody()) {
-        branchCoverage.get("branch_1").set(true);
-        final HttpData contents = contentSupplier.get();
-        // ID: branch_2
-        if (httpVerb.isRequiresBody() && contents == null) {
-            branchCoverage.get("branch_2").set(true);
-            throw new IllegalArgumentException("Contents missing for request method " + httpVerb.name());
+        headersBuilder.add(headers.entrySet());
+        if (userAgent != null) {
+            headersBuilder.add(OAuthConstants.USER_AGENT_HEADER_NAME, userAgent);
         }
-        // ID: branch_3
-        if (headersBuilder.contentType() == null) {
-            branchCoverage.get("branch_3").set(true);
-            headersBuilder.contentType(MediaType.FORM_DATA);
-        }
-        // ID: branch_4
-        if (contents != null) {
-            branchCoverage.get("branch_4").set(true);
-            response = client.execute(headersBuilder.build(), contents);
-        } 
-        // ID: branch_5
-        else{
-            branchCoverage.get("branch_5").set(true);
+
+        // Build the request body and execute HTTP request
+        final HttpResponse response;
+        if (httpVerb.isPermitBody()) { // POST, PUT, PATCH and DELETE methods
+            final HttpData contents = contentSupplier.get();
+            if (httpVerb.isRequiresBody() && contents == null) { // POST or PUT methods
+                throw new IllegalArgumentException("Contents missing for request method " + httpVerb.name());
+            }
+
+            if (headersBuilder.contentType() == null) {
+                headersBuilder.contentType(MediaType.FORM_DATA);
+            }
+
+            if (contents != null) {
+                response = client.execute(headersBuilder.build(), contents);
+            } else {
+                response = client.execute(headersBuilder.build());
+            }
+        } else {
             response = client.execute(headersBuilder.build());
         }
-    } // ID: branch_6 
-    else {
-        branchCoverage.get("branch_6").set(true);
-        response = client.execute(headersBuilder.build());
-    }
-
-    return response.aggregate()
-            .thenApply(aggregatedResponse -> whenResponseComplete(callback, converter, aggregatedResponse))
-            .exceptionally(throwable -> completeExceptionally(callback, throwable));
-}
 
+        // Aggregate HTTP response (asynchronously) and return the result Future
+        return response.aggregate()
+                .thenApply(aggregatedResponse -> whenResponseComplete(callback, converter, aggregatedResponse))
+                .exceptionally(throwable -> completeExceptionally(callback, throwable));
+    }
 
     /**
-     * Provides an instance of {@link WebClient} for a given endpoint {@link URI} based on an endpoint as
+     * Provides an instance of {@link WebClient} for a given endpoint {@link URI}
+     * based on an endpoint as
      * {@code scheme://authority}.
      *
      * @param uri an endpoint {@link URI}
@@ -221,56 +194,102 @@ private WebClient getClient(URI uri) {
     /**
      * Extracts {@code scheme} and {@code authority} portion of the {@link URI}.
      *
-     * Assuming the {@link URI} as the following: {@code URI = scheme:[//authority]path[?query][#fragment]}
+     * Assuming the {@link URI} as the following:
+     * {@code URI = scheme:[//authority]path[?query][#fragment]}
      */
     private static String getEndPoint(URI uri) {
         return requireNonNull(uri.getScheme(), "scheme") + "://" + requireNonNull(uri.getAuthority(), "authority");
     }
 
+    private static boolean[] getServiceCaseCoverage = new boolean[2]; // Data structure
+
     /**
-     * Extracts {@code path}, {@code query} and {@code fragment} portion of the {@link URI}.
+     * Extracts {@code path}, {@code query} and {@code fragment} portion of the
+     * {@link URI}.
      *
-     * Assuming the {@link URI} as the following: {@code URI = scheme:[//authority]path[?query][#fragment]}
+     * Assuming the {@link URI} as the following:
+     * {@code URI = scheme:[//authority]path[?query][#fragment]}
      */
-    private static String getServicePath(URI uri) {
+    public static String getServicePath(URI uri) {
         final StringBuilder builder = new StringBuilder()
                 .append(requireNonNull(uri.getPath(), "path"));
         final String query = uri.getQuery();
         if (query != null) {
+            getServiceCaseCoverage[0] = true; // ID: ArmeriaHttpClient.getServicePath.branch_1
             builder.append('?').append(query);
         }
         final String fragment = uri.getFragment();
         if (fragment != null) {
+            getServiceCaseCoverage[1] = true; // ID: ArmeriaHttpClient.getServicePath.branch_2
             builder.append('#').append(fragment);
         }
         return builder.toString();
     }
 
+    private static void printCoverage() {
+        System.out.println("GetHttpMethod Coverage report:");
+        for (int i = 0; i < getHttpCaseCoverage.length; i++) {
+            System.out.println("ArmeriaHttpClient.getHttpMethod.branch_" + (i + 1) + ": "
+                    + getHttpCaseCoverage[i]);
+        }
+
+        System.out.println("GetService Coverage report:");
+        for (int i = 0; i < getServiceCaseCoverage.length; i++) {
+            System.out.println("ArmeriaHttpClient.getServicePath.branch_" + (i + 1) + ":" + getServiceCaseCoverage[i]);
+        }
+    }
+
+    static {
+        // Ensure the coverage report is printed when the class is loaded
+        Runtime.getRuntime().addShutdownHook(new Thread(ArmeriaHttpClient::printCoverage));
+    }
+
     /**
      * Maps {@link Verb} to {@link HttpMethod}
      *
      * @param httpVerb a {@link Verb} to match with {@link HttpMethod}
      * @return {@link HttpMethod} corresponding to the parameter
      */
-    private static HttpMethod getHttpMethod(Verb httpVerb) {
+
+    private static boolean[] getHttpCaseCoverage = new boolean[9];
+
+    public static HttpMethod getHttpMethod(Verb httpVerb) {
         switch (httpVerb) {
             case GET:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_1
+                getHttpCaseCoverage[0] = true;
                 return HttpMethod.GET;
             case POST:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_2
+                getHttpCaseCoverage[1] = true;
                 return HttpMethod.POST;
             case PUT:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_3
+                getHttpCaseCoverage[2] = true;
                 return HttpMethod.PUT;
             case DELETE:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_4
+                getHttpCaseCoverage[3] = true;
                 return HttpMethod.DELETE;
             case HEAD:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_5
+                getHttpCaseCoverage[4] = true;
                 return HttpMethod.HEAD;
             case OPTIONS:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_6
+                getHttpCaseCoverage[5] = true;
                 return HttpMethod.OPTIONS;
             case TRACE:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_7
+                getHttpCaseCoverage[6] = true;
                 return HttpMethod.TRACE;
             case PATCH:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_8
+                getHttpCaseCoverage[7] = true;
                 return HttpMethod.PATCH;
             default:
+                // ID: ArmeriaHttpClient.getHttpMethod.branch_9
+                getHttpCaseCoverage[8] = true;
                 throw new IllegalArgumentException(
                         "message build error: unsupported HTTP method: " + httpVerb.name());
         }
@@ -280,7 +299,8 @@ private static HttpMethod getHttpMethod(Verb httpVerb) {
     /**
      * Converts {@link AggregatedHttpResponse} to {@link Response}
      *
-     * @param aggregatedResponse an instance of {@link AggregatedHttpResponse} to convert to {@link Response}
+     * @param aggregatedResponse an instance of {@link AggregatedHttpResponse} to
+     *                           convert to {@link Response}
      * @return a {@link Response} converted from {@link AggregatedHttpResponse}
      */
     private Response convertResponse(AggregatedHttpResponse aggregatedResponse) {
@@ -294,14 +314,19 @@ private Response convertResponse(AggregatedHttpResponse aggregatedResponse) {
     }
 
     /**
-     * Converts {@link AggregatedHttpResponse} to {@link Response} upon its aggregation completion and invokes
+     * Converts {@link AggregatedHttpResponse} to {@link Response} upon its
+     * aggregation completion and invokes
      * {@link OAuthAsyncRequestCallback} for it.
      *
-     * @param callback a {@link OAuthAsyncRequestCallback} callback to invoke upon response completion
-     * @param converter an optional {@link OAuthRequest.ResponseConverter} result converter for {@link Response}
+     * @param callback           a {@link OAuthAsyncRequestCallback} callback to
+     *                           invoke upon response completion
+     * @param converter          an optional {@link OAuthRequest.ResponseConverter}
+     *                           result converter for {@link Response}
      * @param aggregatedResponse a source {@link AggregatedHttpResponse} to handle
-     * @param <T> converter {@link OAuthRequest.ResponseConverter} specific type or {@link Response}
-     * @return either instance of {@link Response} or converted result based on {@link OAuthRequest.ResponseConverter}
+     * @param <T>                converter {@link OAuthRequest.ResponseConverter}
+     *                           specific type or {@link Response}
+     * @return either instance of {@link Response} or converted result based on
+     *         {@link OAuthRequest.ResponseConverter}
      */
     private <T> T whenResponseComplete(OAuthAsyncRequestCallback<T> callback,
             OAuthRequest.ResponseConverter<T> converter, AggregatedHttpResponse aggregatedResponse) {
@@ -321,9 +346,11 @@ private <T> T whenResponseComplete(OAuthAsyncRequestCallback<T> callback,
     /**
      * Invokes {@link OAuthAsyncRequestCallback} upon {@link Throwable} error result
      *
-     * @param callback a {@link OAuthAsyncRequestCallback} callback to invoke upon response completion
+     * @param callback  a {@link OAuthAsyncRequestCallback} callback to invoke upon
+     *                  response completion
      * @param throwable a {@link Throwable} error result
-     * @param <T> converter {@link OAuthRequest.ResponseConverter} specific type or {@link Response}
+     * @param <T>       converter {@link OAuthRequest.ResponseConverter} specific
+     *                  type or {@link Response}
      * @return null
      */
     private <T> T completeExceptionally(OAuthAsyncRequestCallback<T> callback, Throwable throwable) {
@@ -401,4 +428,4 @@ public HttpData get() {
             }
         }
     }
-}
+}
diff --git a/...tpclient-ning/src/test/java/com/github/scribejava/httpclient/ning/NingHttpClientTest.java b/...tpclient-ning/src/test/java/com/github/scribejava/httpclient/ning/NingHttpClientTest.java
@@ -29,6 +29,7 @@ protected HttpClient createNewClient() {
     }
 
 
+//new tests
 
 
 @Test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,6 +29,7 @@ protected HttpClient createNewClient() {
		}


		//new tests


		@Test
Expand Down