From 690da4e51f8a8d704e9734ed26eccc63ad68b12e Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Fri, 15 Jan 2021 08:31:01 +0100 Subject: [PATCH] delete some unused variables (#4411) * delete some unused variables * bdef, remove unused vars * remove some more --- src/cts/zcl_abapgit_transport.clas.abap | 1 - src/data/zcl_abapgit_data_config.clas.abap | 1 - .../core/zcl_abapgit_file_status.clas.abap | 11 +- src/objects/zcl_abapgit_object_bdef.clas.abap | 306 +++++++++--------- src/ui/zcl_abapgit_gui_page_stage.clas.abap | 3 - ...pgit_html_form_utils.clas.testclasses.abap | 3 +- .../zcl_abapgit_convert.clas.testclasses.abap | 1 - 7 files changed, 157 insertions(+), 169 deletions(-) diff --git a/src/cts/zcl_abapgit_transport.clas.abap b/src/cts/zcl_abapgit_transport.clas.abap index 5f5f43502..b8823120c 100644 --- a/src/cts/zcl_abapgit_transport.clas.abap +++ b/src/cts/zcl_abapgit_transport.clas.abap @@ -293,7 +293,6 @@ CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION. lv_package TYPE devclass, lo_dot_abapgit TYPE REF TO zcl_abapgit_dot_abapgit, ls_local_settings TYPE zif_abapgit_persistence=>ty_repo-local_settings, - lo_repo TYPE REF TO zcl_abapgit_repo_offline, lt_trkorr TYPE trwbo_request_headers. diff --git a/src/data/zcl_abapgit_data_config.clas.abap b/src/data/zcl_abapgit_data_config.clas.abap index 735fe1260..a3842c03c 100644 --- a/src/data/zcl_abapgit_data_config.clas.abap +++ b/src/data/zcl_abapgit_data_config.clas.abap @@ -30,7 +30,6 @@ CLASS ZCL_ABAPGIT_DATA_CONFIG IMPLEMENTATION. METHOD dump. DATA lo_ajson TYPE REF TO zcl_abapgit_ajson. - DATA lv_string TYPE string. DATA lx_ajson TYPE REF TO zcx_abapgit_ajson_error. diff --git a/src/objects/core/zcl_abapgit_file_status.clas.abap b/src/objects/core/zcl_abapgit_file_status.clas.abap index 5934c9eb7..ae121a4a1 100644 --- a/src/objects/core/zcl_abapgit_file_status.clas.abap +++ b/src/objects/core/zcl_abapgit_file_status.clas.abap @@ -65,7 +65,7 @@ ENDCLASS. -CLASS zcl_abapgit_file_status IMPLEMENTATION. +CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. METHOD build_existing. @@ -512,12 +512,9 @@ CLASS zcl_abapgit_file_status IMPLEMENTATION. METHOD status. - DATA: lv_index LIKE sy-tabix, - lt_local TYPE zif_abapgit_definitions=>ty_files_item_tt. + DATA lt_local TYPE zif_abapgit_definitions=>ty_files_item_tt. - FIELD-SYMBOLS: LIKE LINE OF rt_results. - - lt_local = io_repo->get_files_local( ii_log = ii_log ). + lt_local = io_repo->get_files_local( ii_log ). IF lines( lt_local ) <= 2. " Less equal two means that we have only the .abapgit.xml and the package in @@ -530,7 +527,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( ii_log = ii_log ) + it_local = io_repo->get_files_local( ii_log ) it_remote = io_repo->get_files_remote( ) it_cur_state = io_repo->get_local_checksums_per_file( ) ). diff --git a/src/objects/zcl_abapgit_object_bdef.clas.abap b/src/objects/zcl_abapgit_object_bdef.clas.abap index 75b0ac83e..be9852c49 100644 --- a/src/objects/zcl_abapgit_object_bdef.clas.abap +++ b/src/objects/zcl_abapgit_object_bdef.clas.abap @@ -218,6 +218,158 @@ CLASS ZCL_ABAPGIT_OBJECT_BDEF IMPLEMENTATION. ENDMETHOD. + METHOD get_object_data. + + DATA: + lr_metadata TYPE REF TO data, + lr_data TYPE REF TO data. + + FIELD-SYMBOLS: + TYPE any, + TYPE any, + TYPE any, + TYPE any. + + CREATE DATA lr_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA=>TY_OBJECT_DATA'). + ASSIGN lr_data->* TO . + ASSERT sy-subrc = 0. + + ASSIGN COMPONENT 'METADATA' OF STRUCTURE TO . + ASSERT sy-subrc = 0. + + CREATE DATA lr_metadata TYPE ('IF_ADT_TOOLS_CORE_SOURCE_TYPES=>TY_ABAP_SOURCE_MAIN_OBJECT'). + ASSIGN lr_metadata->* TO . + ASSERT sy-subrc = 0. + + io_xml->read( + EXPORTING + iv_name = 'BDEF' + CHANGING + cg_data = ). + + = . + + ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . + ASSERT sy-subrc = 0. + + = mo_files->read_string( 'asbdef' ). + + CREATE OBJECT ro_object_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). + + ro_object_data->set_data( p_data = ). + + ENDMETHOD. + + + METHOD get_transport_req_if_needed. + + DATA: li_sap_package TYPE REF TO zif_abapgit_sap_package. + + li_sap_package = zcl_abapgit_factory=>get_sap_package( iv_package ). + + IF li_sap_package->are_changes_recorded_in_tr_req( ) = abap_true. + rv_transport_request = zcl_abapgit_default_transport=>get_instance( )->get( )-ordernum. + ENDIF. + + ENDMETHOD. + + + METHOD get_wb_object_operator. + + DATA: + ls_object_type TYPE wbobjtype, + lx_error TYPE REF TO cx_root. + + IF mi_wb_object_operator IS BOUND. + ri_wb_object_operator = mi_wb_object_operator. + ENDIF. + + ls_object_type-objtype_tr = 'BDEF'. + ls_object_type-subtype_wb = 'BDO'. + + TRY. + CALL METHOD ('CL_WB_OBJECT_OPERATOR')=>('CREATE_INSTANCE') + EXPORTING + object_type = ls_object_type + object_key = mv_behaviour_definition_key + RECEIVING + result = mi_wb_object_operator. + + CATCH cx_root INTO lx_error. + zcx_abapgit_exception=>raise( + iv_text = lx_error->get_text( ) + ix_previous = lx_error ). + ENDTRY. + + ri_wb_object_operator = mi_wb_object_operator. + + ENDMETHOD. + + + METHOD merge_object_data. + + DATA: + lo_object_data TYPE REF TO object, + lo_object_data_old TYPE REF TO if_wb_object_data_model, + lr_new TYPE REF TO data, + lr_old TYPE REF TO data, + lo_wb_object_operator TYPE REF TO object. + + FIELD-SYMBOLS: + TYPE any, + TYPE any, + TYPE any, + TYPE any. + + CREATE OBJECT lo_object_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). + lo_object_data = io_object_data. + + CREATE DATA lr_new TYPE ('CL_BLUE_SOURCE_OBJECT_DATA=>TY_OBJECT_DATA'). + ASSIGN lr_new->* TO . + ASSERT sy-subrc = 0. + + CREATE DATA lr_old TYPE ('CL_BLUE_SOURCE_OBJECT_DATA=>TY_OBJECT_DATA'). + ASSIGN lr_old->* TO . + ASSERT sy-subrc = 0. + + CALL METHOD lo_object_data->('IF_WB_OBJECT_DATA_MODEL~GET_DATA') + EXPORTING + p_metadata_only = abap_false + p_data_selection = 'AL' + IMPORTING + p_data = . + + lo_wb_object_operator = get_wb_object_operator( ). + + CALL METHOD lo_wb_object_operator->('IF_WB_OBJECT_OPERATOR~READ') + EXPORTING + data_selection = 'AL' " if_wb_object_data_selection_co=>c_all_data + IMPORTING + eo_object_data = lo_object_data_old. + + CALL METHOD lo_object_data_old->('GET_DATA') + EXPORTING + p_metadata_only = abap_false + p_data_selection = 'AL' " if_wb_object_data_selection_co=>c_all_data + IMPORTING + p_data = . + + ASSIGN COMPONENT 'METADATA-DESCRIPTION' OF STRUCTURE TO . + ASSIGN COMPONENT 'METADATA-DESCRIPTION' OF STRUCTURE TO . + = . + + ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . + ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . + = . + + CREATE OBJECT ro_object_data_merged TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). + + CALL METHOD ro_object_data_merged->('SET_DATA') + EXPORTING + p_data = . + ENDMETHOD. + + METHOD zif_abapgit_object~changed_by. DATA: @@ -491,158 +643,4 @@ CLASS ZCL_ABAPGIT_OBJECT_BDEF IMPLEMENTATION. iv_string = lv_source ). ENDMETHOD. - - - METHOD get_transport_req_if_needed. - - DATA: li_sap_package TYPE REF TO zif_abapgit_sap_package. - - li_sap_package = zcl_abapgit_factory=>get_sap_package( iv_package ). - - IF li_sap_package->are_changes_recorded_in_tr_req( ) = abap_true. - rv_transport_request = zcl_abapgit_default_transport=>get_instance( )->get( )-ordernum. - ENDIF. - - ENDMETHOD. - - - METHOD get_wb_object_operator. - - DATA: - ls_object_type TYPE wbobjtype, - lx_error TYPE REF TO cx_root. - - IF mi_wb_object_operator IS BOUND. - ri_wb_object_operator = mi_wb_object_operator. - ENDIF. - - ls_object_type-objtype_tr = 'BDEF'. - ls_object_type-subtype_wb = 'BDO'. - - TRY. - CALL METHOD ('CL_WB_OBJECT_OPERATOR')=>('CREATE_INSTANCE') - EXPORTING - object_type = ls_object_type - object_key = mv_behaviour_definition_key - RECEIVING - result = mi_wb_object_operator. - - CATCH cx_root INTO lx_error. - zcx_abapgit_exception=>raise( - iv_text = lx_error->get_text( ) - ix_previous = lx_error ). - ENDTRY. - - ri_wb_object_operator = mi_wb_object_operator. - - ENDMETHOD. - - - METHOD get_object_data. - - DATA: - lo_object_data TYPE REF TO object, - lr_metadata TYPE REF TO data, - lr_data TYPE REF TO data. - - FIELD-SYMBOLS: - TYPE any, - TYPE any, - TYPE any, - TYPE any. - - CREATE DATA lr_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA=>TY_OBJECT_DATA'). - ASSIGN lr_data->* TO . - ASSERT sy-subrc = 0. - - ASSIGN COMPONENT 'METADATA' OF STRUCTURE TO . - ASSERT sy-subrc = 0. - - CREATE DATA lr_metadata TYPE ('IF_ADT_TOOLS_CORE_SOURCE_TYPES=>TY_ABAP_SOURCE_MAIN_OBJECT'). - ASSIGN lr_metadata->* TO . - ASSERT sy-subrc = 0. - - io_xml->read( - EXPORTING - iv_name = 'BDEF' - CHANGING - cg_data = ). - - = . - - ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . - ASSERT sy-subrc = 0. - - = mo_files->read_string( 'asbdef' ). - - CREATE OBJECT ro_object_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). - - ro_object_data->set_data( p_data = ). - - ENDMETHOD. - - - METHOD merge_object_data. - - DATA: - lo_object_data TYPE REF TO object, - lo_object_data_old TYPE REF TO if_wb_object_data_model, - lr_new TYPE REF TO data, - lr_old TYPE REF TO data, - lo_wb_object_operator TYPE REF TO object, - ls_old TYPE cl_blue_source_object_data=>ty_object_data. - - FIELD-SYMBOLS: - TYPE any, - TYPE any, - TYPE any, - TYPE any. - - CREATE OBJECT lo_object_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). - lo_object_data = io_object_data. - - CREATE DATA lr_new TYPE ('CL_BLUE_SOURCE_OBJECT_DATA=>TY_OBJECT_DATA'). - ASSIGN lr_new->* TO . - ASSERT sy-subrc = 0. - - CREATE DATA lr_old TYPE ('CL_BLUE_SOURCE_OBJECT_DATA=>TY_OBJECT_DATA'). - ASSIGN lr_old->* TO . - ASSERT sy-subrc = 0. - - CALL METHOD lo_object_data->('IF_WB_OBJECT_DATA_MODEL~GET_DATA') - EXPORTING - p_metadata_only = abap_false - p_data_selection = 'AL' - IMPORTING - p_data = . - - lo_wb_object_operator = get_wb_object_operator( ). - - CALL METHOD lo_wb_object_operator->('IF_WB_OBJECT_OPERATOR~READ') - EXPORTING - data_selection = 'AL' " if_wb_object_data_selection_co=>c_all_data - IMPORTING - eo_object_data = lo_object_data_old. - - CALL METHOD lo_object_data_old->('GET_DATA') - EXPORTING - p_metadata_only = abap_false - p_data_selection = 'AL' " if_wb_object_data_selection_co=>c_all_data - IMPORTING - p_data = . - - ASSIGN COMPONENT 'METADATA-DESCRIPTION' OF STRUCTURE TO . - ASSIGN COMPONENT 'METADATA-DESCRIPTION' OF STRUCTURE TO . - = . - - ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . - ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . - = . - - CREATE OBJECT ro_object_data_merged TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). - - CALL METHOD ro_object_data_merged->('SET_DATA') - EXPORTING - p_data = . - ENDMETHOD. ENDCLASS. diff --git a/src/ui/zcl_abapgit_gui_page_stage.clas.abap b/src/ui/zcl_abapgit_gui_page_stage.clas.abap index b197104a7..96ac13bac 100644 --- a/src/ui/zcl_abapgit_gui_page_stage.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_stage.clas.abap @@ -264,9 +264,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION. METHOD find_transports. - FIELD-SYMBOLS: LIKE LINE OF it_files-local. - FIELD-SYMBOLS: LIKE LINE OF it_files-remote. - TRY. find_transports_local( diff --git a/src/ui/zcl_abapgit_html_form_utils.clas.testclasses.abap b/src/ui/zcl_abapgit_html_form_utils.clas.testclasses.abap index 719fad737..252459a05 100644 --- a/src/ui/zcl_abapgit_html_form_utils.clas.testclasses.abap +++ b/src/ui/zcl_abapgit_html_form_utils.clas.testclasses.abap @@ -29,8 +29,7 @@ CLASS ltcl_popups_mock DEFINITION FINAL FOR TESTING BEGIN OF ms_called, popup_to_confirm TYPE abap_bool, END OF ms_called, - mv_user_decision TYPE ty_user_decision, - mv_package TYPE devclass. + mv_user_decision TYPE ty_user_decision. ENDCLASS. diff --git a/src/utils/zcl_abapgit_convert.clas.testclasses.abap b/src/utils/zcl_abapgit_convert.clas.testclasses.abap index 0b61b748c..3203b440a 100644 --- a/src/utils/zcl_abapgit_convert.clas.testclasses.abap +++ b/src/utils/zcl_abapgit_convert.clas.testclasses.abap @@ -31,7 +31,6 @@ CLASS ltcl_convert IMPLEMENTATION. TYPES ty_hex TYPE x LENGTH 2. DATA lt_bintab TYPE STANDARD TABLE OF ty_hex WITH DEFAULT KEY. DATA lv_size TYPE i. - DATA lv_xstr TYPE xstring. zcl_abapgit_convert=>xstring_to_bintab( EXPORTING