2222import java .security .KeyStoreException ;
2323import java .security .NoSuchAlgorithmException ;
2424import java .security .cert .CertificateException ;
25- import java .util .List ;
26-
27- import javax .annotation .Nullable ;
2825
2926import org .apache .http .HttpHeaders ;
30- import org .apache .http .impl .client .HttpClientBuilder ;
31- import org .junit .jupiter .api .AfterEach ;
32- import org .junit .jupiter .api .BeforeEach ;
3327import org .junit .jupiter .api .DisplayName ;
3428import org .junit .jupiter .api .Test ;
3529
3630import com .github .tomakehurst .wiremock .junit5 .WireMockTest ;
3731import com .sap .cloud .environment .servicebinding .api .ServiceBinding ;
3832import com .sap .cloud .environment .servicebinding .api .ServiceIdentifier ;
3933import com .sap .cloud .sdk .cloudplatform .connectivity .exception .DestinationAccessException ;
40- import com .sap .cloud .sdk .cloudplatform .connectivity .exception .HttpClientInstantiationException ;
4134import com .sap .cloud .sdk .cloudplatform .tenant .DefaultTenant ;
4235import com .sap .cloud .sdk .cloudplatform .tenant .TenantAccessor ;
43- import com .sap .cloud .security .client .HttpClientFactory ;
4436import com .sap .cloud .security .config .ClientIdentity ;
4537import com .sap .cloud .security .xsuaa .client .OAuth2ServiceException ;
4638
@@ -59,35 +51,6 @@ class OAuth2IntegrationTest
5951 }
6052 """ ;
6153
62- private List <HttpClientFactory > oldFactories = List .of ();
63-
64- @ BeforeEach
65- void mockClientFactory ()
66- {
67- oldFactories = HttpClientFactory .services ;
68- HttpClientFactory .services .clear ();
69-
70- // `useSystemProperties` is needed for the WireMock proxying
71- HttpClientFactory .services .add (identity -> HttpClientBuilder .create ().useSystemProperties ().build ());
72- HttpClientAccessor .setHttpClientFactory (new DefaultHttpClientFactory ()
73- {
74- @ Override
75- protected HttpClientBuilder getHttpClientBuilder ( @ Nullable HttpDestinationProperties destination )
76- throws HttpClientInstantiationException
77- {
78- return super .getHttpClientBuilder (destination ).useSystemProperties ();
79- }
80- });
81- }
82-
83- @ AfterEach
84- void restoreClientFactories ()
85- {
86- HttpClientFactory .services .clear ();
87- HttpClientFactory .services .addAll (oldFactories );
88- HttpClientAccessor .setHttpClientFactory (null );
89- }
90-
9154 @ Test
9255 void testIasTokenFlow ()
9356 {
0 commit comments