Commit 7451e429 authored by Benedetta Arena's avatar Benedetta Arena
Browse files

fix: resolve conflicts

parent 8065f28e

resources/ApiUtils/ContextInformationConsumption.resource

+21 −33
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ Query Entities Via POST 
    Output    ${response}    Query Entities Via POST

    RETURN    ${response}



Query Entity

Retrieve Entity

    [Arguments]

    ...    ${id}

    ...    ${accept}=${EMPTY}
@@ -154,11 +154,19 @@ Query Entity 
    ...    ${lang}=${EMPTY}

    ...    ${join}=${EMPTY}

    ...    ${joinLevel}=${EMPTY}

    ...    ${pick}=${EMPTY}

    ...    ${omit}=${EMPTY}

    ...    ${local}=${EMPTY}

    ...    ${broker_url}=${EMPTY}



    ${attrs_length}=    Get Length    ${attrs}

    ${accept_length}=    Get Length    ${accept}

    ${options_length}=    Get Length    ${options}

    ${format_length}=    Get Length    ${format}

    ${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
@@ -185,9 +193,20 @@ Query Entity 
    IF    '${join_level}'!=''

        Set To Dictionary    ${params}    joinLevel=${joinLevel}

    END

    IF    ${pick_length}>0    Set To Dictionary    ${params}    pick=${pick}

    IF    ${omit_length}>0    Set To Dictionary    ${params}    omit=${omit}

    IF    '${local}'!=''    Set To Dictionary    ${params}    local=${local}



    ${response}=    GET

    ...    url=${final_url}/${ENTITIES_ENDPOINT_PATH}${id}

    ...    headers=${headers}

    ...    params=${params}

    ...    expected_status=any

    Output    ${response}    Retrieve Entity

    RETURN    ${response}



    ${response}=    GET

    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}${id}

    ...    url=${final_url}/${ENTITIES_ENDPOINT_PATH}${id}

    ...    headers=${headers}

    ...    params=${params}

    ...    expected_status=any
@@ -237,37 +256,6 @@ Retrieve Attributes 
    Output    ${response}    Retrieve Attributes

    RETURN    ${response}



Retrieve Entity by Id

    [Arguments]

    ...    ${id}

    ...    ${accept}=${CONTENT_TYPE_LD_JSON}

    ...    ${context}=${EMPTY}

    ...    ${local}=${EMPTY}

    ...    ${options}=${EMPTY}

    ...    ${broker_url}=${EMPTY}

    ${headers}=    Create Dictionary

    &{params}=    Create Dictionary

    ${options_length}=    Get Length    ${options}

    ${final_url}=    Set Variable If    '${broker_url}' != ''    ${broker_url}    ${url}

    Set To Dictionary    ${headers}    Accept    ${accept}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=${context_link}

    END

    IF    '${local}'!=''    Set To Dictionary    ${params}    local=${local}

    IF    ${options_length}>0

        Set To Dictionary    ${params}    options=${options}

    END

    ${response}=    GET

    ...    url=${final_url}/${ENTITIES_ENDPOINT_PATH}${id}

    ...    headers=${headers}

    ...    params=${params}

    ...    expected_status=any

    Output    ${response}    Retrieve Entity by Id

    RETURN    ${response}



Retrieve Entity Type

    [Arguments]    ${type}    ${context}=${EMPTY}    ${accept}=${EMPTY}