Skip to content

Commit 678d12a

Browse files
Jonas-IsrJonas-Isr
authored
Merge branch 'main' into fix-bom-comment
2 parents dbe317d + 6190334 commit 678d12a

10 files changed

Lines changed: 285 additions & 17 deletions

File tree

‎cloudplatform/connectivity-destination-service/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationService.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ static ResilienceConfiguration createResilienceConfiguration(
120120
Try<Destination>
121121
tryGetDestination( @Nonnull final String destinationName, @Nonnull final DestinationOptions options )
122122
{
123+
if( Cache.preLookupCheckEnabled && !preLookupCheckSuccessful(destinationName) ) {
124+
final String msg = "Destination %s was not found among the destinations of the current tenant.";
125+
return Try.failure(new DestinationNotFoundException(String.format(msg, destinationName)));
126+
}
123127
return Cache.getOrComputeDestination(this, destinationName, options, this::loadAndParseDestination);
124128
}
125129

@@ -384,6 +388,13 @@ private static boolean hasCauseAssignableFrom( @Nonnull final Throwable t, @Nonn
384388
return ExceptionUtils.getThrowableList(t).stream().map(Throwable::getClass).anyMatch(cls::isAssignableFrom);
385389
}
386390

391+
private boolean preLookupCheckSuccessful( final String destinationName )
392+
{
393+
return getAllDestinationProperties()
394+
.stream()
395+
.anyMatch(properties -> properties.get(DestinationProperty.NAME).contains(destinationName));
396+
}
397+
387398
/**
388399
* Helper class that encapsulates all caching related configuration options.
389400
*
@@ -426,6 +437,7 @@ public static final class Cache
426437

427438
private static boolean cacheEnabled = true;
428439
private static boolean changeDetectionEnabled = true;
440+
private static boolean preLookupCheckEnabled = true;
429441

430442
static {
431443
recreateSingleCache();
@@ -443,6 +455,18 @@ static boolean isChangeDetectionEnabled()
443455
return changeDetectionEnabled;
444456
}
445457

458+
/**
459+
* Disables checking if a destination exists before trying to call it directly when invoking
460+
* {@link #tryGetDestination}. All available destinations can be found with
461+
* {@link #getAllDestinationProperties}.
462+
*
463+
* @since 5.25.0
464+
*/
465+
public static void disablePreLookupCheck()
466+
{
467+
preLookupCheckEnabled = false;
468+
}
469+
446470
@Nonnull
447471
static com.github.benmanes.caffeine.cache.Cache<CacheKey, Destination> instanceSingle()
448472
{
@@ -496,6 +520,7 @@ static void reset()
496520
cacheEnabled = true;
497521
}
498522
changeDetectionEnabled = true;
523+
preLookupCheckEnabled = true;
499524

500525
sizeLimit = Option.some(DEFAULT_SIZE_LIMIT);
501526
expirationDuration = Option.some(DEFAULT_EXPIRATION_DURATION);

‎cloudplatform/connectivity-destination-service/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationServiceAuthenticationTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ void setMockAdapter()
6666
.when(mockAdapter)
6767
.getConfigurationAsJson(anyString(), any());
6868
sut = new DestinationService(mockAdapter);
69+
// Disable PreLookupCheck to simplify test setup
70+
DestinationService.Cache.disablePreLookupCheck();
6971
}
7072

7173
@Test
@@ -290,7 +292,7 @@ void testOAuth2PasswordWithoutUserToken()
290292
assertThat(dest.asHttp().getHeaders())
291293
.containsExactlyInAnyOrder(new Header("Authorization", "Bearer " + oAuthToken));
292294

293-
verify(mockAdapter, times(1)).getConfigurationAsJson(anyString(), eq(expectedStrategy));
295+
verify(mockAdapter, times(1)).getConfigurationAsJson(eq(SERVICE_PATH_DESTINATION), eq(expectedStrategy));
294296
verifyNoMoreInteractions(mockAdapter);
295297
}
296298

@@ -382,7 +384,7 @@ void testSAPAssertionSSO()
382384
assertThat(dest.asHttp().getAuthenticationType()).isEqualTo(AuthenticationType.SAP_ASSERTION_SSO);
383385
assertThat(dest.asHttp().getHeaders()).containsExactlyInAnyOrder(new Header("Cookie", assertionCookie));
384386

385-
verify(mockAdapter, times(1)).getConfigurationAsJson(anyString(), eq(expectedStrategy));
387+
verify(mockAdapter, times(1)).getConfigurationAsJson(eq(SERVICE_PATH_DESTINATION), eq(expectedStrategy));
386388
verifyNoMoreInteractions(mockAdapter);
387389
}
388390

‎cloudplatform/connectivity-destination-service/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationServicePrincipalPropagationTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ void setupConnectivity( @Nonnull final WireMockRuntimeInfo wm )
108108
.withRequestBody(
109109
equalTo("grant_type=client_credentials&client_secret=CLIENT_SECRET&client_id=CLIENT_ID"))
110110
.willReturn(okJson("{\"access_token\":\"provider-client-credentials\",\"expires_in\":3600}")));
111+
// Disable PreLookupCheck to simplify test setup
112+
DestinationService.Cache.disablePreLookupCheck();
111113
}
112114

113115
@AfterEach

‎cloudplatform/connectivity-destination-service/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationServiceTest.java‎

Lines changed: 62 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ class DestinationServiceTest
113113
"ProxyType": "Internet",
114114
"KeyStorePassword": "password",
115115
"KeyStoreLocation": "aaa"
116+
},
117+
{
118+
"Name": "SomeDestinationName",
119+
"Type": "HTTP",
120+
"URL": "https://a.s4hana.ondemand.com",
121+
"Authentication": "ClientCertificateAuthentication",
122+
"ProxyType": "Internet",
123+
"KeyStorePassword": "password",
124+
"KeyStoreLocation": "aaa"
116125
}]
117126
""";
118127

@@ -336,6 +345,9 @@ class DestinationServiceTest
336345
@BeforeEach
337346
void setup()
338347
{
348+
// Disable PreLookupCheck to simplify test setup
349+
DestinationService.Cache.disablePreLookupCheck();
350+
339351
providerTenant = new DefaultTenant("provider-tenant");
340352
subscriberTenant = new DefaultTenant("subscriber-tenant");
341353
context.setTenant(subscriberTenant);
@@ -442,7 +454,7 @@ void testGettingDestinationProperties()
442454

443455
assertThat(destinationList)
444456
.extracting(d -> d.get(DestinationProperty.NAME).get())
445-
.containsExactly("CC8-HTTP-BASIC", "CC8-HTTP-CERT1", "CC8-HTTP-CERT");
457+
.containsExactly("CC8-HTTP-BASIC", "CC8-HTTP-CERT1", "CC8-HTTP-CERT", destinationName);
446458

447459
final DestinationProperties destination =
448460
destinationList
@@ -478,7 +490,7 @@ void testGettingDestinationPropertiesProvider()
478490
final Collection<DestinationProperties> destinationList = loader.getAllDestinationProperties(ALWAYS_PROVIDER);
479491
assertThat(destinationList)
480492
.extracting(d -> d.get(DestinationProperty.NAME).get())
481-
.containsExactly("CC8-HTTP-BASIC", "CC8-HTTP-CERT1", "CC8-HTTP-CERT");
493+
.containsExactly("CC8-HTTP-BASIC", "CC8-HTTP-CERT1", "CC8-HTTP-CERT", destinationName);
482494
}
483495

484496
@Test
@@ -494,7 +506,7 @@ void testGettingDestinationPropertiesSubscriber()
494506
final Collection<DestinationProperties> destinationList = loader.getAllDestinationProperties(ONLY_SUBSCRIBER);
495507
assertThat(destinationList)
496508
.extracting(d -> d.get(DestinationProperty.NAME).get())
497-
.containsExactly("CC8-HTTP-BASIC", "CC8-HTTP-CERT1", "CC8-HTTP-CERT");
509+
.containsExactly("CC8-HTTP-BASIC", "CC8-HTTP-CERT1", "CC8-HTTP-CERT", destinationName);
498510
}
499511

500512
@Test
@@ -589,10 +601,10 @@ void testGetAllDestinationsForProvider()
589601
final List<Destination> destinationList = new ArrayList<>();
590602
destinations.get().forEach(destinationList::add);
591603

592-
assertThat(destinationList.size()).isEqualTo(3);
604+
assertThat(destinationList.size()).isEqualTo(4);
593605
assertThat(destinationList)
594606
.extracting(d -> d.get(DestinationProperty.NAME).get())
595-
.containsOnly("CC8-HTTP-BASIC", "CC8-HTTP-CERT", "CC8-HTTP-CERT1");
607+
.containsOnly("CC8-HTTP-BASIC", "CC8-HTTP-CERT", "CC8-HTTP-CERT1", destinationName);
596608
}
597609

598610
@SuppressWarnings( "deprecation" )
@@ -1910,4 +1922,49 @@ private String createHttpDestinationServiceResponse( final String name, final St
19101922
}
19111923
""", name, url);
19121924
}
1925+
1926+
@Test
1927+
void testPrependGetAllDestinationsCall()
1928+
{
1929+
// Reset Cache to re-enable the PreLookupCheck
1930+
DestinationService.Cache.reset();
1931+
1932+
doReturn(responseServiceInstanceDestination)
1933+
.when(destinationServiceAdapter)
1934+
.getConfigurationAsJson(eq("/v1/instanceDestinations"), any());
1935+
doReturn(responseSubaccountDestination)
1936+
.when(destinationServiceAdapter)
1937+
.getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
1938+
1939+
Destination result = loader.tryGetDestination(destinationName).get();
1940+
1941+
verify(destinationServiceAdapter, times(1)).getConfigurationAsJson(eq("/v1/instanceDestinations"), any());
1942+
verify(destinationServiceAdapter, times(1)).getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
1943+
verify(destinationServiceAdapter, times(1))
1944+
.getConfigurationAsJson(eq("/v1/destinations/" + destinationName), any());
1945+
verifyNoMoreInteractions(destinationServiceAdapter);
1946+
}
1947+
1948+
@Test
1949+
void testPrependGetAllDestinationsCallWithMissingDestination()
1950+
{
1951+
// Reset Cache to re-enable the PreLookupCheck
1952+
DestinationService.Cache.reset();
1953+
1954+
doReturn(responseServiceInstanceDestination)
1955+
.when(destinationServiceAdapter)
1956+
.getConfigurationAsJson(eq("/v1/instanceDestinations"), any());
1957+
doReturn(responseSubaccountDestination)
1958+
.when(destinationServiceAdapter)
1959+
.getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
1960+
1961+
assertThatThrownBy(() -> loader.tryGetDestination("thisDestinationDoesNotExist").get())
1962+
.isInstanceOf(DestinationNotFoundException.class)
1963+
.hasMessageContaining("was not found among the destinations of the current tenant.");
1964+
1965+
verify(destinationServiceAdapter, times(1)).getConfigurationAsJson(eq("/v1/instanceDestinations"), any());
1966+
verify(destinationServiceAdapter, times(1)).getConfigurationAsJson(eq("/v1/subaccountDestinations"), any());
1967+
verifyNoMoreInteractions(destinationServiceAdapter);
1968+
1969+
}
19131970
}

‎datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/EdmService.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,9 @@ public Collection<ServiceAction> getAllServiceActions()
247247
public String getJavaPackageName()
248248
{
249249
final String javaPackageNameKey = name + SERVICE_MAPPINGS_PACKAGE_SUFFIX;
250-
final String javaPackageName = serviceNameMappings.getString(javaPackageNameKey).orElseGet(this::getTitle);
251-
return NamingUtils.serviceNameToJavaPackageName(javaPackageName);
250+
return serviceNameMappings
251+
.getString(javaPackageNameKey)
252+
.orElseGet(() -> NamingUtils.serviceNameToJavaPackageName(getTitle()));
252253
}
253254

254255
@Override
@@ -261,8 +262,9 @@ public String getName()
261262
public String getJavaClassName()
262263
{
263264
final String javaClassNameKey = name + SERVICE_MAPPINGS_CLASS_SUFFIX;
264-
final String javaClassName = serviceNameMappings.getString(javaClassNameKey).orElseGet(this::getTitle);
265-
return NamingUtils.serviceNameToBaseJavaClassName(javaClassName);
265+
return serviceNameMappings
266+
.getString(javaClassNameKey)
267+
.orElseGet(() -> NamingUtils.serviceNameToBaseJavaClassName(getTitle()));
266268
}
267269

268270
@Override

‎datamodel/odata-v4/odata-v4-generator/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/generator/EdmServiceTest.java‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
package com.sap.cloud.sdk.datamodel.odatav4.generator;
2+
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.mockito.Mockito.doReturn;
5+
import static org.mockito.Mockito.mock;
6+
7+
import java.util.List;
8+
import java.util.Optional;
9+
import java.util.stream.Stream;
10+
11+
import javax.annotation.Nonnull;
12+
13+
import org.apache.olingo.commons.api.edm.Edm;
14+
import org.apache.olingo.commons.api.edm.EdmEntityContainer;
15+
import org.apache.olingo.commons.api.edm.EdmSchema;
16+
import org.junit.jupiter.params.ParameterizedTest;
17+
import org.junit.jupiter.params.provider.Arguments;
18+
import org.junit.jupiter.params.provider.MethodSource;
19+
20+
import com.google.common.collect.ArrayListMultimap;
21+
import com.sap.cloud.sdk.datamodel.odata.utility.ServiceNameMappings;
22+
23+
class EdmServiceTest
24+
{
25+
26+
@ParameterizedTest
27+
@MethodSource( "getServiceNameMappingScenarios" )
28+
void testServiceNameMappingsGenerated(
29+
@Nonnull final String serviceName,
30+
@Nonnull final String expectedPackageName,
31+
@Nonnull final String expectedClassName )
32+
{
33+
34+
// Mock ServiceNameMappings to return empty Optional (no stored mappings)
35+
final ServiceNameMappings mockMappings = mock(ServiceNameMappings.class);
36+
doReturn(Optional.empty()).when(mockMappings).getString(serviceName + ".packageName");
37+
doReturn(Optional.empty()).when(mockMappings).getString(serviceName + ".className");
38+
39+
final EdmService service =
40+
new EdmService(
41+
serviceName,
42+
mockMappings,
43+
createMockEdm(),
44+
mock(ServiceDetails.class),
45+
ArrayListMultimap.create(),
46+
false);
47+
48+
assertThat(service.getJavaPackageName()).isEqualTo(expectedPackageName);
49+
assertThat(service.getJavaClassName()).isEqualTo(expectedClassName);
50+
}
51+
52+
@ParameterizedTest
53+
@MethodSource( "getServiceNameMappingScenarios" )
54+
void testStoredServiceNameMappingsAreUnchanged(
55+
@Nonnull final String serviceName,
56+
@Nonnull final String expectedPackageName,
57+
@Nonnull final String expectedClassName )
58+
{
59+
60+
// Mock ServiceNameMappings to return stored mappings
61+
final ServiceNameMappings mockMappings = mock(ServiceNameMappings.class);
62+
doReturn(Optional.of(expectedPackageName)).when(mockMappings).getString(serviceName + ".packageName");
63+
doReturn(Optional.of(expectedClassName)).when(mockMappings).getString(serviceName + ".className");
64+
65+
final EdmService service =
66+
new EdmService(
67+
serviceName,
68+
mockMappings,
69+
createMockEdm(),
70+
mock(ServiceDetails.class),
71+
ArrayListMultimap.create(),
72+
false);
73+
74+
assertThat(service.getJavaPackageName()).isEqualTo(expectedPackageName);
75+
assertThat(service.getJavaClassName()).isEqualTo(expectedClassName);
76+
}
77+
78+
private static Edm createMockEdm()
79+
{
80+
final Edm mockEdm = mock(Edm.class);
81+
final EdmEntityContainer mockContainer = mock(EdmEntityContainer.class);
82+
final EdmSchema mockSchema = mock(EdmSchema.class);
83+
doReturn(mockContainer).when(mockEdm).getEntityContainer();
84+
doReturn(List.of(mockSchema)).when(mockEdm).getSchemas();
85+
return mockEdm;
86+
}
87+
88+
private static Stream<Arguments> getServiceNameMappingScenarios()
89+
{
90+
return Stream
91+
.of(
92+
Arguments.of("API_MATERIAL_DOCUMENT_SRV", "materialdocumentsrv", "MATERIALDOCUMENTSRV"),
93+
Arguments.of("Product_Api_Service", "product", "Product" // "Api" and "Service" removed
94+
));
95+
}
96+
}

‎datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/EdmService.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ public Collection<FunctionImport> getAllFunctionImports()
160160
public String getJavaPackageName()
161161
{
162162
final String javaPackageNameKey = name + SERVICE_MAPPINGS_PACKAGE_SUFFIX;
163-
final String javaPackageName = serviceNameMappings.getString(javaPackageNameKey).orElseGet(this::getTitle);
164-
return NamingUtils.serviceNameToJavaPackageName(javaPackageName);
163+
return serviceNameMappings
164+
.getString(javaPackageNameKey)
165+
.orElseGet(() -> NamingUtils.serviceNameToJavaPackageName(getTitle()));
165166
}
166167

167168
@Override
@@ -174,8 +175,9 @@ public String getName()
174175
public String getJavaClassName()
175176
{
176177
final String javaClassNameKey = name + SERVICE_MAPPINGS_CLASS_SUFFIX;
177-
final String javaClassName = serviceNameMappings.getString(javaClassNameKey).orElseGet(this::getTitle);
178-
return NamingUtils.serviceNameToBaseJavaClassName(javaClassName);
178+
return serviceNameMappings
179+
.getString(javaClassNameKey)
180+
.orElseGet(() -> NamingUtils.serviceNameToBaseJavaClassName(getTitle()));
179181
}
180182

181183
@Override

0 commit comments

Comments
 (0)