Merge branch 'main' into dependabot/maven/jpa/io.netty-netty-codec-ht…

…tp-4.1.115.Final
SAP · Nov 16, 2024 · c3ed53c · c3ed53c
2 parents 1d25508 + 4232e3f
commit c3ed53c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -38,6 +38,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_PROJECT: ${{secrets.SONAR_PROJECT}}
-          SONAR_ORG: ${{vars.SONAR_ORG}}
+          SONAR_ORG: ${{secrets.SONAR_ORG}}
           SONAR_URL: https://sonarcloud.io
         run: cd ./jpa && mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.organization=${SONAR_ORG} -Dsonar.projectKey=${SONAR_PROJECT} -Dsonar.host.url=${SONAR_URL} -Dsonar.projectKey=SAP_olingo-jpa-processor-v4 -Dsonar.token=${SONAR_TOKEN}
diff --git a/.../main/java/com/sap/olingo/jpa/processor/core/processor/JPANavigationRequestProcessor.java b/.../main/java/com/sap/olingo/jpa/processor/core/processor/JPANavigationRequestProcessor.java
@@ -95,7 +95,7 @@ public <K extends Comparable<K>> void retrieveData(final ODataRequest request, f
       final var conditionValidationResult = validateEntityTag(result, requestContext.getHeader());
       // Read Expand and Collection
       EntityCollection entityCollection;
-      if (conditionValidationResult == JPAETagValidationResult.SUCCESS) {
+      if (conditionValidationResult == JPAETagValidationResult.SUCCESS && !isRootResultEmpty(result)) {
         final var keyBoundary = result.getKeyBoundary(requestContext, query.getNavigationInfo());
         final var watchDog = new JPAExpandWatchDog(determineTargetEntitySet(requestContext));
         watchDog.watch(uriInfo.getExpandOption(), uriInfo.getUriResourceParts());
@@ -213,6 +213,13 @@ JPAETagValidationResult validateEntityTag(final JPAConvertibleResult result, fin
     return JPAETagValidationResult.SUCCESS;
   }
 
+  boolean isRootResultEmpty(JPAConvertibleResult result) {
+    if (result instanceof JPAExpandResult expandResult) {
+      return expandResult.getResult(ROOT_RESULT_KEY).isEmpty();
+    }
+    return false;
+  }
+
   private List<String> getMatchHeader(final JPAHttpHeaderMap headers, final String matchHeader) {
     return Optional.ofNullable(headers.get(matchHeader)).orElseGet(() -> headers.get(
         matchHeader.toLowerCase(Locale.ENGLISH)));
@@ -326,10 +333,10 @@ private boolean primitiveHasNoContent(final List<Entity> entities) {
    * "http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/part2-url-conventions/odata-v4.0-errata02-os-part2-url-conventions-complete.html#_Toc406398162"
    * >OData Version 4.0 Part 2 - 5.1.2 System Query Option $expand</a> boundary
    * @param headers
-   * @param naviStartEdmEntitySet
+   * @param parentHops
    * @param parentHops
    * @param uriResourceInfo
-   * @param parentWhere
+   * @param watchDog
    * @return
    * @throws ODataException
    */

diff --git a/jpa/pom.xml b/jpa/pom.xml
@@ -19,7 +19,7 @@
         <powermock.version>1.7.1</powermock.version>
         <coveralls.version>4.3.0</coveralls.version>
         <cf-logging.version>3.8.4</cf-logging.version>
-        <flyway.version>10.20.0</flyway.version>
+        <flyway.version>10.21.0</flyway.version>
         <jakarta.version>6.1.0</jakarta.version>
         <javax.version>4.0.1</javax.version>
         <jpa.version>3.1.0</jpa.version>