From ff6725e7596bedd1f5b3fb3610df266246e576f0 Mon Sep 17 00:00:00 2001 From: larshp Date: Sat, 16 Mar 2019 11:25:05 +0000 Subject: [PATCH] replace uses of log with interface --- .../zcl_abapgit_background.clas.abap | 9 +++-- .../zcl_abapgit_background_push_au.clas.abap | 12 +++--- .../zcl_abapgit_background_push_fi.clas.abap | 10 ++--- .../zif_abapgit_background.intf.abap | 2 +- .../zcl_abapgit_objects_activation.clas.abap | 11 +++--- src/ui/zcl_abapgit_gui_view_repo.clas.abap | 9 +++-- src/utils/zcl_abapgit_log.clas.abap | 37 +++++-------------- src/zcl_abapgit_exit.clas.abap | 2 +- src/zcl_abapgit_file_status.clas.abap | 31 ++++++++-------- ..._abapgit_file_status.clas.testclasses.abap | 32 ++++++++-------- src/zcl_abapgit_repo.clas.abap | 10 ++--- src/zcl_abapgit_repo_content_list.clas.abap | 17 +++++---- src/zcl_abapgit_serialize.clas.abap | 14 +++---- ...cl_abapgit_serialize.clas.testclasses.abap | 18 ++++----- src/zcl_abapgit_skip_objects.clas.abap | 7 ++-- src/zcl_abapgit_tadir.clas.abap | 8 ++-- src/zcl_abapgit_zip.clas.abap | 10 ++--- src/zif_abapgit_exit.intf.abap | 2 +- src/zif_abapgit_tadir.intf.abap | 2 +- 19 files changed, 116 insertions(+), 127 deletions(-) diff --git a/src/background/zcl_abapgit_background.clas.abap b/src/background/zcl_abapgit_background.clas.abap index 1c9ce068b..12376f086 100644 --- a/src/background/zcl_abapgit_background.clas.abap +++ b/src/background/zcl_abapgit_background.clas.abap @@ -16,6 +16,7 @@ CLASS zcl_abapgit_background DEFINITION zcx_abapgit_exception . CLASS-METHODS list_methods RETURNING VALUE(rt_methods) TYPE ty_methods_tt. + PROTECTED SECTION. PRIVATE SECTION. ENDCLASS. @@ -74,7 +75,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND IMPLEMENTATION. lo_repo TYPE REF TO zcl_abapgit_repo_online, lt_list TYPE zcl_abapgit_persist_background=>tt_background, li_background TYPE REF TO zif_abapgit_background, - lo_log TYPE REF TO zcl_abapgit_log, + li_log TYPE REF TO zif_abapgit_log, lv_repo_name TYPE string. FIELD-SYMBOLS: LIKE LINE OF lt_list. @@ -109,15 +110,15 @@ CLASS ZCL_ABAPGIT_BACKGROUND IMPLEMENTATION. iv_username = -username iv_password = -password ). - CREATE OBJECT lo_log. + CREATE OBJECT li_log TYPE zcl_abapgit_log. CREATE OBJECT li_background TYPE (-method). li_background->run( io_repo = lo_repo - io_log = lo_log + ii_log = li_log it_settings = -settings ). - lo_log->write( ). + li_log->write( ). ENDLOOP. IF lines( lt_list ) = 0. diff --git a/src/background/zcl_abapgit_background_push_au.clas.abap b/src/background/zcl_abapgit_background_push_au.clas.abap index cf00527f2..d648c64b3 100644 --- a/src/background/zcl_abapgit_background_push_au.clas.abap +++ b/src/background/zcl_abapgit_background_push_au.clas.abap @@ -8,7 +8,7 @@ CLASS zcl_abapgit_background_push_au DEFINITION INTERFACES zif_abapgit_background . PROTECTED SECTION. - DATA mo_log TYPE REF TO zcl_abapgit_log . + DATA mi_log TYPE REF TO zif_abapgit_log . METHODS build_comment IMPORTING @@ -141,7 +141,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_AU IMPLEMENTATION. changed_by = lv_changed_by TRANSPORTING NO FIELDS. IF sy-subrc = 0. - mo_log->add_info( |stage: { + mi_log->add_info( |stage: { ls_comment-committer-name } { -file-path } { -file-filename }| ). @@ -156,7 +156,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_AU IMPLEMENTATION. WHERE filename = -file-filename AND path <> -file-path AND filename <> 'package.devc.xml'. - mo_log->add_info( |rm: { + mi_log->add_info( |rm: { -path } { -filename }| ). @@ -198,7 +198,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_AU IMPLEMENTATION. LOOP AT is_files-remote ASSIGNING . - mo_log->add_info( |removed: { + mi_log->add_info( |removed: { -path } { -filename }| ). @@ -237,11 +237,11 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_AU IMPLEMENTATION. DATA: ls_files TYPE zif_abapgit_definitions=>ty_stage_files. - mo_log = io_log. + mi_log = ii_log. ls_files = zcl_abapgit_factory=>get_stage_logic( )->get( io_repo ). IF lines( ls_files-local ) = 0 AND lines( ls_files-remote ) = 0. - io_log->add_info( 'Nothing to stage' ) ##NO_TEXT. + ii_log->add_info( 'Nothing to stage' ) ##NO_TEXT. RETURN. ENDIF. diff --git a/src/background/zcl_abapgit_background_push_fi.clas.abap b/src/background/zcl_abapgit_background_push_fi.clas.abap index 96971a141..16257b2dd 100644 --- a/src/background/zcl_abapgit_background_push_fi.clas.abap +++ b/src/background/zcl_abapgit_background_push_fi.clas.abap @@ -13,7 +13,7 @@ CLASS zcl_abapgit_background_push_fi DEFINITION name TYPE string VALUE 'NAME', email TYPE string VALUE 'EMAIL', END OF c_settings . - DATA mo_log TYPE REF TO zcl_abapgit_log . + DATA mi_log TYPE REF TO zif_abapgit_log . METHODS build_comment IMPORTING @@ -80,7 +80,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_FI IMPLEMENTATION. CREATE OBJECT lo_stage. LOOP AT ls_files-local ASSIGNING . - mo_log->add_info( |stage: { + mi_log->add_info( |stage: { -file-path } { -file-filename }| ). lo_stage->add( iv_path = -file-path @@ -90,7 +90,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_FI IMPLEMENTATION. LOOP AT ls_files-remote ASSIGNING . - mo_log->add_info( |removed: { + mi_log->add_info( |removed: { -path } { -filename }| ). @@ -145,11 +145,11 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_FI IMPLEMENTATION. lv_name TYPE string, lv_email TYPE string. - mo_log = io_log. + mi_log = ii_log. ls_files = zcl_abapgit_factory=>get_stage_logic( )->get( io_repo ). IF lines( ls_files-local ) = 0 AND lines( ls_files-remote ) = 0. - io_log->add_info( 'Nothing to stage' ). + ii_log->add_info( 'Nothing to stage' ). RETURN. ENDIF. diff --git a/src/background/zif_abapgit_background.intf.abap b/src/background/zif_abapgit_background.intf.abap index 24bc28291..5f1ea86b2 100644 --- a/src/background/zif_abapgit_background.intf.abap +++ b/src/background/zif_abapgit_background.intf.abap @@ -19,7 +19,7 @@ INTERFACE zif_abapgit_background METHODS run IMPORTING !io_repo TYPE REF TO zcl_abapgit_repo_online - !io_log TYPE REF TO zcl_abapgit_log + !ii_log TYPE REF TO zif_abapgit_log !it_settings TYPE ty_settings_tt OPTIONAL RAISING zcx_abapgit_exception . diff --git a/src/objects/zcl_abapgit_objects_activation.clas.abap b/src/objects/zcl_abapgit_objects_activation.clas.abap index cf8b8afc1..2e2572ccd 100644 --- a/src/objects/zcl_abapgit_objects_activation.clas.abap +++ b/src/objects/zcl_abapgit_objects_activation.clas.abap @@ -256,10 +256,11 @@ CLASS ZCL_ABAPGIT_OBJECTS_ACTIVATION IMPLEMENTATION. DATA: lt_lines TYPE STANDARD TABLE OF trlog, lv_logname_db TYPE ddprh-protname, - lo_log TYPE REF TO zcl_abapgit_log. + li_log TYPE REF TO zif_abapgit_log. FIELD-SYMBOLS: LIKE LINE OF lt_lines. + lv_logname_db = iv_logname. CALL FUNCTION 'TR_READ_LOG' @@ -279,14 +280,14 @@ CLASS ZCL_ABAPGIT_OBJECTS_ACTIVATION IMPLEMENTATION. DELETE lt_lines WHERE severity <> 'E'. - CREATE OBJECT lo_log. + CREATE OBJECT li_log TYPE zcl_abapgit_log. LOOP AT lt_lines ASSIGNING . - lo_log->add( -line ). + li_log->add( -line ). ENDLOOP. - IF lo_log->count( ) > 0. - lo_log->show( ). + IF li_log->count( ) > 0. + li_log->show( ). ENDIF. ENDMETHOD. diff --git a/src/ui/zcl_abapgit_gui_view_repo.clas.abap b/src/ui/zcl_abapgit_gui_view_repo.clas.abap index 39e11764f..76e17d0b3 100644 --- a/src/ui/zcl_abapgit_gui_view_repo.clas.abap +++ b/src/ui/zcl_abapgit_gui_view_repo.clas.abap @@ -695,9 +695,10 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_REPO IMPLEMENTATION. lv_max TYPE abap_bool, lv_max_str TYPE string, lv_add_str TYPE string, - lo_log TYPE REF TO zcl_abapgit_log, + li_log TYPE REF TO zif_abapgit_log, lv_render_transports TYPE abap_bool. + FIELD-SYMBOLS LIKE LINE OF lt_repo_items. " Reinit, for the case of type change @@ -728,10 +729,10 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_REPO IMPLEMENTATION. ro_html->add( render_head_line( iv_lstate = lv_lstate iv_rstate = lv_rstate ) ). - lo_log = lo_browser->get_log( ). - IF mo_repo->is_offline( ) = abap_false AND lo_log->count( ) > 0. + li_log = lo_browser->get_log( ). + IF mo_repo->is_offline( ) = abap_false AND li_log->count( ) > 0. ro_html->add( '
' ). - ro_html->add( lo_log->to_html( ) ). " shows eg. list of unsupported objects + ro_html->add( li_log->to_html( ) ). " shows eg. list of unsupported objects ro_html->add( '
' ). ENDIF. diff --git a/src/utils/zcl_abapgit_log.clas.abap b/src/utils/zcl_abapgit_log.clas.abap index 9a5aefe54..cf356dce1 100644 --- a/src/utils/zcl_abapgit_log.clas.abap +++ b/src/utils/zcl_abapgit_log.clas.abap @@ -6,26 +6,6 @@ CLASS zcl_abapgit_log DEFINITION INTERFACES zif_abapgit_log . - ALIASES add - FOR zif_abapgit_log~add . - ALIASES add_error - FOR zif_abapgit_log~add_error . - ALIASES add_info - FOR zif_abapgit_log~add_info . - ALIASES add_warning - FOR zif_abapgit_log~add_warning . - ALIASES clear - FOR zif_abapgit_log~clear . - ALIASES count - FOR zif_abapgit_log~count . - ALIASES has_rc - FOR zif_abapgit_log~has_rc . - ALIASES show - FOR zif_abapgit_log~show . - ALIASES to_html - FOR zif_abapgit_log~to_html . - ALIASES write - FOR zif_abapgit_log~write . PROTECTED SECTION. TYPES: @@ -101,24 +81,27 @@ CLASS ZCL_ABAPGIT_LOG IMPLEMENTATION. METHOD zif_abapgit_log~add_error. - add( iv_msg = iv_msg - iv_type = 'E' ). + zif_abapgit_log~add( + iv_msg = iv_msg + iv_type = 'E' ). ENDMETHOD. METHOD zif_abapgit_log~add_info. - add( iv_msg = iv_msg - iv_type = 'I' ). + zif_abapgit_log~add( + iv_msg = iv_msg + iv_type = 'I' ). ENDMETHOD. METHOD zif_abapgit_log~add_warning. - add( iv_msg = iv_msg - iv_type = 'W' ). + zif_abapgit_log~add( + iv_msg = iv_msg + iv_type = 'W' ). ENDMETHOD. @@ -202,7 +185,7 @@ CLASS ZCL_ABAPGIT_LOG IMPLEMENTATION. CREATE OBJECT ro_html. - IF count( ) = 0. + IF zif_abapgit_log~count( ) = 0. RETURN. ENDIF. diff --git a/src/zcl_abapgit_exit.clas.abap b/src/zcl_abapgit_exit.clas.abap index f9c23a7ee..0c1321e79 100644 --- a/src/zcl_abapgit_exit.clas.abap +++ b/src/zcl_abapgit_exit.clas.abap @@ -100,7 +100,7 @@ CLASS ZCL_ABAPGIT_EXIT IMPLEMENTATION. gi_exit->change_tadir( EXPORTING iv_package = iv_package - io_log = io_log + ii_log = ii_log CHANGING ct_tadir = ct_tadir ). CATCH cx_sy_ref_is_initial cx_sy_dyn_call_illegal_method ##NO_HANDLER. diff --git a/src/zcl_abapgit_file_status.clas.abap b/src/zcl_abapgit_file_status.clas.abap index af5bedcc6..af3bdc99e 100644 --- a/src/zcl_abapgit_file_status.clas.abap +++ b/src/zcl_abapgit_file_status.clas.abap @@ -7,7 +7,7 @@ CLASS zcl_abapgit_file_status DEFINITION CLASS-METHODS status IMPORTING io_repo TYPE REF TO zcl_abapgit_repo - io_log TYPE REF TO zcl_abapgit_log OPTIONAL + ii_log TYPE REF TO zif_abapgit_log OPTIONAL RETURNING VALUE(rt_results) TYPE zif_abapgit_definitions=>ty_results_tt RAISING zcx_abapgit_exception. @@ -24,7 +24,7 @@ CLASS zcl_abapgit_file_status DEFINITION RETURNING VALUE(rt_results) TYPE zif_abapgit_definitions=>ty_results_tt RAISING zcx_abapgit_exception, run_checks - IMPORTING io_log TYPE REF TO zcl_abapgit_log + IMPORTING ii_log TYPE REF TO zif_abapgit_log it_results TYPE zif_abapgit_definitions=>ty_results_tt io_dot TYPE REF TO zcl_abapgit_dot_abapgit iv_top TYPE devclass @@ -317,18 +317,19 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. METHOD run_checks. - DATA: lv_path TYPE string, - ls_item TYPE zif_abapgit_definitions=>ty_item, - ls_file TYPE zif_abapgit_definitions=>ty_file_signature, - lt_res_sort LIKE it_results, - lt_item_idx LIKE it_results. - DATA: lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic. + DATA: lv_path TYPE string, + ls_item TYPE zif_abapgit_definitions=>ty_item, + ls_file TYPE zif_abapgit_definitions=>ty_file_signature, + lt_res_sort LIKE it_results, + lt_item_idx LIKE it_results, + lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic. FIELD-SYMBOLS: LIKE LINE OF it_results, LIKE LINE OF it_results. - IF io_log IS INITIAL. + IF ii_log IS INITIAL. +* huh? RETURN. ENDIF. @@ -355,7 +356,7 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. BINARY SEARCH. " Sorted above IF sy-subrc <> 0 OR -path <> -path. " All paths are same - io_log->add( iv_msg = |Files for object { -obj_type } { + ii_log->add( iv_msg = |Files for object { -obj_type } { -obj_name } are not placed in the same folder| iv_type = 'W' iv_rc = '1' ) ##no_text. @@ -371,7 +372,7 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. io_dot = io_dot iv_package = -package ). IF lv_path <> -path. - io_log->add( iv_msg = |Package and path does not match for object, { + ii_log->add( iv_msg = |Package and path does not match for object, { -obj_type } { -obj_name }| iv_type = 'W' iv_rc = '2' ) ##no_text. @@ -383,13 +384,13 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. LOOP AT lt_res_sort ASSIGNING WHERE obj_type <> 'DEVC'. IF -filename IS NOT INITIAL AND -filename = ls_file-filename. - io_log->add( iv_msg = |Multiple files with same filename, { -filename }| + ii_log->add( iv_msg = |Multiple files with same filename, { -filename }| iv_type = 'W' iv_rc = '3' ) ##no_text. ENDIF. IF -filename IS INITIAL. - io_log->add( iv_msg = |Filename is empty for object { -obj_type } { -obj_name }| + ii_log->add( iv_msg = |Filename is empty for object { -obj_type } { -obj_name }| iv_type = 'W' iv_rc = '4' ) ##no_text. ENDIF. @@ -411,7 +412,7 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. rt_results = calculate_status( iv_devclass = io_repo->get_package( ) io_dot = io_repo->get_dot_abapgit( ) - it_local = io_repo->get_files_local( io_log = io_log ) + it_local = io_repo->get_files_local( ii_log = ii_log ) it_remote = io_repo->get_files_remote( ) it_cur_state = io_repo->get_local_checksums_per_file( ) ). @@ -429,7 +430,7 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. ENDLOOP. run_checks( - io_log = io_log + ii_log = ii_log it_results = rt_results io_dot = lo_dot_abapgit iv_top = io_repo->get_package( ) ). diff --git a/src/zcl_abapgit_file_status.clas.testclasses.abap b/src/zcl_abapgit_file_status.clas.testclasses.abap index e3aa32e81..6cacac26e 100644 --- a/src/zcl_abapgit_file_status.clas.testclasses.abap +++ b/src/zcl_abapgit_file_status.clas.testclasses.abap @@ -19,7 +19,7 @@ CLASS ltcl_run_checks DEFINITION FOR TESTING RISK LEVEL HARMLESS PRIVATE SECTION. DATA: mt_results TYPE zif_abapgit_definitions=>ty_results_tt, mo_dot TYPE REF TO zcl_abapgit_dot_abapgit, - mo_log TYPE REF TO zcl_abapgit_log. + mi_log TYPE REF TO zif_abapgit_log. METHODS: setup, @@ -35,7 +35,7 @@ CLASS ltcl_run_checks IMPLEMENTATION. METHOD setup. - CREATE OBJECT mo_log. + CREATE OBJECT mi_log TYPE zcl_abapgit_log. mo_dot = zcl_abapgit_dot_abapgit=>build_default( ). mo_dot->set_starting_folder( '/' ). @@ -55,13 +55,13 @@ CLASS ltcl_run_checks IMPLEMENTATION. _append_result 'DOMA' 'ZDOMA2' ' ' 'M' ' ' '$Z$' '/' 'zdoma2.doma.xml'. zcl_abapgit_file_status=>run_checks( - io_log = mo_log + ii_log = mi_log it_results = mt_results io_dot = mo_dot iv_top = '$Z$' ). cl_abap_unit_assert=>assert_equals( - act = mo_log->count( ) + act = mi_log->count( ) exp = 0 ). ENDMETHOD. @@ -79,18 +79,18 @@ CLASS ltcl_run_checks IMPLEMENTATION. _append_result 'DOMA' 'ZDOMA2' ' ' 'M' ' ' '$Z$' '/' 'zdoma2.doma.xml'. zcl_abapgit_file_status=>run_checks( - io_log = mo_log + ii_log = mi_log it_results = mt_results io_dot = mo_dot iv_top = '$Z$' ). " This one is not pure - incorrect path also triggers path vs package check cl_abap_unit_assert=>assert_equals( - act = mo_log->count( ) + act = mi_log->count( ) exp = 2 ). cl_abap_unit_assert=>assert_equals( - act = mo_log->has_rc( '1' ) + act = mi_log->has_rc( '1' ) exp = abap_true ). ENDMETHOD. @@ -108,17 +108,17 @@ CLASS ltcl_run_checks IMPLEMENTATION. _append_result 'DOMA' '$$ZDOMA2' ' ' 'M' ' ' '$Z$' '/' '$$zdoma2.doma.xml'. zcl_abapgit_file_status=>run_checks( - io_log = mo_log + ii_log = mi_log it_results = mt_results io_dot = mo_dot iv_top = '$Z$' ). cl_abap_unit_assert=>assert_equals( - act = mo_log->count( ) + act = mi_log->count( ) exp = 1 ). cl_abap_unit_assert=>assert_equals( - act = mo_log->has_rc( '2' ) + act = mi_log->has_rc( '2' ) exp = abap_true ). ENDMETHOD. @@ -136,17 +136,17 @@ CLASS ltcl_run_checks IMPLEMENTATION. _append_result 'DOMA' '$$ZDOMA2' ' ' 'M' ' ' '$Z$' '/' '$$zdoma1.doma.xml'. zcl_abapgit_file_status=>run_checks( - io_log = mo_log + ii_log = mi_log it_results = mt_results io_dot = mo_dot iv_top = '$Z$' ). cl_abap_unit_assert=>assert_equals( - act = mo_log->count( ) + act = mi_log->count( ) exp = 1 ). cl_abap_unit_assert=>assert_equals( - act = mo_log->has_rc( '3' ) + act = mi_log->has_rc( '3' ) exp = abap_true ). ENDMETHOD. @@ -163,17 +163,17 @@ CLASS ltcl_run_checks IMPLEMENTATION. _append_result 'DOMA' '$$ZDOMA1' 'X' ' ' ' ' '$Z$' '/' ''. zcl_abapgit_file_status=>run_checks( - io_log = mo_log + ii_log = mi_log it_results = mt_results io_dot = mo_dot iv_top = '$Z$' ). cl_abap_unit_assert=>assert_equals( - act = mo_log->count( ) + act = mi_log->count( ) exp = 1 ). cl_abap_unit_assert=>assert_equals( - act = mo_log->has_rc( '4' ) + act = mi_log->has_rc( '4' ) exp = abap_true ). ENDMETHOD. diff --git a/src/zcl_abapgit_repo.clas.abap b/src/zcl_abapgit_repo.clas.abap index e3e1de570..25a640c74 100644 --- a/src/zcl_abapgit_repo.clas.abap +++ b/src/zcl_abapgit_repo.clas.abap @@ -31,7 +31,7 @@ CLASS zcl_abapgit_repo DEFINITION zcx_abapgit_exception . METHODS get_files_local IMPORTING - !io_log TYPE REF TO zcl_abapgit_log OPTIONAL + !ii_log TYPE REF TO zif_abapgit_log OPTIONAL !it_filter TYPE zif_abapgit_definitions=>ty_tadir_tt OPTIONAL RETURNING VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_item_tt @@ -101,7 +101,7 @@ CLASS zcl_abapgit_repo DEFINITION VALUE(rv_yes) TYPE abap_bool . METHODS status IMPORTING - !io_log TYPE REF TO zcl_abapgit_log OPTIONAL + !ii_log TYPE REF TO zif_abapgit_log OPTIONAL RETURNING VALUE(rt_results) TYPE zif_abapgit_definitions=>ty_results_tt RAISING @@ -379,7 +379,7 @@ CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. iv_ignore_subpackages = get_local_settings( )-ignore_subpackages iv_only_local_objects = get_local_settings( )-only_local_objects io_dot = get_dot_abapgit( ) - io_log = io_log ). + ii_log = ii_log ). apply_filter( EXPORTING it_filter = it_filter CHANGING ct_tadir = lt_tadir ). @@ -389,7 +389,7 @@ CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. lt_found = lo_serialize->serialize( it_tadir = lt_tadir iv_language = get_dot_abapgit( )->get_master_language( ) - io_log = io_log ). + ii_log = ii_log ). APPEND LINES OF lt_found TO rt_files. mt_local = rt_files. @@ -616,7 +616,7 @@ CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. IF lines( mt_status ) = 0. mt_status = zcl_abapgit_file_status=>status( io_repo = me - io_log = io_log ). + ii_log = ii_log ). ENDIF. rt_results = mt_status. diff --git a/src/zcl_abapgit_repo_content_list.clas.abap b/src/zcl_abapgit_repo_content_list.clas.abap index c108ed8be..a31331d7e 100644 --- a/src/zcl_abapgit_repo_content_list.clas.abap +++ b/src/zcl_abapgit_repo_content_list.clas.abap @@ -15,7 +15,8 @@ CLASS zcl_abapgit_repo_content_list DEFINITION RAISING zcx_abapgit_exception. METHODS get_log - RETURNING VALUE(ro_log) TYPE REF TO zcl_abapgit_log. + RETURNING VALUE(ri_log) TYPE REF TO zif_abapgit_log. + PROTECTED SECTION. PRIVATE SECTION. CONSTANTS: BEGIN OF c_sortkey, default TYPE i VALUE 9999, @@ -27,7 +28,7 @@ CLASS zcl_abapgit_repo_content_list DEFINITION END OF c_sortkey. DATA: mo_repo TYPE REF TO zcl_abapgit_repo, - mo_log TYPE REF TO zcl_abapgit_log. + mi_log TYPE REF TO zif_abapgit_log. METHODS build_repo_items_local_only RETURNING VALUE(rt_repo_items) TYPE zif_abapgit_definitions=>tt_repo_items @@ -134,14 +135,14 @@ CLASS ZCL_ABAPGIT_REPO_CONTENT_LIST IMPLEMENTATION. METHOD build_repo_items_with_remote. DATA: - ls_file TYPE zif_abapgit_definitions=>ty_repo_file, - lt_status TYPE zif_abapgit_definitions=>ty_results_tt. + ls_file TYPE zif_abapgit_definitions=>ty_repo_file, + lt_status TYPE zif_abapgit_definitions=>ty_results_tt. FIELD-SYMBOLS: LIKE LINE OF lt_status, LIKE LINE OF rt_repo_items. - lt_status = mo_repo->status( mo_log ). + lt_status = mo_repo->status( mi_log ). LOOP AT lt_status ASSIGNING . AT NEW obj_name. "obj_type + obj_name @@ -190,7 +191,7 @@ CLASS ZCL_ABAPGIT_REPO_CONTENT_LIST IMPLEMENTATION. METHOD constructor. mo_repo = io_repo. - CREATE OBJECT mo_log. + CREATE OBJECT mi_log TYPE zcl_abapgit_log. ENDMETHOD. @@ -202,13 +203,13 @@ CLASS ZCL_ABAPGIT_REPO_CONTENT_LIST IMPLEMENTATION. METHOD get_log. - ro_log = mo_log. + ri_log = mi_log. ENDMETHOD. METHOD list. - mo_log->clear( ). + mi_log->clear( ). IF mo_repo->has_remote_source( ) = abap_true. rt_repo_items = build_repo_items_with_remote( ). diff --git a/src/zcl_abapgit_serialize.clas.abap b/src/zcl_abapgit_serialize.clas.abap index 40ba09cc7..1d41d5e95 100644 --- a/src/zcl_abapgit_serialize.clas.abap +++ b/src/zcl_abapgit_serialize.clas.abap @@ -12,7 +12,7 @@ CLASS zcl_abapgit_serialize DEFINITION IMPORTING !it_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt !iv_language TYPE langu DEFAULT sy-langu - !io_log TYPE REF TO zcl_abapgit_log OPTIONAL + !ii_log TYPE REF TO zif_abapgit_log OPTIONAL !iv_force_sequential TYPE abap_bool DEFAULT abap_false RETURNING VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_item_tt @@ -24,7 +24,7 @@ CLASS zcl_abapgit_serialize DEFINITION CLASS-DATA gv_max_threads TYPE i . DATA mt_files TYPE zif_abapgit_definitions=>ty_files_item_tt . DATA mv_free TYPE i . - DATA mo_log TYPE REF TO zcl_abapgit_log . + DATA mi_log TYPE REF TO zif_abapgit_log . DATA mv_group TYPE rzlli_apcl . METHODS add_to_return @@ -185,8 +185,8 @@ CLASS ZCL_ABAPGIT_SERIALIZE IMPLEMENTATION. error = 1 OTHERS = 2. IF sy-subrc <> 0. - IF NOT mo_log IS INITIAL. - mo_log->add_error( |{ sy-msgv1 }{ sy-msgv2 }{ sy-msgv3 }{ sy-msgv3 }| ). + IF NOT mi_log IS INITIAL. + mi_log->add_error( |{ sy-msgv1 }{ sy-msgv2 }{ sy-msgv3 }{ sy-msgv3 }| ). ENDIF. ELSE. IMPORT data = ls_fils_item FROM DATA BUFFER lv_result. "#EC CI_SUBRC @@ -257,8 +257,8 @@ CLASS ZCL_ABAPGIT_SERIALIZE IMPLEMENTATION. add_to_return( is_fils_item = ls_fils_item iv_path = is_tadir-path ). CATCH zcx_abapgit_exception INTO lx_error. - IF NOT mo_log IS INITIAL. - mo_log->add_error( lx_error->get_text( ) ). + IF NOT mi_log IS INITIAL. + mi_log->add_error( lx_error->get_text( ) ). ENDIF. ENDTRY. @@ -277,7 +277,7 @@ CLASS ZCL_ABAPGIT_SERIALIZE IMPLEMENTATION. lv_max = determine_max_threads( iv_force_sequential ). mv_free = lv_max. - mo_log = io_log. + mi_log = ii_log. li_progress = zcl_abapgit_progress=>get_instance( lines( it_tadir ) ). diff --git a/src/zcl_abapgit_serialize.clas.testclasses.abap b/src/zcl_abapgit_serialize.clas.testclasses.abap index aef0e7520..475037027 100644 --- a/src/zcl_abapgit_serialize.clas.testclasses.abap +++ b/src/zcl_abapgit_serialize.clas.testclasses.abap @@ -99,8 +99,8 @@ CLASS ltcl_serialize IMPLEMENTATION. METHOD unsupported. DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, - lo_log1 TYPE REF TO zcl_abapgit_log, - lo_log2 TYPE REF TO zcl_abapgit_log. + li_log1 TYPE REF TO zif_abapgit_log, + li_log2 TYPE REF TO zif_abapgit_log. FIELD-SYMBOLS: LIKE LINE OF lt_tadir. @@ -109,25 +109,25 @@ CLASS ltcl_serialize IMPLEMENTATION. -object = 'ABCD'. -obj_name = 'OBJECT'. - CREATE OBJECT lo_log1. + CREATE OBJECT li_log1 TYPE zcl_abapgit_log. mo_cut->serialize( it_tadir = lt_tadir - io_log = lo_log1 + ii_log = li_log1 iv_force_sequential = abap_true ). - CREATE OBJECT lo_log2. + CREATE OBJECT li_log2 TYPE zcl_abapgit_log. mo_cut->serialize( it_tadir = lt_tadir - io_log = lo_log2 + ii_log = li_log2 iv_force_sequential = abap_false ). cl_abap_unit_assert=>assert_char_cp( - act = lo_log1->to_html( )->render( ) + act = li_log1->to_html( )->render( ) exp = '*Object type ignored, not supported*' ). cl_abap_unit_assert=>assert_equals( - act = lo_log1->to_html( )->render( ) - exp = lo_log2->to_html( )->render( ) ). + act = li_log1->to_html( )->render( ) + exp = li_log2->to_html( )->render( ) ). ENDMETHOD. diff --git a/src/zcl_abapgit_skip_objects.clas.abap b/src/zcl_abapgit_skip_objects.clas.abap index 3bbc9023a..d171cbac9 100644 --- a/src/zcl_abapgit_skip_objects.clas.abap +++ b/src/zcl_abapgit_skip_objects.clas.abap @@ -5,9 +5,10 @@ CLASS zcl_abapgit_skip_objects DEFINITION PUBLIC FINAL CREATE PUBLIC. skip_sadl_generated_objects IMPORTING it_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt - io_log TYPE REF TO zcl_abapgit_log OPTIONAL + ii_log TYPE REF TO zif_abapgit_log OPTIONAL RETURNING VALUE(rt_tadir) TYPE zif_abapgit_definitions=>ty_tadir_tt. + PROTECTED SECTION. PRIVATE SECTION. METHODS: has_sadl_superclass @@ -59,8 +60,8 @@ CLASS ZCL_ABAPGIT_SKIP_OBJECTS IMPLEMENTATION. DELETE ADJACENT DUPLICATES FROM lt_lines_to_delete. LOOP AT lt_lines_to_delete INTO ls_tadir_class. DELETE TABLE rt_tadir FROM ls_tadir_class. - IF io_log IS BOUND. - io_log->add( + IF ii_log IS BOUND. + ii_log->add( iv_msg = |{ ls_tadir_class-obj_name } skipped: generated by SADL| iv_type = 'W' ). ENDIF. diff --git a/src/zcl_abapgit_tadir.clas.abap b/src/zcl_abapgit_tadir.clas.abap index 129df0e6e..a2d688134 100644 --- a/src/zcl_abapgit_tadir.clas.abap +++ b/src/zcl_abapgit_tadir.clas.abap @@ -29,7 +29,7 @@ CLASS zcl_abapgit_tadir DEFINITION !io_dot TYPE REF TO zcl_abapgit_dot_abapgit !iv_ignore_subpackages TYPE abap_bool DEFAULT abap_false !iv_only_local_objects TYPE abap_bool - !io_log TYPE REF TO zcl_abapgit_log OPTIONAL + !ii_log TYPE REF TO zif_abapgit_log OPTIONAL RETURNING VALUE(rt_tadir) TYPE zif_abapgit_definitions=>ty_tadir_tt RAISING @@ -99,7 +99,7 @@ CLASS ZCL_ABAPGIT_TADIR IMPLEMENTATION. CREATE OBJECT lo_skip_objects. rt_tadir = lo_skip_objects->skip_sadl_generated_objects( it_tadir = rt_tadir - io_log = io_log ). + ii_log = ii_log ). LOOP AT lt_packages ASSIGNING . " Local packages are not in TADIR, only in TDEVC, act as if they were @@ -234,13 +234,13 @@ CLASS ZCL_ABAPGIT_TADIR IMPLEMENTATION. io_dot = io_dot iv_ignore_subpackages = iv_ignore_subpackages iv_only_local_objects = iv_only_local_objects - io_log = io_log ). + ii_log = ii_log ). li_exit = zcl_abapgit_exit=>get_instance( ). li_exit->change_tadir( EXPORTING iv_package = iv_package - io_log = io_log + ii_log = ii_log CHANGING ct_tadir = rt_tadir ). diff --git a/src/zcl_abapgit_zip.clas.abap b/src/zcl_abapgit_zip.clas.abap index 4fbcdafc1..b6277b064 100644 --- a/src/zcl_abapgit_zip.clas.abap +++ b/src/zcl_abapgit_zip.clas.abap @@ -90,12 +90,12 @@ CLASS ZCL_ABAPGIT_ZIP IMPLEMENTATION. METHOD export. - DATA: lo_log TYPE REF TO zcl_abapgit_log, + DATA: li_log TYPE REF TO zif_abapgit_log, lt_zip TYPE zif_abapgit_definitions=>ty_files_item_tt, lv_package TYPE devclass. - CREATE OBJECT lo_log. + CREATE OBJECT li_log TYPE zcl_abapgit_log. lv_package = io_repo->get_package( ). @@ -103,11 +103,11 @@ CLASS ZCL_ABAPGIT_ZIP IMPLEMENTATION. zcx_abapgit_exception=>raise( |Package { lv_package } doesn't exist| ). ENDIF. - lt_zip = io_repo->get_files_local( io_log = lo_log + lt_zip = io_repo->get_files_local( ii_log = li_log it_filter = it_filter ). - IF lo_log->count( ) > 0. - lo_log->show( ). + IF li_log->count( ) > 0. + li_log->show( ). ENDIF. rv_xstr = encode_files( lt_zip ). diff --git a/src/zif_abapgit_exit.intf.abap b/src/zif_abapgit_exit.intf.abap index 24491b794..70646ad96 100644 --- a/src/zif_abapgit_exit.intf.abap +++ b/src/zif_abapgit_exit.intf.abap @@ -40,7 +40,7 @@ INTERFACE zif_abapgit_exit METHODS change_tadir IMPORTING !iv_package TYPE devclass - !io_log TYPE REF TO zcl_abapgit_log + !ii_log TYPE REF TO zif_abapgit_log CHANGING !ct_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt . METHODS get_ssl_id diff --git a/src/zif_abapgit_tadir.intf.abap b/src/zif_abapgit_tadir.intf.abap index 7d14dec8e..817c65af4 100644 --- a/src/zif_abapgit_tadir.intf.abap +++ b/src/zif_abapgit_tadir.intf.abap @@ -17,7 +17,7 @@ INTERFACE zif_abapgit_tadir !iv_ignore_subpackages TYPE abap_bool DEFAULT abap_false !iv_only_local_objects TYPE abap_bool DEFAULT abap_false !io_dot TYPE REF TO zcl_abapgit_dot_abapgit OPTIONAL - !io_log TYPE REF TO zcl_abapgit_log OPTIONAL + !ii_log TYPE REF TO zif_abapgit_log OPTIONAL RETURNING VALUE(rt_tadir) TYPE zif_abapgit_definitions=>ty_tadir_tt RAISING