Skip to content

fix: avoid mutating resource paths in ODataRequestCount #1121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Louis-Stegra wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −2
Open

fix: avoid mutating resource paths in ODataRequestCount #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions ...ent/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public ODataRequestCount(
@Nullable final String encodedQuery,
@Nonnull final ODataProtocol protocol )
{
super(servicePath, resourcePath.addSegment("$count"), encodedQuery, protocol);
super(servicePath, appendCountResourcePath(resourcePath), encodedQuery, protocol);
}

/**
Expand All @@ -74,8 +74,24 @@ public ODataRequestCount(
{
this(
servicePath,
resourcePath.addSegment(query.getEntityOrPropertyName()),
appendResourcePath(resourcePath, query.getEntityOrPropertyName()),
query.getEncodedQueryString(),
query.getProtocol());
}

@Nonnull
private static ODataResourcePath appendCountResourcePath( @Nonnull final ODataResourcePath resourcePath )
{
return appendResourcePath(resourcePath, "$count");
}

@Nonnull
private static
ODataResourcePath
appendResourcePath( @Nonnull final ODataResourcePath resourcePath, @Nonnull final String segment )
{
final ODataResourcePath appendedPath = new ODataResourcePath();
resourcePath.getSegments().forEach(s -> appendedPath.addSegment(s._1, s._2));
return appendedPath.addSegment(segment);
}
}
10 changes: 10 additions & 0 deletions ...src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestCountTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,14 @@ void testConstructorWithStructuredQuery()
assertThat(actual).isEqualTo(expected);
assertThat(actual.getQueryString()).isEqualTo(expected.getQueryString());
}

@Test
void testConstructorDoesNotMutateResourcePath()
{
final ODataResourcePath resourcePath = ODataResourcePath.of(ENTITY_NAME);

new ODataRequestCount(SERVICE_PATH, resourcePath, "", ODataProtocol.V4);

assertThat(resourcePath.toString()).isEqualTo("/" + ENTITY_NAME);
}
}
13 changes: 13 additions & 0 deletions ...data-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/core/NestedEntityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,19 @@ void testCountNestedTrip()
assertThat(count.getRelativeUri()).hasToString("/TripPinServiceRW/People('russellwhyte')/Trips/$count");
}

@Test
void testCountNestedTripToRequestIsStable()
{
final Person personByKey = Person.builder().userName("russellwhyte").build();
final CountRequestBuilder<Trip> countBuilder =
service.forEntity(personByKey).navigateTo(Person.TO_TRIPS).count();

assertThat(countBuilder.toRequest().getRelativeUri())
.hasToString("/TripPinServiceRW/People('russellwhyte')/Trips/$count");
assertThat(countBuilder.toRequest().getRelativeUri())
.hasToString("/TripPinServiceRW/People('russellwhyte')/Trips/$count");
}

@Test
void testGetByKeyNestedPlanItem()
{
Expand Down