added builder + setter for custom SSLContext instance

Author: TheWhale01

gitlab4j-api/src/main/java/org/gitlab4j/api/GitLabApi.java

@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.net.ssl.SSLContext;
+
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
@@ -114,6 +116,78 @@ public static final Logger getLogger() {
         return (LOGGER);
     }
 
+    /**
+     * Builder class that allows for a different way to initialize a GitLabApi object
+     */
+    public static class Builder {
+        private ApiVersion apiVersion = ApiVersion.V4;
+        private String hostUrl = null;
+        private TokenType tokenType = TokenType.PRIVATE;
+        private String authToken = null;
+        private String secretToken = null;
+        private Map<String, Object> clientConfigProperties = null;
+        private SSLContext sslContext = null;
+
+        public Builder withApiVersion(ApiVersion apiVersion) {
+            this.apiVersion = apiVersion;
+            return this;
+        }
+
+        public Builder withHostUrl(String hostUrl) {
+            this.hostUrl = hostUrl;
+            return this;
+        }
+
+        public Builder withTokenType(TokenType tokenType) {
+            this.tokenType = tokenType;
+            return this;
+        }
+
+        public Builder withAuthToken(String authToken) {
+            this.authToken = authToken;
+            return this;
+        }
+
+        public Builder withSecretToken(String secretToken) {
+            this.secretToken = secretToken;
+            return this;
+        }
+
+        public Builder withClientConfigProperties(Map<String, Object> clientConfigProperties) {
+            this.clientConfigProperties = clientConfigProperties;
+            return this;
+        }
+
+        public Builder withSslContext(SSLContext sslContext) {
+            this.sslContext = sslContext;
+            return this;
+        }
+
+        public GitLabApi build() {
+            if (hostUrl == null || hostUrl.trim().isEmpty()) {
+                throw new IllegalStateException("hostUrl must be provided.");
+            }
+            return new GitLabApi(this);
+        }
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    private GitLabApi(Builder builder) {
+        this.apiClient = new GitLabApiClient(
+                builder.apiVersion,
+                builder.hostUrl,
+                builder.tokenType,
+                builder.authToken,
+                builder.secretToken,
+                builder.clientConfigProperties);
+        if (builder.sslContext != null) {
+            this.apiClient.setSslContext(builder.sslContext);
+        }
+    }
+
     /**
      * Constructs a GitLabApi instance set up to interact with the GitLab server
      * using GitLab API version 4.  This is the primary way to authenticate with

gitlab4j-api/src/main/java/org/gitlab4j/api/GitLabApiClient.java

@@ -61,6 +61,7 @@ public class GitLabApiClient implements AutoCloseable {
     private String secretToken;
     private boolean ignoreCertificateErrors;
     private SSLContext openSslContext;
+    private SSLContext customSslContext;
     private HostnameVerifier openHostnameVerifier;
     private Long sudoAsId;
     private String userAgentHeader;
@@ -288,6 +289,19 @@ void enableRequestResponseLogging(Logger logger, Level level, int maxEntityLengt
         }
     }
 
+    /**
+     * Sets the SSLContext for the underlying Jersey client.
+     * Does nothing if setIgnoreCertificateErrors has been set to true
+     *
+     * @param sslContext the SSLContext instance to use.
+     */
+    void setSslContext(SSLContext sslContext) {
+        if (getIgnoreCertificateErrors()) {
+            return;
+        }
+        this.customSslContext = sslContext;
+    }
+
     /**
      * Sets the per request connect and read timeout.
      *
@@ -839,6 +853,8 @@ protected Client createApiClient() {
 
         if (ignoreCertificateErrors) {
             clientBuilder.sslContext(openSslContext).hostnameVerifier(openHostnameVerifier);
+        } else if (customSslContext != null) {
+            clientBuilder.sslContext(customSslContext);
         }
 
         apiClient = clientBuilder.build();

gradle.properties

@@ -1,4 +1,4 @@
-version=6.3.1-SNAPSHOT
+version=6.3.2-SNAPSHOT
 lastVersion=6.3.0
 
 githubRepositoryOwner=gitlab4j