From f0fb0f047052affb67caa64c592eb1ddd0420323 Mon Sep 17 00:00:00 2001 From: larshp Date: Mon, 6 Aug 2018 15:36:03 +0200 Subject: [PATCH] TADIR performance TADIR performance #1756 All usages of TADIR aligned to use the same structure. DELFLAG added in the structure. 2 identical structure definitions deleted. todo: test this PR works after abapmerge has run --- src/objects/zcl_abapgit_object_sicf.clas.abap | 24 +- src/ui/zcl_abapgit_gui_page_main.clas.abap | 2 +- src/ui/zcl_abapgit_services_repo.clas.abap | 2 +- src/ui/zif_abapgit_popups.intf.abap | 278 ++++++++---------- src/zcl_abapgit_dependencies.clas.abap | 25 +- ...abapgit_dependencies.clas.testclasses.abap | 2 +- src/zcl_abapgit_objects.clas.abap | 6 +- src/zcl_abapgit_repo.clas.abap | 12 +- src/zcl_abapgit_tadir.clas.abap | 6 +- src/zcl_abapgit_transport.clas.abap | 57 ++-- src/zcl_abapgit_transport_2_branch.clas.abap | 21 +- src/zcl_abapgit_transport_objects.clas.abap | 6 +- ...it_transport_objects.clas.testclasses.abap | 4 +- src/zcl_abapgit_zip.clas.abap | 31 +- src/zif_abapgit_definitions.intf.abap | 1 + src/zif_abapgit_exit.intf.abap | 11 +- src/zif_abapgit_tadir.intf.abap | 2 +- 17 files changed, 237 insertions(+), 253 deletions(-) diff --git a/src/objects/zcl_abapgit_object_sicf.clas.abap b/src/objects/zcl_abapgit_object_sicf.clas.abap index da96cecf3..766bff3f2 100644 --- a/src/objects/zcl_abapgit_object_sicf.clas.abap +++ b/src/objects/zcl_abapgit_object_sicf.clas.abap @@ -16,7 +16,7 @@ CLASS zcl_abapgit_object_sicf DEFINITION !iv_pgmid TYPE tadir-pgmid DEFAULT 'R3TR' !iv_obj_name TYPE tadir-obj_name RETURNING - VALUE(rs_tadir) TYPE tadir + VALUE(rs_tadir) TYPE zif_abapgit_definitions=>ty_tadir RAISING zcx_abapgit_exception . CLASS-METHODS read_sicf_url @@ -322,7 +322,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SICF IMPLEMENTATION. METHOD read_tadir_sicf. - DATA: lt_tadir TYPE STANDARD TABLE OF tadir WITH DEFAULT KEY, + DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, lv_hash TYPE text25, lv_obj_name TYPE tadir-obj_name. @@ -332,11 +332,11 @@ CLASS ZCL_ABAPGIT_OBJECT_SICF IMPLEMENTATION. lv_hash = iv_obj_name+15. CONCATENATE iv_obj_name(15) '%' INTO lv_obj_name. - SELECT * FROM tadir INTO TABLE lt_tadir + SELECT * FROM tadir INTO CORRESPONDING FIELDS OF TABLE lt_tadir WHERE pgmid = iv_pgmid AND object = 'SICF' AND obj_name LIKE lv_obj_name - ORDER BY PRIMARY KEY. "#EC CI_GENBUFF + ORDER BY PRIMARY KEY. "#EC CI_GENBUFF LOOP AT lt_tadir ASSIGNING . IF read_sicf_url( -obj_name ) = lv_hash. @@ -481,7 +481,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SICF IMPLEMENTATION. METHOD zif_abapgit_object~exists. - DATA: ls_tadir TYPE tadir, + DATA: ls_tadir TYPE zif_abapgit_definitions=>ty_tadir, ls_key TYPE ty_sicf_key. ls_tadir = read_tadir_sicf( ms_item-obj_name ). @@ -509,6 +509,13 @@ CLASS ZCL_ABAPGIT_OBJECT_SICF IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_object~is_locked. + + rv_is_locked = abap_false. + + ENDMETHOD. + + METHOD zif_abapgit_object~jump. DATA: ls_bcdata TYPE bdcdata, @@ -579,11 +586,4 @@ CLASS ZCL_ABAPGIT_OBJECT_SICF IMPLEMENTATION. ig_data = lt_icfhandler ). ENDMETHOD. - - METHOD zif_abapgit_object~is_locked. - - rv_is_locked = abap_false. - - ENDMETHOD. - ENDCLASS. diff --git a/src/ui/zcl_abapgit_gui_page_main.clas.abap b/src/ui/zcl_abapgit_gui_page_main.clas.abap index 5626e55d8..194a4d718 100644 --- a/src/ui/zcl_abapgit_gui_page_main.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_main.clas.abap @@ -286,7 +286,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MAIN IMPLEMENTATION. METHOD test_changed_by. - DATA: ls_tadir TYPE tadir, + DATA: ls_tadir TYPE zif_abapgit_definitions=>ty_tadir, lv_user TYPE xubname, ls_item TYPE zif_abapgit_definitions=>ty_item. diff --git a/src/ui/zcl_abapgit_services_repo.clas.abap b/src/ui/zcl_abapgit_services_repo.clas.abap index eb507b8bf..68a8623cb 100644 --- a/src/ui/zcl_abapgit_services_repo.clas.abap +++ b/src/ui/zcl_abapgit_services_repo.clas.abap @@ -504,7 +504,7 @@ CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION. lo_repository TYPE REF TO zcl_abapgit_repo_online, lo_transport_to_branch TYPE REF TO zcl_abapgit_transport_2_branch, lt_transport_headers TYPE trwbo_request_headers, - lt_transport_objects TYPE scts_tadir, + lt_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt, ls_transport_to_branch TYPE zif_abapgit_definitions=>ty_transport_to_branch. diff --git a/src/ui/zif_abapgit_popups.intf.abap b/src/ui/zif_abapgit_popups.intf.abap index acf3e5e21..da06f15bf 100644 --- a/src/ui/zif_abapgit_popups.intf.abap +++ b/src/ui/zif_abapgit_popups.intf.abap @@ -1,6 +1,7 @@ INTERFACE zif_abapgit_popups PUBLIC . + TYPES: BEGIN OF ty_popup, url TYPE string, @@ -9,153 +10,134 @@ INTERFACE zif_abapgit_popups cancel TYPE abap_bool, END OF ty_popup . - CONSTANTS: - c_new_branch_label TYPE string VALUE '+ create new ...' ##NO_TEXT. - - METHODS: - popup_package_export - EXPORTING - ev_package TYPE devclass - ev_folder_logic TYPE string - RAISING - zcx_abapgit_exception, - - popup_folder_logic - RETURNING - VALUE(rv_folder_logic) TYPE string - RAISING - zcx_abapgit_exception, - - popup_object - RETURNING - VALUE(rs_tadir) TYPE tadir - RAISING - zcx_abapgit_exception, - - create_branch_popup - EXPORTING - ev_name TYPE string - ev_cancel TYPE abap_bool - RAISING - zcx_abapgit_exception, - - run_page_class_popup - EXPORTING - ev_name TYPE string - ev_cancel TYPE abap_bool - RAISING - zcx_abapgit_exception, - - repo_new_offline - RETURNING - VALUE(rs_popup) TYPE zif_abapgit_popups=>ty_popup - RAISING - zcx_abapgit_exception, - - branch_list_popup - IMPORTING - iv_url TYPE string - iv_default_branch TYPE string OPTIONAL - iv_show_new_option TYPE abap_bool OPTIONAL - RETURNING - VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch - RAISING - zcx_abapgit_exception, - - repo_popup - IMPORTING - iv_url TYPE string - iv_package TYPE devclass OPTIONAL - iv_branch TYPE string DEFAULT 'refs/heads/master' - iv_freeze_package TYPE abap_bool OPTIONAL - iv_freeze_url TYPE abap_bool OPTIONAL - iv_title TYPE clike DEFAULT 'Clone repository ...' - RETURNING - VALUE(rs_popup) TYPE zif_abapgit_popups=>ty_popup - RAISING - zcx_abapgit_exception ##NO_TEXT, - - popup_to_confirm - IMPORTING - titlebar TYPE clike - text_question TYPE clike - text_button_1 TYPE clike DEFAULT 'Yes' - icon_button_1 TYPE icon-name DEFAULT space - text_button_2 TYPE clike DEFAULT 'No' - icon_button_2 TYPE icon-name DEFAULT space - default_button TYPE char1 DEFAULT '1' - display_cancel_button TYPE char1 DEFAULT abap_true - RETURNING - VALUE(rv_answer) TYPE char1 - RAISING - zcx_abapgit_exception, - - popup_to_inform - IMPORTING - titlebar TYPE clike - text_message TYPE clike - RAISING - zcx_abapgit_exception, - - popup_to_create_package - EXPORTING - es_package_data TYPE scompkdtln - ev_create TYPE boolean - RAISING - zcx_abapgit_exception, - - popup_to_create_transp_branch - IMPORTING - it_transport_headers TYPE trwbo_request_headers - RETURNING - VALUE(rs_transport_branch) TYPE zif_abapgit_definitions=>ty_transport_to_branch - RAISING - zcx_abapgit_exception - zcx_abapgit_cancel, - - popup_to_select_transports - RETURNING - VALUE(rt_trkorr) TYPE trwbo_request_headers, - - popup_to_select_from_list - IMPORTING - it_list TYPE STANDARD TABLE - i_header_text TYPE csequence - i_select_column_text TYPE csequence - it_columns_to_display TYPE stringtab - EXPORTING - VALUE(et_list) TYPE STANDARD TABLE - RAISING - zcx_abapgit_cancel - zcx_abapgit_exception, - - branch_popup_callback - IMPORTING - iv_code TYPE clike - CHANGING - ct_fields TYPE zif_abapgit_definitions=>ty_sval_tt - cs_error TYPE svale - cv_show_popup TYPE char01 - RAISING - zcx_abapgit_exception, - - package_popup_callback - IMPORTING - iv_code TYPE clike - CHANGING - ct_fields TYPE zif_abapgit_definitions=>ty_sval_tt - cs_error TYPE svale - cv_show_popup TYPE char01 - RAISING - zcx_abapgit_exception, - - popup_transport_request - IMPORTING - is_transport_type TYPE zif_abapgit_definitions=>ty_transport_type - RETURNING - VALUE(rv_transport) TYPE trkorr - RAISING - zcx_abapgit_exception - zcx_abapgit_cancel. + CONSTANTS c_new_branch_label TYPE string VALUE '+ create new ...' ##NO_TEXT. + METHODS popup_package_export + EXPORTING + !ev_package TYPE devclass + !ev_folder_logic TYPE string + RAISING + zcx_abapgit_exception . + METHODS popup_folder_logic + RETURNING + VALUE(rv_folder_logic) TYPE string + RAISING + zcx_abapgit_exception . + METHODS popup_object + RETURNING + VALUE(rs_tadir) TYPE zif_abapgit_definitions=>ty_tadir + RAISING + zcx_abapgit_exception . + METHODS create_branch_popup + EXPORTING + !ev_name TYPE string + !ev_cancel TYPE abap_bool + RAISING + zcx_abapgit_exception . + METHODS run_page_class_popup + EXPORTING + !ev_name TYPE string + !ev_cancel TYPE abap_bool + RAISING + zcx_abapgit_exception . + METHODS repo_new_offline + RETURNING + VALUE(rs_popup) TYPE zif_abapgit_popups=>ty_popup + RAISING + zcx_abapgit_exception . + METHODS branch_list_popup + IMPORTING + !iv_url TYPE string + !iv_default_branch TYPE string OPTIONAL + !iv_show_new_option TYPE abap_bool OPTIONAL + RETURNING + VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch + RAISING + zcx_abapgit_exception . + METHODS repo_popup + IMPORTING + !iv_url TYPE string + !iv_package TYPE devclass OPTIONAL + !iv_branch TYPE string DEFAULT 'refs/heads/master' + !iv_freeze_package TYPE abap_bool OPTIONAL + !iv_freeze_url TYPE abap_bool OPTIONAL + !iv_title TYPE clike DEFAULT 'Clone repository ...' + RETURNING + VALUE(rs_popup) TYPE zif_abapgit_popups=>ty_popup + RAISING + zcx_abapgit_exception ##NO_TEXT. + METHODS popup_to_confirm + IMPORTING + !titlebar TYPE clike + !text_question TYPE clike + !text_button_1 TYPE clike DEFAULT 'Yes' + !icon_button_1 TYPE icon-name DEFAULT space + !text_button_2 TYPE clike DEFAULT 'No' + !icon_button_2 TYPE icon-name DEFAULT space + !default_button TYPE char1 DEFAULT '1' + !display_cancel_button TYPE char1 DEFAULT abap_true + RETURNING + VALUE(rv_answer) TYPE char1 + RAISING + zcx_abapgit_exception . + METHODS popup_to_inform + IMPORTING + !titlebar TYPE clike + !text_message TYPE clike + RAISING + zcx_abapgit_exception . + METHODS popup_to_create_package + EXPORTING + !es_package_data TYPE scompkdtln + !ev_create TYPE boolean + RAISING + zcx_abapgit_exception . + METHODS popup_to_create_transp_branch + IMPORTING + !it_transport_headers TYPE trwbo_request_headers + RETURNING + VALUE(rs_transport_branch) TYPE zif_abapgit_definitions=>ty_transport_to_branch + RAISING + zcx_abapgit_exception + zcx_abapgit_cancel . + METHODS popup_to_select_transports + RETURNING + VALUE(rt_trkorr) TYPE trwbo_request_headers . + METHODS popup_to_select_from_list + IMPORTING + !it_list TYPE STANDARD TABLE + !i_header_text TYPE csequence + !i_select_column_text TYPE csequence + !it_columns_to_display TYPE stringtab + EXPORTING + VALUE(et_list) TYPE STANDARD TABLE + RAISING + zcx_abapgit_cancel + zcx_abapgit_exception . + METHODS branch_popup_callback + IMPORTING + !iv_code TYPE clike + CHANGING + !ct_fields TYPE zif_abapgit_definitions=>ty_sval_tt + !cs_error TYPE svale + !cv_show_popup TYPE char01 + RAISING + zcx_abapgit_exception . + METHODS package_popup_callback + IMPORTING + !iv_code TYPE clike + CHANGING + !ct_fields TYPE zif_abapgit_definitions=>ty_sval_tt + !cs_error TYPE svale + !cv_show_popup TYPE char01 + RAISING + zcx_abapgit_exception . + METHODS popup_transport_request + IMPORTING + !is_transport_type TYPE zif_abapgit_definitions=>ty_transport_type + RETURNING + VALUE(rv_transport) TYPE trkorr + RAISING + zcx_abapgit_exception + zcx_abapgit_cancel . ENDINTERFACE. diff --git a/src/zcl_abapgit_dependencies.clas.abap b/src/zcl_abapgit_dependencies.clas.abap index 1a4349f4d..68ddcec06 100644 --- a/src/zcl_abapgit_dependencies.clas.abap +++ b/src/zcl_abapgit_dependencies.clas.abap @@ -5,21 +5,9 @@ CLASS zcl_abapgit_dependencies DEFINITION PUBLIC SECTION. - TYPES: - BEGIN OF ty_tadir, - pgmid TYPE tadir-pgmid, - object TYPE tadir-object, - obj_name TYPE tadir-obj_name, - devclass TYPE tadir-devclass, - korrnum TYPE tadir-korrnum, - path TYPE string, - END OF ty_tadir . - TYPES: - ty_tadir_tt TYPE STANDARD TABLE OF ty_tadir WITH DEFAULT KEY . - CLASS-METHODS resolve CHANGING - !ct_tadir TYPE ty_tadir_tt + !ct_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt RAISING zcx_abapgit_exception . PRIVATE SECTION. @@ -45,7 +33,7 @@ CLASS zcl_abapgit_dependencies DEFINITION CLASS-METHODS resolve_ddic CHANGING - !ct_tadir TYPE ty_tadir_tt + !ct_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt RAISING zcx_abapgit_exception . CLASS-METHODS get_ddls_dependencies @@ -55,12 +43,12 @@ CLASS zcl_abapgit_dependencies DEFINITION VALUE(rt_dependency) TYPE tty_dedenpency . CLASS-METHODS resolve_packages CHANGING - ct_tadir TYPE zcl_abapgit_dependencies=>ty_tadir_tt. + ct_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt. ENDCLASS. -CLASS zcl_abapgit_dependencies IMPLEMENTATION. +CLASS ZCL_ABAPGIT_DEPENDENCIES IMPLEMENTATION. METHOD get_ddls_dependencies. @@ -171,9 +159,9 @@ CLASS zcl_abapgit_dependencies IMPLEMENTATION. lt_scope TYPE STANDARD TABLE OF seu_obj, lt_dependency TYPE tty_dedenpency. - FIELD-SYMBOLS: TYPE ty_tadir, + FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_tadir, TYPE ty_dependency, - TYPE ty_tadir, + TYPE zif_abapgit_definitions=>ty_tadir, LIKE LINE OF ct_tadir, LIKE LINE OF lt_edges, LIKE LINE OF lt_founds, @@ -331,5 +319,4 @@ CLASS zcl_abapgit_dependencies IMPLEMENTATION. ENDLOOP. ENDMETHOD. - ENDCLASS. diff --git a/src/zcl_abapgit_dependencies.clas.testclasses.abap b/src/zcl_abapgit_dependencies.clas.testclasses.abap index 972bc111b..b2c09e0c3 100644 --- a/src/zcl_abapgit_dependencies.clas.testclasses.abap +++ b/src/zcl_abapgit_dependencies.clas.testclasses.abap @@ -90,7 +90,7 @@ CLASS ltcl_resolve_packages DEFINITION FOR TESTING PRIVATE SECTION. DATA: - mt_tadir TYPE zcl_abapgit_dependencies=>ty_tadir_tt, + mt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, mt_sub_packages TYPE ltd_sap_package=>tty_package. METHODS: diff --git a/src/zcl_abapgit_objects.clas.abap b/src/zcl_abapgit_objects.clas.abap index 83fc8b2ee..b6efb6905 100644 --- a/src/zcl_abapgit_objects.clas.abap +++ b/src/zcl_abapgit_objects.clas.abap @@ -206,7 +206,7 @@ ENDCLASS. -CLASS zcl_abapgit_objects IMPLEMENTATION. +CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. METHOD changed_by. @@ -995,7 +995,8 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. lt_overwrite_uniqe TYPE HASHED TABLE OF zif_abapgit_definitions=>ty_overwrite WITH UNIQUE KEY obj_type obj_name devclass, ls_overwrite LIKE LINE OF rt_overwrite, - ls_tadir TYPE tadir. + ls_tadir TYPE zif_abapgit_definitions=>ty_tadir. + DATA: lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic. FIELD-SYMBOLS: LIKE LINE OF it_results. @@ -1026,5 +1027,4 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. rt_overwrite = lt_overwrite_uniqe. ENDMETHOD. - ENDCLASS. diff --git a/src/zcl_abapgit_repo.clas.abap b/src/zcl_abapgit_repo.clas.abap index b54abff27..2cfe05b77 100644 --- a/src/zcl_abapgit_repo.clas.abap +++ b/src/zcl_abapgit_repo.clas.abap @@ -31,7 +31,7 @@ CLASS zcl_abapgit_repo DEFINITION METHODS get_files_local IMPORTING !io_log TYPE REF TO zcl_abapgit_log OPTIONAL - !it_filter TYPE scts_tadir OPTIONAL + !it_filter TYPE zif_abapgit_definitions=>ty_tadir_tt OPTIONAL RETURNING VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_item_tt RAISING @@ -63,7 +63,7 @@ CLASS zcl_abapgit_repo DEFINITION zcx_abapgit_exception . METHODS deserialize IMPORTING - is_checks TYPE zif_abapgit_definitions=>ty_deserialize_checks + !is_checks TYPE zif_abapgit_definitions=>ty_deserialize_checks RAISING zcx_abapgit_exception . METHODS refresh @@ -99,16 +99,14 @@ CLASS zcl_abapgit_repo DEFINITION VALUE(rs_settings) TYPE zif_abapgit_persistence=>ty_repo-local_settings . METHODS set_local_settings IMPORTING - is_settings TYPE zif_abapgit_persistence=>ty_repo-local_settings + !is_settings TYPE zif_abapgit_persistence=>ty_repo-local_settings RAISING zcx_abapgit_exception . METHODS run_code_inspector RETURNING - value(rt_list) TYPE scit_alvlist + VALUE(rt_list) TYPE scit_alvlist RAISING zcx_abapgit_exception . - - PROTECTED SECTION. DATA mt_local TYPE zif_abapgit_definitions=>ty_files_item_tt . DATA mt_remote TYPE zif_abapgit_definitions=>ty_files_tt . @@ -265,7 +263,7 @@ CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. lt_cache TYPE SORTED TABLE OF zif_abapgit_definitions=>ty_file_item WITH NON-UNIQUE KEY item. - DATA: lt_filter TYPE SORTED TABLE OF tadir + DATA: lt_filter TYPE SORTED TABLE OF zif_abapgit_definitions=>ty_tadir WITH NON-UNIQUE KEY object obj_name, lv_filter_exist TYPE abap_bool. diff --git a/src/zcl_abapgit_tadir.clas.abap b/src/zcl_abapgit_tadir.clas.abap index f421dd94f..5e379abc1 100644 --- a/src/zcl_abapgit_tadir.clas.abap +++ b/src/zcl_abapgit_tadir.clas.abap @@ -38,7 +38,7 @@ ENDCLASS. -CLASS zcl_abapgit_tadir IMPLEMENTATION. +CLASS ZCL_ABAPGIT_TADIR IMPLEMENTATION. METHOD build. @@ -197,7 +197,7 @@ CLASS zcl_abapgit_tadir IMPLEMENTATION. METHOD zif_abapgit_tadir~get_object_package. - DATA: ls_tadir TYPE tadir, + DATA: ls_tadir TYPE zif_abapgit_definitions=>ty_tadir, ls_item TYPE zif_abapgit_definitions=>ty_item. ls_tadir = zif_abapgit_tadir~read_single( @@ -251,7 +251,7 @@ CLASS zcl_abapgit_tadir IMPLEMENTATION. iv_pgmid = iv_pgmid iv_obj_name = iv_obj_name ). ELSE. - SELECT SINGLE * FROM tadir INTO rs_tadir + SELECT SINGLE * FROM tadir INTO CORRESPONDING FIELDS OF rs_tadir WHERE pgmid = iv_pgmid AND object = iv_object AND obj_name = iv_obj_name. "#EC CI_SUBRC diff --git a/src/zcl_abapgit_transport.clas.abap b/src/zcl_abapgit_transport.clas.abap index 437cfe7b6..e03baff7d 100644 --- a/src/zcl_abapgit_transport.clas.abap +++ b/src/zcl_abapgit_transport.clas.abap @@ -1,26 +1,41 @@ -CLASS zcl_abapgit_transport DEFINITION PUBLIC FINAL CREATE PUBLIC. +CLASS zcl_abapgit_transport DEFINITION + PUBLIC + FINAL + CREATE PUBLIC . PUBLIC SECTION. - CLASS-METHODS: - zip RAISING zcx_abapgit_exception, - to_tadir IMPORTING it_transport_headers TYPE trwbo_request_headers - RETURNING VALUE(rt_tadir) TYPE scts_tadir - RAISING zcx_abapgit_exception. + CLASS-METHODS zip + RAISING + zcx_abapgit_exception . + CLASS-METHODS to_tadir + IMPORTING + !it_transport_headers TYPE trwbo_request_headers + RETURNING + VALUE(rt_tadir) TYPE zif_abapgit_definitions=>ty_tadir_tt + RAISING + zcx_abapgit_exception . PRIVATE SECTION. - CLASS-METHODS: - read_requests - IMPORTING it_trkorr TYPE trwbo_request_headers - RETURNING VALUE(rt_requests) TYPE trwbo_requests - RAISING zcx_abapgit_exception, - find_top_package - IMPORTING it_tadir TYPE scts_tadir - RETURNING VALUE(rv_package) TYPE devclass, - resolve - IMPORTING it_requests TYPE trwbo_requests - RETURNING VALUE(rt_tadir) TYPE scts_tadir - RAISING zcx_abapgit_exception. + CLASS-METHODS read_requests + IMPORTING + !it_trkorr TYPE trwbo_request_headers + RETURNING + VALUE(rt_requests) TYPE trwbo_requests + RAISING + zcx_abapgit_exception . + CLASS-METHODS find_top_package + IMPORTING + !it_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt + RETURNING + VALUE(rv_package) TYPE devclass . + CLASS-METHODS resolve + IMPORTING + !it_requests TYPE trwbo_requests + RETURNING + VALUE(rt_tadir) TYPE zif_abapgit_definitions=>ty_tadir_tt + RAISING + zcx_abapgit_exception . ENDCLASS. @@ -87,7 +102,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION. DATA: lv_object TYPE tadir-object, lv_obj_name TYPE tadir-obj_name, lv_trobj_name TYPE trobj_name, - ls_tadir TYPE tadir. + ls_tadir TYPE zif_abapgit_definitions=>ty_tadir. FIELD-SYMBOLS: LIKE LINE OF it_requests, LIKE LINE OF -objects. @@ -145,7 +160,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION. METHOD zip. DATA: lt_requests TYPE trwbo_requests, - lt_tadir TYPE scts_tadir, + lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, lv_package TYPE devclass, ls_data TYPE zif_abapgit_persistence=>ty_repo, lo_repo TYPE REF TO zcl_abapgit_repo_offline, @@ -179,6 +194,6 @@ CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION. is_data = ls_data. zcl_abapgit_zip=>export( io_repo = lo_repo - it_filter = lt_tadir ). + it_filter = lt_tadir ). ENDMETHOD. ENDCLASS. diff --git a/src/zcl_abapgit_transport_2_branch.clas.abap b/src/zcl_abapgit_transport_2_branch.clas.abap index 92f3bf48c..eccb85072 100644 --- a/src/zcl_abapgit_transport_2_branch.clas.abap +++ b/src/zcl_abapgit_transport_2_branch.clas.abap @@ -1,12 +1,17 @@ -CLASS zcl_abapgit_transport_2_branch DEFINITION PUBLIC FINAL CREATE PUBLIC. +CLASS zcl_abapgit_transport_2_branch DEFINITION + PUBLIC + FINAL + CREATE PUBLIC . PUBLIC SECTION. - METHODS: - create - IMPORTING io_repository TYPE REF TO zcl_abapgit_repo_online - is_transport_to_branch TYPE zif_abapgit_definitions=>ty_transport_to_branch - it_transport_objects TYPE scts_tadir - RAISING zcx_abapgit_exception. + + METHODS create + IMPORTING + !io_repository TYPE REF TO zcl_abapgit_repo_online + !is_transport_to_branch TYPE zif_abapgit_definitions=>ty_transport_to_branch + !it_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt + RAISING + zcx_abapgit_exception . PROTECTED SECTION. METHODS generate_commit_message @@ -16,7 +21,7 @@ CLASS zcl_abapgit_transport_2_branch DEFINITION PUBLIC FINAL CREATE PUBLIC. VALUE(rs_comment) TYPE zif_abapgit_definitions=>ty_comment . METHODS stage_transport_objects IMPORTING - !it_transport_objects TYPE scts_tadir + !it_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt !io_stage TYPE REF TO zcl_abapgit_stage !is_stage_objects TYPE zif_abapgit_definitions=>ty_stage_files !it_object_statuses TYPE zif_abapgit_definitions=>ty_results_tt diff --git a/src/zcl_abapgit_transport_objects.clas.abap b/src/zcl_abapgit_transport_objects.clas.abap index 6dd664176..8b408a16d 100644 --- a/src/zcl_abapgit_transport_objects.clas.abap +++ b/src/zcl_abapgit_transport_objects.clas.abap @@ -7,7 +7,7 @@ CLASS zcl_abapgit_transport_objects DEFINITION METHODS constructor IMPORTING - !it_transport_objects TYPE scts_tadir . + !it_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt . METHODS to_stage IMPORTING !io_stage TYPE REF TO zcl_abapgit_stage @@ -16,8 +16,8 @@ CLASS zcl_abapgit_transport_objects DEFINITION RAISING zcx_abapgit_exception . PRIVATE SECTION. - DATA mt_transport_objects TYPE scts_tadir. + DATA mt_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt . ENDCLASS. @@ -31,7 +31,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT_OBJECTS IMPLEMENTATION. METHOD to_stage. - DATA: ls_transport_object TYPE tadir, + DATA: ls_transport_object LIKE LINE OF mt_transport_objects, ls_local_file TYPE zif_abapgit_definitions=>ty_file_item, ls_object_status TYPE zif_abapgit_definitions=>ty_result. diff --git a/src/zcl_abapgit_transport_objects.clas.testclasses.abap b/src/zcl_abapgit_transport_objects.clas.testclasses.abap index f58a80e25..9f869ac37 100644 --- a/src/zcl_abapgit_transport_objects.clas.testclasses.abap +++ b/src/zcl_abapgit_transport_objects.clas.testclasses.abap @@ -46,7 +46,7 @@ CLASS ltcl_transport_objects DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HA iv_path TYPE string. DATA: mo_transport_objects TYPE REF TO zcl_abapgit_transport_objects, - mt_transport_objects TYPE scts_tadir, + mt_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt, mt_object_statuses TYPE zif_abapgit_definitions=>ty_results_tt, ms_stage_objects TYPE zif_abapgit_definitions=>ty_stage_files, mo_stage TYPE REF TO zcl_abapgit_stage. @@ -282,7 +282,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION. ENDMETHOD. METHOD given_the_transport_object. - DATA ls_transport_object TYPE tadir. + DATA ls_transport_object TYPE zif_abapgit_definitions=>ty_tadir. ls_transport_object-obj_name = iv_obj_name. ls_transport_object-object = iv_obj_type. ls_transport_object-delflag = iv_delflag. diff --git a/src/zcl_abapgit_zip.clas.abap b/src/zcl_abapgit_zip.clas.abap index ef564a477..5852e7248 100644 --- a/src/zcl_abapgit_zip.clas.abap +++ b/src/zcl_abapgit_zip.clas.abap @@ -3,21 +3,26 @@ CLASS zcl_abapgit_zip DEFINITION CREATE PUBLIC . PUBLIC SECTION. + CLASS-METHODS import - IMPORTING iv_key TYPE zif_abapgit_persistence=>ty_value - RAISING zcx_abapgit_exception. - + IMPORTING + !iv_key TYPE zif_abapgit_persistence=>ty_value + RAISING + zcx_abapgit_exception . CLASS-METHODS export - IMPORTING io_repo TYPE REF TO zcl_abapgit_repo - it_filter TYPE scts_tadir OPTIONAL - RAISING zcx_abapgit_exception. - + IMPORTING + !io_repo TYPE REF TO zcl_abapgit_repo + !it_filter TYPE zif_abapgit_definitions=>ty_tadir_tt OPTIONAL + RAISING + zcx_abapgit_exception . CLASS-METHODS export_package - RAISING zcx_abapgit_exception zcx_abapgit_cancel. - + RAISING + zcx_abapgit_exception + zcx_abapgit_cancel . CLASS-METHODS export_object - RAISING zcx_abapgit_exception zcx_abapgit_cancel. - + RAISING + zcx_abapgit_exception + zcx_abapgit_cancel . PRIVATE SECTION. CLASS-METHODS file_upload RETURNING VALUE(rv_xstr) TYPE xstring @@ -52,7 +57,7 @@ ENDCLASS. -CLASS zcl_abapgit_zip IMPLEMENTATION. +CLASS ZCL_ABAPGIT_ZIP IMPLEMENTATION. METHOD encode_files. @@ -106,7 +111,7 @@ CLASS zcl_abapgit_zip IMPLEMENTATION. METHOD export_object. - DATA: ls_tadir TYPE tadir, + DATA: ls_tadir TYPE zif_abapgit_definitions=>ty_tadir, ls_item TYPE zif_abapgit_definitions=>ty_item, lv_folder TYPE string, lv_fullpath TYPE string, diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index b626f50f3..2c972023f 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -182,6 +182,7 @@ INTERFACE zif_abapgit_definitions PUBLIC. obj_name TYPE tadir-obj_name, devclass TYPE tadir-devclass, korrnum TYPE tadir-korrnum, + delflag TYPE tadir-delflag, path TYPE string, END OF ty_tadir . TYPES: diff --git a/src/zif_abapgit_exit.intf.abap b/src/zif_abapgit_exit.intf.abap index 202b03e7e..b2fc35265 100644 --- a/src/zif_abapgit_exit.intf.abap +++ b/src/zif_abapgit_exit.intf.abap @@ -1,15 +1,6 @@ INTERFACE zif_abapgit_exit PUBLIC. TYPES: - BEGIN OF ty_tadir, - pgmid TYPE tadir-pgmid, - object TYPE tadir-object, - obj_name TYPE tadir-obj_name, - devclass TYPE tadir-devclass, - korrnum TYPE tadir-korrnum, - path TYPE string, - END OF ty_tadir, - ty_tadir_tt TYPE STANDARD TABLE OF ty_tadir WITH DEFAULT KEY, ty_icm_sinfo2_tt TYPE STANDARD TABLE OF icm_sinfo2 WITH DEFAULT KEY. METHODS: @@ -34,6 +25,6 @@ INTERFACE zif_abapgit_exit PUBLIC. iv_package TYPE devclass io_log TYPE REF TO zcl_abapgit_log CHANGING - ct_tadir TYPE ty_tadir_tt. + ct_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt. ENDINTERFACE. diff --git a/src/zif_abapgit_tadir.intf.abap b/src/zif_abapgit_tadir.intf.abap index 7649efde2..7d14dec8e 100644 --- a/src/zif_abapgit_tadir.intf.abap +++ b/src/zif_abapgit_tadir.intf.abap @@ -28,7 +28,7 @@ INTERFACE zif_abapgit_tadir !iv_object TYPE tadir-object !iv_obj_name TYPE tadir-obj_name RETURNING - VALUE(rs_tadir) TYPE tadir + VALUE(rs_tadir) TYPE zif_abapgit_definitions=>ty_tadir RAISING zcx_abapgit_exception . ENDINTERFACE.