Merge pull request #1006 from sigstore/http-params-helper

Avoid having users look at ImmutableHttpParams

Author: aaronlew02

sigstore-java/src/main/java/dev/sigstore/fulcio/client/FulcioClientGrpc.java

@@ -28,7 +28,6 @@
 import dev.sigstore.fulcio.v2.PublicKeyRequest;
 import dev.sigstore.http.GrpcChannels;
 import dev.sigstore.http.HttpParams;
-import dev.sigstore.http.ImmutableHttpParams;
 import dev.sigstore.trustroot.Service;
 import java.io.ByteArrayInputStream;
 import java.net.URI;
@@ -58,7 +57,7 @@ private FulcioClientGrpc(HttpParams httpParams, URI uri) {
 
   public static class Builder {
     private Service service;
-    private HttpParams httpParams = ImmutableHttpParams.builder().build();
+    private HttpParams httpParams = HttpParams.builder().build();
 
     private Builder() {}
 

sigstore-java/src/main/java/dev/sigstore/http/HttpParams.java

@@ -53,4 +53,8 @@ protected void check() {
     Preconditions.checkState(getTimeout() > 0, "'timeout' should be greater than zero");
     Preconditions.checkState(!getUserAgent().isEmpty(), "'useragent' must not be empty");
   }
+
+  public static ImmutableHttpParams.Builder builder() {
+    return ImmutableHttpParams.builder();
+  }
 }

sigstore-java/src/main/java/dev/sigstore/oidc/client/GithubActionsOidcClient.java

@@ -22,7 +22,6 @@
 import com.google.api.client.util.Key;
 import dev.sigstore.http.HttpClients;
 import dev.sigstore.http.HttpParams;
-import dev.sigstore.http.ImmutableHttpParams;
 import io.grpc.Internal;
 import java.io.IOException;
 import java.util.Map;
@@ -55,7 +54,7 @@ private GithubActionsOidcClient(HttpParams httpParams, String audience) {
   }
 
   public static class Builder {
-    private HttpParams httpParams = ImmutableHttpParams.builder().build();
+    private HttpParams httpParams = HttpParams.builder().build();
     private String audience = DEFAULT_AUDIENCE;
 
     private Builder() {}

sigstore-java/src/main/java/dev/sigstore/oidc/client/WebOidcClient.java

@@ -35,7 +35,6 @@
 import com.google.api.client.util.store.MemoryDataStoreFactory;
 import dev.sigstore.http.HttpClients;
 import dev.sigstore.http.HttpParams;
-import dev.sigstore.http.ImmutableHttpParams;
 import dev.sigstore.trustroot.Service;
 import java.io.IOException;
 import java.util.Arrays;
@@ -72,7 +71,7 @@ public static WebOidcClient.Builder builder() {
   }
 
   public static class Builder {
-    private HttpParams httpParams = ImmutableHttpParams.builder().build();
+    private HttpParams httpParams = HttpParams.builder().build();
     private String clientId = DEFAULT_CLIENT_ID;
     private Service issuer;
     private BrowserHandler browserHandler = null;

sigstore-java/src/main/java/dev/sigstore/rekor/client/RekorClientHttp.java

@@ -25,7 +25,6 @@
 import com.google.api.client.util.Preconditions;
 import dev.sigstore.http.HttpClients;
 import dev.sigstore.http.HttpParams;
-import dev.sigstore.http.ImmutableHttpParams;
 import dev.sigstore.trustroot.Service;
 import java.io.IOException;
 import java.net.URI;
@@ -53,12 +52,12 @@ private RekorClientHttp(HttpParams httpParams, URI uri) {
   }
 
   public static class Builder {
-    private HttpParams httpParams = ImmutableHttpParams.builder().build();
+    private HttpParams httpParams = HttpParams.builder().build();
     private Service service;
 
     private Builder() {}
 
-    /** Configure the http properties, see {@link HttpParams}, {@link ImmutableHttpParams}. */
+    /** Configure the http properties, see {@link HttpParams}. */
     public Builder setHttpParams(HttpParams httpParams) {
       this.httpParams = httpParams;
       return this;

sigstore-java/src/main/java/dev/sigstore/timestamp/client/TimestampClientHttp.java

@@ -23,7 +23,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import dev.sigstore.http.HttpClients;
 import dev.sigstore.http.HttpParams;
-import dev.sigstore.http.ImmutableHttpParams;
 import dev.sigstore.trustroot.Service;
 import java.io.IOException;
 import java.net.URI;
@@ -53,12 +52,12 @@ public static TimestampClientHttp.Builder builder() {
   }
 
   public static class Builder {
-    private HttpParams httpParams = ImmutableHttpParams.builder().build();
+    private HttpParams httpParams = HttpParams.builder().build();
     private Service service;
 
     private Builder() {}
 
-    /** Configure the http properties, see {@link HttpParams}, {@link ImmutableHttpParams}. */
+    /** Configure the http properties, see {@link HttpParams}. */
     public Builder setHttpParams(HttpParams httpParams) {
       this.httpParams = httpParams;
       return this;

sigstore-java/src/main/java/dev/sigstore/tuf/HttpFetcher.java

@@ -18,7 +18,7 @@
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.json.gson.GsonFactory;
 import dev.sigstore.http.HttpClients;
-import dev.sigstore.http.ImmutableHttpParams;
+import dev.sigstore.http.HttpParams;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -49,7 +49,7 @@ public byte[] fetchResource(String filename, int maxLength)
       throws IOException, FileExceedsMaxLengthException {
     GenericUrl fileUrl = new GenericUrl(mirror + filename);
     var req =
-        HttpClients.newHttpTransport(ImmutableHttpParams.builder().build())
+        HttpClients.newHttpTransport(HttpParams.builder().build())
             .createRequestFactory(
                 request ->
                     request.setParser(GsonFactory.getDefaultInstance().createJsonObjectParser()))

sigstore-java/src/test/java/dev/sigstore/fulcio/client/FulcioClientGrpcTest.java

@@ -18,7 +18,7 @@
 import com.google.common.io.Resources;
 import dev.sigstore.encryption.certificates.Certificates;
 import dev.sigstore.encryption.signers.Signers;
-import dev.sigstore.http.ImmutableHttpParams;
+import dev.sigstore.http.HttpParams;
 import dev.sigstore.testing.FakeCTLogServer;
 import dev.sigstore.testing.FulcioWrapper;
 import dev.sigstore.testing.MockOAuth2ServerExtension;
@@ -50,7 +50,7 @@ public void testSigningCert(
     // ask fulcio for a signing cert
     var client =
         FulcioClientGrpc.builder()
-            .setHttpParams(ImmutableHttpParams.builder().allowInsecureConnections(true).build())
+            .setHttpParams(HttpParams.builder().allowInsecureConnections(true).build())
             .setService(fulcioWrapper.getGrpcService())
             .build();
 
@@ -80,7 +80,7 @@ public void testSigningCert_NoSct(
     // ask fulcio for a signing cert
     var client =
         FulcioClientGrpc.builder()
-            .setHttpParams(ImmutableHttpParams.builder().allowInsecureConnections(true).build())
+            .setHttpParams(HttpParams.builder().allowInsecureConnections(true).build())
             .setService(fulcioWrapper.getGrpcService())
             .build();
     var ex =