feat: refactor OidcConfig to use Proxy type and simplify proxy handling

Author: Fernando Marino

src/main/java/io/weaviate/client6/v1/internal/oidc/OidcConfig.java

@@ -10,26 +10,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.util.Objects.requireNonNull;
-
 public record OidcConfig(
     String clientId,
     String providerMetadata,
     Set<String> scopes,
-    OidcProxy proxy) {
-
-  public record OidcProxy(
-      String scheme,
-      String host,
-      int port) {
-    
-    public OidcProxy(Proxy proxy) {
-      this(requireNonNull(proxy, "proxy is null").scheme(), proxy.host(), proxy.port());
-    }
-
-  }
+    Proxy proxy) {
 
-  public OidcConfig(String clientId, String providerMetadata, Set<String> scopes, OidcProxy proxy) {
+  public OidcConfig(String clientId, String providerMetadata, Set<String> scopes, Proxy proxy) {
     this.clientId = clientId;
     this.providerMetadata = providerMetadata;
     this.scopes = scopes != null ? Set.copyOf(scopes) : Collections.emptySet();
@@ -44,7 +31,7 @@ public OidcConfig(String clientId, String providerMetadata, List<String> scopes)
     this(clientId, providerMetadata, scopes == null ? null : new HashSet<>(scopes), null);
   }
 
-  public OidcConfig(String clientId, String providerMetadata, List<String> scopes, OidcProxy proxy) {
+  public OidcConfig(String clientId, String providerMetadata, List<String> scopes, Proxy proxy) {
     this(clientId, providerMetadata, scopes == null ? null : new HashSet<>(scopes), proxy);
   }
 

src/main/java/io/weaviate/client6/v1/internal/oidc/OidcUtils.java

@@ -1,18 +1,16 @@
 package io.weaviate.client6.v1.internal.oidc;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
 import com.google.gson.annotations.SerializedName;
-
 import io.weaviate.client6.v1.api.WeaviateOAuthException;
-import io.weaviate.client6.v1.internal.rest.DefaultRestTransport;
 import io.weaviate.client6.v1.internal.rest.Endpoint;
 import io.weaviate.client6.v1.internal.rest.ExternalEndpoint;
 import io.weaviate.client6.v1.internal.rest.RestTransport;
 import io.weaviate.client6.v1.internal.rest.SimpleEndpoint;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
 public final class OidcUtils {
   /** Prevents public initialization. */
   private OidcUtils() {
@@ -55,10 +53,6 @@ public static final OidcConfig getConfig(RestTransport transport) {
       throw new WeaviateOAuthException("fetch provider metadata", e);
     }
 
-    OidcConfig.OidcProxy proxy = transport.getProxy() != null
-        ? new OidcConfig.OidcProxy(transport.getProxy())
-        : null;
-
-    return new OidcConfig(openid.clientId(), providerMetadata, openid.scopes(), proxy);
+    return new OidcConfig(openid.clientId(), providerMetadata, openid.scopes(), transport.getProxy());
   }
 }