diff --git a/src/objects/zcl_abapgit_object_enho.clas.abap b/src/objects/zcl_abapgit_object_enho.clas.abap index 1de08e974..4d158cf20 100644 --- a/src/objects/zcl_abapgit_object_enho.clas.abap +++ b/src/objects/zcl_abapgit_object_enho.clas.abap @@ -135,7 +135,8 @@ CLASS zcl_abapgit_object_enho IMPLEMENTATION. li_enho TYPE REF TO zif_abapgit_object_enho. IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. io_xml->read( EXPORTING iv_name = 'TOOL' diff --git a/src/objects/zcl_abapgit_object_enhs.clas.abap b/src/objects/zcl_abapgit_object_enhs.clas.abap index e29322fe5..2677281e2 100644 --- a/src/objects/zcl_abapgit_object_enhs.clas.abap +++ b/src/objects/zcl_abapgit_object_enhs.clas.abap @@ -89,7 +89,8 @@ CLASS zcl_abapgit_object_enhs IMPLEMENTATION. li_enhs TYPE REF TO zif_abapgit_object_enhs. IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. io_xml->read( EXPORTING iv_name = 'TOOL' diff --git a/src/objects/zcl_abapgit_object_ensc.clas.abap b/src/objects/zcl_abapgit_object_ensc.clas.abap index 678883e45..94c536552 100644 --- a/src/objects/zcl_abapgit_object_ensc.clas.abap +++ b/src/objects/zcl_abapgit_object_ensc.clas.abap @@ -69,7 +69,8 @@ CLASS zcl_abapgit_object_ensc IMPLEMENTATION. CHANGING cg_data = lt_comp_spots ). IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. lv_package = iv_package. diff --git a/src/objects/zcl_abapgit_object_iaxu.clas.abap b/src/objects/zcl_abapgit_object_iaxu.clas.abap index 42d3877ce..6798ad3b8 100644 --- a/src/objects/zcl_abapgit_object_iaxu.clas.abap +++ b/src/objects/zcl_abapgit_object_iaxu.clas.abap @@ -240,7 +240,8 @@ CLASS zcl_abapgit_object_iaxu IMPLEMENTATION. ls_attr-devclass = iv_package. IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. save( is_attr = ls_attr ). diff --git a/src/objects/zcl_abapgit_object_saxx_super.clas.abap b/src/objects/zcl_abapgit_object_saxx_super.clas.abap index 408f11f45..467de83c8 100644 --- a/src/objects/zcl_abapgit_object_saxx_super.clas.abap +++ b/src/objects/zcl_abapgit_object_saxx_super.clas.abap @@ -238,7 +238,8 @@ CLASS zcl_abapgit_object_saxx_super IMPLEMENTATION. cg_data = ). IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. TRY. diff --git a/src/objects/zcl_abapgit_object_sfpi.clas.abap b/src/objects/zcl_abapgit_object_sfpi.clas.abap index 58eb475d8..254546da7 100644 --- a/src/objects/zcl_abapgit_object_sfpi.clas.abap +++ b/src/objects/zcl_abapgit_object_sfpi.clas.abap @@ -104,7 +104,8 @@ CLASS zcl_abapgit_object_sfpi IMPLEMENTATION. lv_xstr = cl_ixml_80_20=>render_to_xstring( io_xml->get_raw( ) ). IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. TRY. diff --git a/src/objects/zcl_abapgit_object_sqsc.clas.abap b/src/objects/zcl_abapgit_object_sqsc.clas.abap index 76f46e384..df9c79a5c 100644 --- a/src/objects/zcl_abapgit_object_sqsc.clas.abap +++ b/src/objects/zcl_abapgit_object_sqsc.clas.abap @@ -104,10 +104,10 @@ CLASS zcl_abapgit_object_sqsc DEFINITION delete_interface_if_it_exists IMPORTING iv_package TYPE devclass + iv_transport TYPE trkorr iv_interface TYPE ty_abap_name RAISING zcx_abapgit_exception. - ENDCLASS. @@ -162,7 +162,8 @@ CLASS zcl_abapgit_object_sqsc IMPLEMENTATION. is_item = ls_item iv_language = mv_language. - lo_interface->zif_abapgit_object~delete( iv_package ). + lo_interface->zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. @@ -205,6 +206,7 @@ CLASS zcl_abapgit_object_sqsc IMPLEMENTATION. delete_interface_if_it_exists( iv_package = iv_package + iv_transport = iv_transport iv_interface = ls_proxy-header-interface_pool ). CALL METHOD mo_proxy->('IF_DBPROC_PROXY_UI~CREATE') diff --git a/src/objects/zcl_abapgit_object_tran.clas.abap b/src/objects/zcl_abapgit_object_tran.clas.abap index 52842735f..4477819e8 100644 --- a/src/objects/zcl_abapgit_object_tran.clas.abap +++ b/src/objects/zcl_abapgit_object_tran.clas.abap @@ -669,7 +669,8 @@ CLASS zcl_abapgit_object_tran IMPLEMENTATION. IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. io_xml->read( EXPORTING iv_name = 'TSTC' diff --git a/src/objects/zcl_abapgit_object_xslt.clas.abap b/src/objects/zcl_abapgit_object_xslt.clas.abap index 8ec8dc368..a6e3052e5 100644 --- a/src/objects/zcl_abapgit_object_xslt.clas.abap +++ b/src/objects/zcl_abapgit_object_xslt.clas.abap @@ -109,7 +109,8 @@ CLASS zcl_abapgit_object_xslt IMPLEMENTATION. ENDIF. IF zif_abapgit_object~exists( ) = abap_true. - zif_abapgit_object~delete( iv_package ). + zif_abapgit_object~delete( iv_package = iv_package + iv_transport = iv_transport ). ENDIF. io_xml->read( EXPORTING iv_name = 'ATTRIBUTES' diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 0423e07c7..112d66cc5 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -123,8 +123,9 @@ CLASS zcl_abapgit_objects DEFINITION !iv_package TYPE devclass . CLASS-METHODS delete_object IMPORTING - !iv_package TYPE devclass - !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_package TYPE devclass + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_transport TYPE trkorr RAISING zcx_abapgit_exception . CLASS-METHODS compare_remote_to_local @@ -137,10 +138,11 @@ CLASS zcl_abapgit_objects DEFINITION zcx_abapgit_exception . CLASS-METHODS deserialize_objects IMPORTING - !is_step TYPE zif_abapgit_objects=>ty_step_data - !ii_log TYPE REF TO zif_abapgit_log + !is_step TYPE zif_abapgit_objects=>ty_step_data + !ii_log TYPE REF TO zif_abapgit_log + !iv_transport TYPE trkorr CHANGING - !ct_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt + !ct_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt RAISING zcx_abapgit_exception . CLASS-METHODS check_objects_locked @@ -186,7 +188,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. +CLASS zcl_abapgit_objects IMPLEMENTATION. METHOD changed_by. @@ -503,8 +505,9 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. TRY. delete_object( - iv_package = -devclass - is_item = ls_item ). + iv_package = -devclass + is_item = ls_item + iv_transport = is_checks-transport-transport ). INSERT INTO TABLE lt_deleted. DELETE lt_tadir. @@ -552,7 +555,8 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. li_obj = create_object( is_item = is_item iv_language = zif_abapgit_definitions=>c_english ). - li_obj->delete( iv_package ). + li_obj->delete( iv_package = iv_package + iv_transport = iv_transport ). IF li_obj->get_metadata( )-delete_tadir = abap_true. @@ -721,9 +725,13 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. "run deserialize for all steps and it's objects SORT lt_steps BY order. LOOP AT lt_steps ASSIGNING . - deserialize_objects( EXPORTING is_step = - ii_log = ii_log - CHANGING ct_files = rt_accessed_files ). + deserialize_objects( + EXPORTING + is_step = + ii_log = ii_log + iv_transport = is_checks-transport-transport + CHANGING + ct_files = rt_accessed_files ). ENDLOOP. update_package_tree( io_repo->get_package( ) ). @@ -764,10 +772,11 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. iv_text = |Deserialize { is_step-descr } - { -item-obj_name }| ). TRY. - -obj->deserialize( iv_package = -package - io_xml = -xml - iv_step = is_step-step_id - ii_log = ii_log ). + -obj->deserialize( iv_package = -package + io_xml = -xml + iv_step = is_step-step_id + ii_log = ii_log + iv_transport = iv_transport ). APPEND LINES OF -obj->mo_files->get_accessed_files( ) TO ct_files. ii_log->add_success( iv_msg = |Object { -item-obj_name } imported| diff --git a/src/objects/zif_abapgit_object.intf.abap b/src/objects/zif_abapgit_object.intf.abap index 3ae9b8d98..018443150 100644 --- a/src/objects/zif_abapgit_object.intf.abap +++ b/src/objects/zif_abapgit_object.intf.abap @@ -20,15 +20,17 @@ INTERFACE zif_abapgit_object zcx_abapgit_exception . METHODS deserialize IMPORTING - !iv_package TYPE devclass - !io_xml TYPE REF TO zif_abapgit_xml_input - !iv_step TYPE zif_abapgit_definitions=>ty_deserialization_step - !ii_log TYPE REF TO zif_abapgit_log + !iv_package TYPE devclass + !io_xml TYPE REF TO zif_abapgit_xml_input + !iv_step TYPE zif_abapgit_definitions=>ty_deserialization_step + !ii_log TYPE REF TO zif_abapgit_log + !iv_transport TYPE trkorr RAISING zcx_abapgit_exception . METHODS delete IMPORTING - iv_package TYPE devclass + !iv_package TYPE devclass + !iv_transport TYPE trkorr RAISING zcx_abapgit_exception . METHODS exists