Skip to content
Snippets Groups Projects

#16 - Fix indexing ' array of object' for all CSPs

Merged #16 - Fix indexing ' array of object' for all CSPs
hotfix/#16-array-of-objects into master
3 unresolved threads
Merged Dmitriy Rudko requested to merge hotfix/#16-array-of-objects into master
3 unresolved threads

Array of objects feature was implemented as a part of !114 (merged) but enabled only for GCP. This MR fix this and enable this mapping by default for other CSPs as well.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/AppExceptionHandler.java
28 30 } else {
29 31 log.warn(exceptionMsg, e.getOriginalException());
30 32 }
31 33
32 return new ResponseEntity<>(e.getError(), HttpStatus.resolve(e.getError().getCode()));
34 HttpStatus status = Objects.nonNull(HttpStatus.resolve(errorCode))
35 ? HttpStatus.resolve(errorCode)
36 : resolveNotSupportedStatus(errorCode);
37
38 return new ResponseEntity<>(e.getError(), status);
39 }
40
41 //Currently not all codes provided from core can be resolved by HttpStatus
42 //example org.opengroup.osdu.core.common.model.http.RequestStatus have not supported by HttpStatus codes
43 private HttpStatus resolveNotSupportedStatus(int statusCode) {
44 if (statusCode > 99 && statusCode < 200) {
  • Dmitriy Rudko picked the changes into the branch cherry-pick-feb78aa0 with commit 16c934e0

    picked the changes into the branch cherry-pick-feb78aa0 with commit 16c934e0

  • Dmitriy Rudko mentioned in commit 16c934e0

    mentioned in commit 16c934e0

  • Dmitriy Rudko mentioned in merge request !125 (merged)

    mentioned in merge request !125 (merged)

  • jingdong sun
    jingdong sun @jingdongsun started a thread on the diff
    • provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/AppExceptionHandler.java
    28 30 } else {
    29 31 log.warn(exceptionMsg, e.getOriginalException());
    30 32 }
    31 33
    32 return new ResponseEntity<>(e.getError(), HttpStatus.resolve(e.getError().getCode()));
    34 HttpStatus status = Objects.nonNull(HttpStatus.resolve(errorCode))
    35 ? HttpStatus.resolve(errorCode)
    36 : resolveNotSupportedStatus(errorCode);
    37
    38 return new ResponseEntity<>(e.getError(), status);
    39 }
    40
    41 //Currently not all codes provided from core can be resolved by HttpStatus
    42 //example org.opengroup.osdu.core.common.model.http.RequestStatus have not supported by HttpStatus codes
    43 private HttpStatus resolveNotSupportedStatus(int statusCode) {
    44 if (statusCode > 99 && statusCode < 200) {
  • Chad Leong added MRBugfix label

    added MRBugfix label

  • Chad Leong changed milestone to %M5 - Release 0.8

    changed milestone to %M5 - Release 0.8

    • Please register or sign in to reply