chore: use constants provided by the SBL

Author: Johannes Schneider

cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/BtpServicePropertySuppliers.java

@@ -44,7 +44,7 @@ class BtpServicePropertySuppliers
      */
     static final OAuth2PropertySupplierResolver IDENTITY_AUTHENTICATION =
         OAuth2PropertySupplierResolver
-            .forServiceIdentifier(ServiceIdentifier.of("identity"), IdentityAuthentication::new);
+            .forServiceIdentifier(ServiceIdentifier.IDENTITY_AUTHENTICATION, IdentityAuthentication::new);
 
     static final OAuth2PropertySupplierResolver WORKFLOW =
         OAuth2PropertySupplierResolver
@@ -78,7 +78,7 @@ class BtpServicePropertySuppliers
                     .withUrlKey(BusinessLoggingOptions.WRITE_API, "writeservice", REMOVE_PATH)
                     .factory());
     static final OAuth2PropertySupplierResolver AI_CORE =
-        OAuth2PropertySupplierResolver.forServiceIdentifier(ServiceIdentifier.of("aicore"), AiCore::new);
+        OAuth2PropertySupplierResolver.forServiceIdentifier(ServiceIdentifier.AI_CORE, AiCore::new);
 
     private static final List<OAuth2PropertySupplierResolver> DEFAULT_SERVICE_RESOLVERS = new ArrayList<>();
 

cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/IdentityAuthenticationServiceBindingDestinationLoader.java

@@ -76,7 +76,7 @@ public Try<HttpDestination> tryGetDestination( @Nonnull final ServiceBindingDest
 
         final ServiceBindingDestinationOptions.Builder optionsBuilder =
             ServiceBindingDestinationOptions
-                .forService(ServiceIdentifier.of("identity"))
+                .forService(ServiceIdentifier.IDENTITY_AUTHENTICATION)
                 .onBehalfOf(options.getOnBehalfOf())
                 .withOption(BtpServiceOptions.IasOptions.withTargetUri(endpoint.uri));
 

cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2Service.java

@@ -275,11 +275,6 @@ static class Builder
         private static final String XSUAA_TOKEN_PATH = "/oauth/token";
         private static final Duration DEFAULT_TIME_OUT = Duration.ofSeconds(10);
 
-        /**
-         * {@link ServiceIdentifier#IDENTITY_AUTHENTICATION} referenced indirectly for backwards compatibility.
-         */
-        private static final ServiceIdentifier IDENTITY_AUTHENTICATION = ServiceIdentifier.of("identity");
-
         private URI tokenUri;
         private ClientIdentity identity;
         private OnBehalfOf onBehalfOf = OnBehalfOf.TECHNICAL_USER_CURRENT_TENANT;
@@ -333,7 +328,7 @@ Builder withTenantPropagationStrategy( @Nonnull final TenantPropagationStrategy
         Builder withTenantPropagationStrategyFrom( @Nullable final ServiceIdentifier serviceIdentifier )
         {
             final TenantPropagationStrategy tenantPropagationStrategy;
-            if( IDENTITY_AUTHENTICATION.equals(serviceIdentifier) ) {
+            if( ServiceIdentifier.IDENTITY_AUTHENTICATION.equals(serviceIdentifier) ) {
                 tenantPropagationStrategy = TenantPropagationStrategy.TENANT_SUBDOMAIN;
             } else {
                 tenantPropagationStrategy = TenantPropagationStrategy.ZID_HEADER;

cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/BtpServicePropertySuppliersTest.java

@@ -254,7 +254,7 @@ class AiCoreTest
     {
         final ServiceBinding binding =
             bindingWithCredentials(
-                ServiceIdentifier.of("aicore"),
+                ServiceIdentifier.AI_CORE,
                 entry("serviceurls.AI_API_URL", "https://api.ai.internalprod.eu-central-1.aws.ml.hana.ondemand.com"),
                 entry("clientid", "client-id"),
                 entry("clientsecret", "client-secret"),

cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/IdentityAuthenticationServiceBindingDestinationLoaderTest.java

@@ -1,5 +1,6 @@
 package com.sap.cloud.sdk.cloudplatform.connectivity;
 
+import static com.sap.cloud.environment.servicebinding.api.ServiceIdentifier.IDENTITY_AUTHENTICATION;
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServiceOptions.IasOptions.IasCommunicationOptions;
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServiceOptions.IasOptions.IasTargetUri;
 import static com.sap.cloud.sdk.cloudplatform.connectivity.BtpServiceOptions.IasOptions.NoTokenForTechnicalProviderUser;
@@ -40,7 +41,6 @@
 class IdentityAuthenticationServiceBindingDestinationLoaderTest
 {
     private static final ServiceIdentifier SERVICE_IDENTIFIER = ServiceIdentifier.of("test-service");
-    private static final ServiceIdentifier IDENTITY_AUTHENTICATION = ServiceIdentifier.of("identity");
     private static final DefaultServiceBinding IDENTITY_BINDING =
         DefaultServiceBinding.builder().copy(Map.of()).withServiceIdentifier(IDENTITY_AUTHENTICATION).build();