Merge pull request #264 from HydrologicEngineeringCenter/CWMS-2055_updating_TokenUrlDiscoverService_to_throw_IOException

CWMS-2055 - Updates TokenUrlDiscoveryService getUrl() signature to throw IOException

Author: rma-bryson

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

@@ -37,7 +37,7 @@ protected CwbiAuthTokenProviderBase(String clientId) {
         this.clientId = Objects.requireNonNull(clientId, "Missing required clientId");
     }
 
-    abstract ApiConnectionInfo getUrl();
+    abstract ApiConnectionInfo getUrl() throws IOException;
 
     @Override
     public synchronized void clear() {

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

@@ -23,6 +23,7 @@
  */
 package hec.army.usace.hec.cwbi.auth.http.client;
 
+import java.io.IOException;
 import java.util.Objects;
 import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
 
@@ -38,8 +39,7 @@ public DiscoveredCwbiAuthTokenProvider(String clientId, TokenUrlDiscoveryService
     }
 
     @Override
-    synchronized ApiConnectionInfo getUrl()
-    {
+    synchronized ApiConnectionInfo getUrl() throws IOException {
         if(url == null)
         {
             url = tokenUrlDiscoveryService.discoverTokenUrl();

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

@@ -23,8 +23,9 @@
  */
 package hec.army.usace.hec.cwbi.auth.http.client;
 
+import java.io.IOException;
 import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
 
 public interface TokenUrlDiscoveryService {
-    ApiConnectionInfo discoverTokenUrl();
+    ApiConnectionInfo discoverTokenUrl() throws IOException;
 }

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

@@ -23,6 +23,7 @@
  */
 package hec.army.usace.hec.cwbi.auth.http.client;
 
+import java.io.IOException;
 import java.util.Objects;
 import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
 import mil.army.usace.hec.cwms.http.client.auth.OAuth2Token;
@@ -50,7 +51,7 @@ void setOAuth2Token(OAuth2Token token) {
 
     //package scoped for testing
     @Override
-    synchronized ApiConnectionInfo getUrl() {
+    synchronized ApiConnectionInfo getUrl() throws IOException {
         if(url == null)
         {
             url = tokenUrlDiscoveryService.discoverTokenUrl();

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

@@ -90,7 +90,7 @@ protected void launchMockServerWithResource(String resource) throws IOException
     }
 
     @Test
-    void testBuildTokenProvider() {
+    void testBuildTokenProvider() throws IOException {
         ApiConnectionInfo tokenUrl = buildConnectionInfo();
         MockTokenUrlDiscoveryService tokenUrlDiscoveryService = new MockTokenUrlDiscoveryService(tokenUrl);
         DiscoveredCwbiAuthTokenProvider tokenProvider = new DiscoveredCwbiAuthTokenProvider("cumulus", tokenUrlDiscoveryService);
@@ -162,7 +162,7 @@ void testRefreshToken() throws IOException {
     }
 
     @Test
-    void testConstructor() {
+    void testConstructor() throws IOException {
         SSLSocketFactory sslSocketFactory = getTestSslSocketFactory();
         ApiConnectionInfo tokenUrl = new ApiConnectionInfoBuilder("test.com")
                 .withSslSocketData(new SslSocketData(sslSocketFactory, CwbiAuthTrustManager.getTrustManager()))