refactor: use default request object instead of null

Author: granitdula

src/main/java/com/factset/sdk/utils/authentication/ConfidentialClient.java

@@ -102,7 +102,7 @@ public ConfidentialClient(final Configuration config)
         Objects.requireNonNull(config, "Configuration object must not be null");
         this.config = config;
         LOGGER.debug("Finished initialising configuration");
-        this.requestOptions = null;
+        this.requestOptions = new RequestOptions.RequestOptionsBuilder().build();
 
         this.requestProviderMetadata();
     }
@@ -192,18 +192,15 @@ private void requestProviderMetadata() throws AuthServerMetadataContentException
         InputStream stream;
 
         try {
-            if (this.requestOptions == null) stream = wellKnownURL.openStream();
-            else {
-                HttpURLConnection conn = (HttpURLConnection) wellKnownURL.openConnection(this.requestOptions.getProxy());
-                if (conn instanceof HttpsURLConnection) {
-                    HttpsURLConnection sslConn = (HttpsURLConnection) conn;
-                    sslConn.setHostnameVerifier(this.requestOptions.getHostnameVerifier());
-                    sslConn.setSSLSocketFactory(this.requestOptions.getSslSocketFactory());
-                }
-
-                stream = conn.getInputStream();
+            HttpURLConnection conn = (HttpURLConnection) wellKnownURL.openConnection(this.requestOptions.getProxy());
+            if (conn instanceof HttpsURLConnection) {
+                HttpsURLConnection sslConn = (HttpsURLConnection) conn;
+                sslConn.setHostnameVerifier(this.requestOptions.getHostnameVerifier());
+                sslConn.setSSLSocketFactory(this.requestOptions.getSslSocketFactory());
             }
 
+            stream = conn.getInputStream();
+
             final String providerInfo = IOUtils.readInputStreamToString(stream);
             this.providerMetadata = OIDCProviderMetadata.parse(providerInfo);
         } catch (final ParseException e) {
@@ -236,11 +233,10 @@ private String fetchAccessToken() throws AccessTokenException, SigningJwsExcepti
             final TokenRequest tokenRequest = this.tokenRequestBuilder.signedJwt(signedJwt).build();
 
             final HTTPRequest httpRequest = tokenRequest.toHTTPRequest();
-            if (requestOptions != null) {
-                httpRequest.setProxy(this.requestOptions.getProxy());
-                httpRequest.setHostnameVerifier(this.requestOptions.getHostnameVerifier());
-                httpRequest.setSSLSocketFactory(this.requestOptions.getSslSocketFactory());
-            }
+            httpRequest.setProxy(this.requestOptions.getProxy());
+            httpRequest.setHostnameVerifier(this.requestOptions.getHostnameVerifier());
+            httpRequest.setSSLSocketFactory(this.requestOptions.getSslSocketFactory());
+
             logTokenRequest(httpRequest);
 
             final HTTPResponse res = httpRequest.send();

src/test/java/com/factset/sdk/utils/authentication/ConfidentialClientTest.java

@@ -9,11 +9,9 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.net.*;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -327,7 +325,9 @@ private static URL getUrlMockResponse(String stringFile) throws IOException {
         final File file = new File(String.valueOf(Paths.get(String.valueOf(pathToResources), stringFile)));
 
         URL mockedUrl = mock(URL.class);
-        when(mockedUrl.openStream()).thenReturn(new FileInputStream(file));
+        HttpURLConnection mockedConn = mock(HttpURLConnection.class);
+        when(mockedUrl.openConnection(any(Proxy.class))).thenReturn(mockedConn);
+        when(mockedConn.getInputStream()).thenReturn(Files.newInputStream(file.toPath()));
 
         return mockedUrl;
     }
@@ -343,7 +343,7 @@ private static Configuration getConfigSpyMockedResponse(String urlResponse, Stri
 
     private static Configuration getConfigSpyThrowsIOException(String configFile) throws IOException, ConfigurationException {
         URL mockedUrl = mock(URL.class);
-        when(mockedUrl.openStream()).thenThrow(IOException.class);
+        when(mockedUrl.openConnection(any(Proxy.class))).thenThrow(IOException.class);
         Configuration configuration = new Configuration(String.valueOf(Paths.get(pathToResources.toString(), configFile)));
         Configuration configurationSpy = spy(configuration);
         when(configurationSpy.getWellKnownUrl()).thenReturn(mockedUrl).thenCallRealMethod();