SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 20:32:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

XML Refactoring: Comparator/OO_Object_FNC (#3888)

Browse Source 
* change xml references to interfaces


changed reference in interfaces:
- zif_abapgit_comparator
- zif_abapgit_oo_object_fnc

* change reference of xml in dependent objects

Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
g-back 2020-09-16 12:43:40 +02:00 committed by GitHub
parent 9f396366cd
commit 4dde63360e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/objects/zcl_abapgit_object_clas.clas.abap
View File

@ -201,7 +201,7 @@ CLASS ZCL_ABAPGIT_OBJECT_CLAS IMPLEMENTATION.
mi_object_oriented_object_fct->create_sotr( mi_object_oriented_object_fct->create_sotr(
iv_object_name = ms_item-obj_name iv_object_name = ms_item-obj_name
iv_package = iv_package iv_package = iv_package
io_xml = io_xml ). ii_xml = io_xml ).
ENDMETHOD. ENDMETHOD.
@ -365,7 +365,7 @@ CLASS ZCL_ABAPGIT_OBJECT_CLAS IMPLEMENTATION.
METHOD serialize_sotr. METHOD serialize_sotr.
mi_object_oriented_object_fct->read_sotr( mi_object_oriented_object_fct->read_sotr(
iv_object_name = ms_item-obj_name iv_object_name = ms_item-obj_name
io_xml = io_xml ). ii_xml = io_xml ).
ENDMETHOD. ENDMETHOD.

19
src/objects/zcl_abapgit_object_tabl.clas.abap
View File

@ -98,7 +98,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_OBJECT_TABL IMPLEMENTATION. CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
METHOD clear_dd03p_fields. METHOD clear_dd03p_fields.
@ -783,20 +783,25 @@ CLASS ZCL_ABAPGIT_OBJECT_TABL IMPLEMENTATION.
METHOD zif_abapgit_object~get_comparator. METHOD zif_abapgit_object~get_comparator.
DATA: lo_local_version_output TYPE REF TO zcl_abapgit_xml_output, DATA: li_local_version_output TYPE REF TO zif_abapgit_xml_output,
lo_local_version_input TYPE REF TO zcl_abapgit_xml_input. lo_local_version_output TYPE REF TO zcl_abapgit_xml_output,
li_local_version_input TYPE REF TO zif_abapgit_xml_input.
CREATE OBJECT lo_local_version_output. CREATE OBJECT li_local_version_output TYPE zcl_abapgit_xml_output.
" TODO: remove cast after zif_abapgit_object uses interface instead of class
lo_local_version_output ?= li_local_version_output.
me->zif_abapgit_object~serialize( lo_local_version_output ). me->zif_abapgit_object~serialize( lo_local_version_output ).
CREATE OBJECT lo_local_version_input CREATE OBJECT li_local_version_input
TYPE zcl_abapgit_xml_input
EXPORTING EXPORTING
iv_xml = lo_local_version_output->render( ). iv_xml = li_local_version_output->render( ).
CREATE OBJECT ri_comparator TYPE zcl_abapgit_object_tabl_compar CREATE OBJECT ri_comparator TYPE zcl_abapgit_object_tabl_compar
EXPORTING EXPORTING
io_local = lo_local_version_input. ii_local = li_local_version_input.
ENDMETHOD. ENDMETHOD.

22
src/objects/zcl_abapgit_object_tabl_compar.clas.abap
View File

@ -8,7 +8,7 @@ CLASS zcl_abapgit_object_tabl_compar DEFINITION
METHODS constructor METHODS constructor
IMPORTING IMPORTING
!io_local TYPE REF TO zcl_abapgit_xml_input . !ii_local TYPE REF TO zif_abapgit_xml_input.
PROTECTED SECTION. PROTECTED SECTION.
TYPES: TYPES:
@ -18,7 +18,7 @@ CLASS zcl_abapgit_object_tabl_compar DEFINITION
tty_seu_obj TYPE STANDARD TABLE OF seu_obj tty_seu_obj TYPE STANDARD TABLE OF seu_obj
WITH NON-UNIQUE DEFAULT KEY . WITH NON-UNIQUE DEFAULT KEY .
DATA mo_local TYPE REF TO zcl_abapgit_xml_input . DATA mi_local TYPE REF TO zif_abapgit_xml_input.
METHODS get_where_used_recursive METHODS get_where_used_recursive
IMPORTING IMPORTING
@ -39,8 +39,8 @@ CLASS zcl_abapgit_object_tabl_compar DEFINITION
zcx_abapgit_exception . zcx_abapgit_exception .
METHODS validate METHODS validate
IMPORTING IMPORTING
!io_remote_version TYPE REF TO zcl_abapgit_xml_input !ii_remote_version TYPE REF TO zif_abapgit_xml_input
!io_local_version TYPE REF TO zcl_abapgit_xml_input !ii_local_version TYPE REF TO zif_abapgit_xml_input
!ii_log TYPE REF TO zif_abapgit_log !ii_log TYPE REF TO zif_abapgit_log
RETURNING RETURNING
VALUE(rv_message) TYPE string VALUE(rv_message) TYPE string
@ -52,12 +52,12 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_OBJECT_TABL_COMPAR IMPLEMENTATION. CLASS zcl_abapgit_object_tabl_compar IMPLEMENTATION.
METHOD constructor. METHOD constructor.
mo_local = io_local. mi_local = ii_local.
ENDMETHOD. ENDMETHOD.
@ -151,7 +151,7 @@ CLASS ZCL_ABAPGIT_OBJECT_TABL_COMPAR IMPLEMENTATION.
ls_item TYPE zif_abapgit_definitions=>ty_item, ls_item TYPE zif_abapgit_definitions=>ty_item,
lv_inconsistent TYPE abap_bool. lv_inconsistent TYPE abap_bool.
io_remote_version->read( ii_remote_version->read(
EXPORTING EXPORTING
iv_name = 'DD02V' iv_name = 'DD02V'
CHANGING CHANGING
@ -162,13 +162,13 @@ CLASS ZCL_ABAPGIT_OBJECT_TABL_COMPAR IMPLEMENTATION.
RETURN. RETURN.
ENDIF. ENDIF.
io_remote_version->read( ii_remote_version->read(
EXPORTING EXPORTING
iv_name = 'DD03P_TABLE' iv_name = 'DD03P_TABLE'
CHANGING CHANGING
cg_data = lt_previous_table_fields ). cg_data = lt_previous_table_fields ).
io_local_version->read( ii_local_version->read(
EXPORTING EXPORTING
iv_name = 'DD03P_TABLE' iv_name = 'DD03P_TABLE'
CHANGING CHANGING
@ -226,8 +226,8 @@ CLASS ZCL_ABAPGIT_OBJECT_TABL_COMPAR IMPLEMENTATION.
METHOD zif_abapgit_comparator~compare. METHOD zif_abapgit_comparator~compare.
rs_result-text = validate( rs_result-text = validate(
io_remote_version = io_remote ii_remote_version = ii_remote
io_local_version = mo_local ii_local_version = mi_local
ii_log = ii_log ). ii_log = ii_log ).
ENDMETHOD. ENDMETHOD.

9
src/objects/zcl_abapgit_objects.clas.abap
View File

@ -231,7 +231,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. CLASS zcl_abapgit_objects IMPLEMENTATION.
METHOD adjust_namespaces. METHOD adjust_namespaces.
@ -354,7 +354,7 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
* only the main XML file is used for comparison * only the main XML file is used for comparison
DATA: ls_remote_file TYPE zif_abapgit_definitions=>ty_file, DATA: ls_remote_file TYPE zif_abapgit_definitions=>ty_file,
lo_remote_version TYPE REF TO zcl_abapgit_xml_input, li_remote_version TYPE REF TO zif_abapgit_xml_input,
lv_count TYPE i, lv_count TYPE i,
ls_result TYPE zif_abapgit_comparator=>ty_result, ls_result TYPE zif_abapgit_comparator=>ty_result,
lv_answer TYPE string, lv_answer TYPE string,
@ -379,12 +379,13 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
RETURN. RETURN.
ENDIF. ENDIF.
CREATE OBJECT lo_remote_version CREATE OBJECT li_remote_version
TYPE zcl_abapgit_xml_input
EXPORTING EXPORTING
iv_xml = zcl_abapgit_convert=>xstring_to_string_utf8( ls_remote_file-data ) iv_xml = zcl_abapgit_convert=>xstring_to_string_utf8( ls_remote_file-data )
iv_filename = ls_remote_file-filename. iv_filename = ls_remote_file-filename.
ls_result = li_comparator->compare( io_remote = lo_remote_version ls_result = li_comparator->compare( ii_remote = li_remote_version
ii_log = ii_log ). ii_log = ii_log ).
IF ls_result-text IS INITIAL. IF ls_result-text IS INITIAL.
RETURN. RETURN.

4
src/objects/zcl_abapgit_oo_class.clas.abap
View File

@ -442,7 +442,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION.
METHOD zif_abapgit_oo_object_fnc~create_sotr. METHOD zif_abapgit_oo_object_fnc~create_sotr.
zcl_abapgit_sotr_handler=>create_sotr( zcl_abapgit_sotr_handler=>create_sotr(
iv_package = iv_package iv_package = iv_package
io_xml = io_xml ). io_xml = ii_xml ).
ENDMETHOD. ENDMETHOD.
@ -682,7 +682,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION.
iv_pgmid = 'LIMU' iv_pgmid = 'LIMU'
iv_object = 'CPUB' iv_object = 'CPUB'
iv_obj_name = iv_object_name iv_obj_name = iv_object_name
io_xml = io_xml ). io_xml = ii_xml ).
ENDMETHOD. ENDMETHOD.

2
src/objects/zif_abapgit_comparator.intf.abap
View File

@ -9,7 +9,7 @@ INTERFACE zif_abapgit_comparator
METHODS compare METHODS compare
IMPORTING IMPORTING
!io_remote TYPE REF TO zcl_abapgit_xml_input !ii_remote TYPE REF TO zif_abapgit_xml_input
!ii_log TYPE REF TO zif_abapgit_log !ii_log TYPE REF TO zif_abapgit_log
RETURNING RETURNING
VALUE(rs_result) TYPE ty_result VALUE(rs_result) TYPE ty_result

4
src/objects/zif_abapgit_oo_object_fnc.intf.abap
View File

@ -53,7 +53,7 @@ INTERFACE zif_abapgit_oo_object_fnc PUBLIC.
IMPORTING IMPORTING
iv_object_name TYPE sobj_name iv_object_name TYPE sobj_name
iv_package TYPE devclass iv_package TYPE devclass
io_xml TYPE REF TO zcl_abapgit_xml_input ii_xml TYPE REF TO zif_abapgit_xml_input
RAISING RAISING
zcx_abapgit_exception, zcx_abapgit_exception,
create_documentation create_documentation
@ -117,7 +117,7 @@ INTERFACE zif_abapgit_oo_object_fnc PUBLIC.
read_sotr read_sotr
IMPORTING IMPORTING
iv_object_name TYPE sobj_name iv_object_name TYPE sobj_name
io_xml TYPE REF TO zcl_abapgit_xml_output ii_xml TYPE REF TO zif_abapgit_xml_output
RAISING RAISING
zcx_abapgit_exception, zcx_abapgit_exception,
read_descriptions read_descriptions

6
src/zcl_abapgit_settings.clas.abap
View File

@ -177,7 +177,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_SETTINGS IMPLEMENTATION. CLASS zcl_abapgit_settings IMPLEMENTATION.
METHOD get_activate_wo_popup. METHOD get_activate_wo_popup.
@ -433,10 +433,10 @@ CLASS ZCL_ABAPGIT_SETTINGS IMPLEMENTATION.
METHOD set_xml_settings. METHOD set_xml_settings.
DATA: lo_input TYPE REF TO zcl_abapgit_xml_input. DATA: lo_input TYPE REF TO zif_abapgit_xml_input.
CREATE OBJECT lo_input EXPORTING iv_xml = iv_settings_xml. CREATE OBJECT lo_input TYPE zcl_abapgit_xml_input EXPORTING iv_xml = iv_settings_xml.
CLEAR ms_settings. CLEAR ms_settings.