PR review updates.

Author: MikeNeilson

cwbi-auth-http-client/src/main/java/hec/army/usace/hec/cwbi/auth/http/client/AuthCodePkceTokenRequestBuilder.java

@@ -97,7 +97,7 @@ public void handle(HttpExchange exchange) throws IOException {
                         ret = Result.success(code ,state, session_state);
                     }
                     LOGGER.fine("Returning result back to thread.");
-                    exchange.sendResponseHeaders(201, 0);
+                    exchange.sendResponseHeaders(204, 0);
 
                     future.complete(ret);
                 }
@@ -107,7 +107,7 @@ public void handle(HttpExchange exchange) throws IOException {
             final QueryParameters authParameters = QueryParameters.empty()
                 .set("grant_type", "code")
                 .set("client_id", getClientId())
-                .set("scopes", "openid profile")
+                .set("scope", "openid profile")
                 .set("response_type", "code")
                 .set("code_challenge_method", "S256")
                 .set("code_challenge", challenge)

cwbi-auth-http-client/src/main/java/hec/army/usace/hec/cwbi/auth/http/client/RefreshTokenRequestBuilder.java

@@ -1,6 +1,5 @@
 package hec.army.usace.hec.cwbi.auth.http.client;
 
-import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
 import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
 import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
 import mil.army.usace.hec.cwms.http.client.auth.OAuth2Token;
@@ -19,11 +18,9 @@ public final class RefreshTokenRequestBuilder implements RefreshTokenRequestFlue
      * @return Builder for http request
      */
     @Override
-    public <T> TokenRequestFluentBuilder<T> withRefreshToken(String refreshToken) {
+    public <T> TokenRequestFluentBuilder<? extends TokenRequestFluentBuilder<?>> withRefreshToken(String refreshToken) {
         this.refreshToken = Objects.requireNonNull(refreshToken, "Missing required refresh token");
-        // NOTE: The executor clearly extends TokenRequestBuilder which implements TokenRequestFluentBuilder so
-        // I'm really confused why we need the cast.
-        return (TokenRequestFluentBuilder<T>) new RefreshTokenRequestExecutor();
+        return new RefreshTokenRequestExecutor();
     }
 
     class RefreshTokenRequestExecutor extends TokenRequestBuilder<RefreshTokenRequestExecutor> {

cwbi-auth-http-client/src/main/java/hec/army/usace/hec/cwbi/auth/http/client/RefreshTokenRequestFluentBuilder.java

@@ -1,5 +1,5 @@
 package hec.army.usace.hec.cwbi.auth.http.client;
 
 public interface RefreshTokenRequestFluentBuilder {
-    <T> TokenRequestFluentBuilder<T> withRefreshToken(String refreshToken);
+    <T> TokenRequestFluentBuilder<? extends TokenRequestFluentBuilder<?>> withRefreshToken(String refreshToken);
 }

cwbi-auth-http-client/src/main/java/hec/army/usace/hec/cwbi/auth/http/client/TokenRequestFluentBuilder.java

@@ -28,7 +28,7 @@
 
 import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
 
-public interface TokenRequestFluentBuilder<T> {
+public interface TokenRequestFluentBuilder<T extends TokenRequestFluentBuilder<T>> {
 
     /**
      * If given auth method uses a single URL.

cwbi-auth-http-client/src/test/java/hec/army/usace/hec/cwbi/auth/http/client/TestOidcTokenProvider.java

@@ -62,7 +62,6 @@
 import org.junit.jupiter.api.AfterEach;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -71,13 +70,6 @@ class TestOidcTokenProvider {
     static MockHttpServer mockCdaServer;
     static MockHttpServer mockAuthServer;
 
-    static ExecutorService executorService;
-
-    @BeforeAll
-    static void setUpExecutorService() {
-        executorService = Executors.newFixedThreadPool(1);
-    }
-
     @BeforeEach
     void setUp() throws IOException {
         mockCdaServer = MockHttpServer.create();

cwms-http-client/src/main/java/mil/army/usace/hec/cwms/http/client/request/QueryParameters.java

@@ -83,7 +83,7 @@ public String encode() {
     public static QueryParameters parse(String query) {
         QueryParameters parameters = new QueryParameters();
         for (String pair: query.split("&")) {
-            String[] kv = pair.split("=");
+            String[] kv = pair.split("=", 2); // parameters are *always* seperated by &, but may have embedded =
             if (kv[0].trim().isEmpty()) {
                 continue;
             }