Commit 47212576 authored by Benedetta Arena's avatar Benedetta Arena
Browse files

fix: resolve conflicts

parent 77d04bbb
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ Query Entities Via POST
    Output    ${response}    Query Entities Via POST
    RETURN    ${response}

Retrieve Entity
Retrieve Entity
    [Arguments]
    ...    ${id}
@@ -157,6 +158,8 @@ Retrieve Entity
    ...    ${pick}=${EMPTY}
    ...    ${omit}=${EMPTY}
    ...    ${local}=${EMPTY}
    ...    ${broker_url}=${EMPTY}

    ${attrs_length}=    Get Length    ${attrs}
    ${accept_length}=    Get Length    ${accept}
    ${options_length}=    Get Length    ${options}
@@ -164,6 +167,7 @@ Retrieve Entity
    ${lang_length}=    Get Length    ${lang}
    ${pick_length}=    Get Length    ${pick}
    ${omit_length}=    Get Length    ${omit}
    ${final_url}=    Set Variable If    '${broker_url}' != ''    ${broker_url}    ${url}
    &{headers}=    Create Dictionary
    &{params}=    Create Dictionary
    IF    ${accept_length}>0
@@ -195,7 +199,7 @@ Retrieve Entity
    IF    '${local}'!=''    Set To Dictionary    ${params}    local=${local}

    ${response}=    GET
    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}${id}
    ...    url=${final_url}/${ENTITIES_ENDPOINT_PATH}${id}
    ...    headers=${headers}
    ...    params=${params}
    ...    expected_status=any