From cb58678c799752bd01944194e490ea13b4a0ede9 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:01:09 -0500 Subject: [PATCH] Refactor: Types related to object interface (#7096) Co-authored-by: Lars Hvam --- src/objects/core/zcl_abapgit_serialize.clas.abap | 2 +- src/objects/zcl_abapgit_object_doma.clas.abap | 2 +- src/objects/zcl_abapgit_object_shlp.clas.abap | 2 +- src/objects/zcl_abapgit_objects.clas.abap | 9 +++------ .../zcl_abapgit_objects.clas.testclasses.abap | 2 +- src/objects/zif_abapgit_object.intf.abap | 15 +++++++-------- src/objects/zif_abapgit_objects.intf.abap | 11 ++++++++--- src/repo/zcl_abapgit_repo.clas.abap | 4 ++-- .../sett/zcl_abapgit_gui_page_sett_info.clas.abap | 2 +- .../zcl_abapgit_gui_page_debuginfo.clas.abap | 6 +++--- src/zif_abapgit_definitions.intf.abap | 5 ----- 11 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/objects/core/zcl_abapgit_serialize.clas.abap b/src/objects/core/zcl_abapgit_serialize.clas.abap index 21dae0a50..fc4ad0c95 100644 --- a/src/objects/core/zcl_abapgit_serialize.clas.abap +++ b/src/objects/core/zcl_abapgit_serialize.clas.abap @@ -432,7 +432,7 @@ CLASS zcl_abapgit_serialize IMPLEMENTATION. METHOD filter_unsupported_objects. DATA: ls_unsupported_count TYPE ty_unsupported_count, - lt_supported_types TYPE zcl_abapgit_objects=>ty_types_tt, + lt_supported_types TYPE zif_abapgit_objects=>ty_types_tt, lt_unsupported_count TYPE ty_unsupported_count_tt. FIELD-SYMBOLS: LIKE LINE OF ct_tadir, diff --git a/src/objects/zcl_abapgit_object_doma.clas.abap b/src/objects/zcl_abapgit_object_doma.clas.abap index 8bc1f7280..79e6860a2 100644 --- a/src/objects/zcl_abapgit_object_doma.clas.abap +++ b/src/objects/zcl_abapgit_object_doma.clas.abap @@ -43,7 +43,7 @@ CLASS zcl_abapgit_object_doma DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS handle_dependencies IMPORTING - !iv_step TYPE zif_abapgit_definitions=>ty_deserialization_step + !iv_step TYPE zif_abapgit_objects=>ty_deserialization_step CHANGING !cv_exit TYPE dd01v-convexit !cv_done TYPE abap_bool. diff --git a/src/objects/zcl_abapgit_object_shlp.clas.abap b/src/objects/zcl_abapgit_object_shlp.clas.abap index 02dd0c9b6..c4b800b8b 100644 --- a/src/objects/zcl_abapgit_object_shlp.clas.abap +++ b/src/objects/zcl_abapgit_object_shlp.clas.abap @@ -7,7 +7,7 @@ CLASS zcl_abapgit_object_shlp DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS handle_dependencies IMPORTING - !iv_step TYPE zif_abapgit_definitions=>ty_deserialization_step + !iv_step TYPE zif_abapgit_objects=>ty_deserialization_step CHANGING !cv_exit TYPE dd30v-selmexit !cv_done TYPE abap_bool. diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 218529719..3c82e136e 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -4,9 +4,6 @@ CLASS zcl_abapgit_objects DEFINITION PUBLIC SECTION. - TYPES: - ty_types_tt TYPE SORTED TABLE OF tadir-object WITH UNIQUE KEY table_line . - CLASS-METHODS serialize IMPORTING !is_item TYPE zif_abapgit_definitions=>ty_item @@ -71,7 +68,7 @@ CLASS zcl_abapgit_objects DEFINITION VALUE(rv_bool) TYPE abap_bool . CLASS-METHODS supported_list RETURNING - VALUE(rt_types) TYPE ty_types_tt . + VALUE(rt_types) TYPE zif_abapgit_objects=>ty_types_tt. CLASS-METHODS is_active IMPORTING !is_item TYPE zif_abapgit_definitions=>ty_item @@ -663,7 +660,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. li_progress TYPE REF TO zif_abapgit_progress, lv_path TYPE string, lt_items TYPE zif_abapgit_definitions=>ty_items_tt, - lt_steps_id TYPE zif_abapgit_definitions=>ty_deserialization_step_tt, + lt_steps_id TYPE zif_abapgit_objects=>ty_deserialization_step_tt, lt_steps TYPE zif_abapgit_objects=>ty_step_data_tt, lx_exc TYPE REF TO zcx_abapgit_exception. DATA lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic. @@ -672,7 +669,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. DATA lo_abap_language_vers TYPE REF TO zcl_abapgit_abap_language_vers. FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_result, - TYPE LINE OF zif_abapgit_definitions=>ty_deserialization_step_tt, + TYPE LINE OF zif_abapgit_objects=>ty_deserialization_step_tt, TYPE LINE OF zif_abapgit_objects=>ty_step_data_tt, TYPE LINE OF zif_abapgit_objects=>ty_deserialization_tt. diff --git a/src/objects/zcl_abapgit_objects.clas.testclasses.abap b/src/objects/zcl_abapgit_objects.clas.testclasses.abap index ae2704279..5d29ba4e6 100644 --- a/src/objects/zcl_abapgit_objects.clas.testclasses.abap +++ b/src/objects/zcl_abapgit_objects.clas.testclasses.abap @@ -29,7 +29,7 @@ CLASS ltcl_object_types IMPLEMENTATION. DATA: ls_item TYPE zif_abapgit_definitions=>ty_item, lv_exists TYPE abap_bool, - lt_types TYPE zcl_abapgit_objects=>ty_types_tt. + lt_types TYPE zif_abapgit_objects=>ty_types_tt. FIELD-SYMBOLS: LIKE LINE OF lt_types. diff --git a/src/objects/zif_abapgit_object.intf.abap b/src/objects/zif_abapgit_object.intf.abap index b2a4b7121..24d938fbb 100644 --- a/src/objects/zif_abapgit_object.intf.abap +++ b/src/objects/zif_abapgit_object.intf.abap @@ -1,12 +1,11 @@ -INTERFACE zif_abapgit_object - PUBLIC . +INTERFACE zif_abapgit_object PUBLIC. CONSTANTS: BEGIN OF gc_step_id, - early TYPE zif_abapgit_definitions=>ty_deserialization_step VALUE `EARLY`, - abap TYPE zif_abapgit_definitions=>ty_deserialization_step VALUE `ABAP`, - ddic TYPE zif_abapgit_definitions=>ty_deserialization_step VALUE `DDIC`, - late TYPE zif_abapgit_definitions=>ty_deserialization_step VALUE `LATE`, + early TYPE zif_abapgit_objects=>ty_deserialization_step VALUE 'EARLY', + abap TYPE zif_abapgit_objects=>ty_deserialization_step VALUE 'ABAP', + ddic TYPE zif_abapgit_objects=>ty_deserialization_step VALUE 'DDIC', + late TYPE zif_abapgit_objects=>ty_deserialization_step VALUE 'LATE', END OF gc_step_id. METHODS serialize @@ -19,7 +18,7 @@ INTERFACE zif_abapgit_object IMPORTING !iv_package TYPE devclass !io_xml TYPE REF TO zif_abapgit_xml_input - !iv_step TYPE zif_abapgit_definitions=>ty_deserialization_step + !iv_step TYPE zif_abapgit_objects=>ty_deserialization_step !ii_log TYPE REF TO zif_abapgit_log !iv_transport TYPE trkorr RAISING @@ -78,7 +77,7 @@ INTERFACE zif_abapgit_object METHODS get_deserialize_steps RETURNING - VALUE(rt_steps) TYPE zif_abapgit_definitions=>ty_deserialization_step_tt . + VALUE(rt_steps) TYPE zif_abapgit_objects=>ty_deserialization_step_tt. METHODS get_deserialize_order IMPORTING diff --git a/src/objects/zif_abapgit_objects.intf.abap b/src/objects/zif_abapgit_objects.intf.abap index 8709cb6dd..e20f4bd19 100644 --- a/src/objects/zif_abapgit_objects.intf.abap +++ b/src/objects/zif_abapgit_objects.intf.abap @@ -1,5 +1,4 @@ -INTERFACE zif_abapgit_objects - PUBLIC. +INTERFACE zif_abapgit_objects PUBLIC. TYPES: BEGIN OF ty_serialization, @@ -15,9 +14,15 @@ INTERFACE zif_abapgit_objects END OF ty_deserialization . TYPES: ty_deserialization_tt TYPE STANDARD TABLE OF ty_deserialization WITH DEFAULT KEY . + TYPES: + ty_types_tt TYPE SORTED TABLE OF tadir-object WITH UNIQUE KEY table_line. + TYPES: + ty_deserialization_step TYPE string. + TYPES: + ty_deserialization_step_tt TYPE STANDARD TABLE OF ty_deserialization_step WITH DEFAULT KEY. TYPES: BEGIN OF ty_step_data, - step_id TYPE zif_abapgit_definitions=>ty_deserialization_step, + step_id TYPE ty_deserialization_step, order TYPE i, descr TYPE string, syntax_check TYPE abap_bool, diff --git a/src/repo/zcl_abapgit_repo.clas.abap b/src/repo/zcl_abapgit_repo.clas.abap index b24ecf3d4..b74622984 100644 --- a/src/repo/zcl_abapgit_repo.clas.abap +++ b/src/repo/zcl_abapgit_repo.clas.abap @@ -192,7 +192,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. +CLASS zcl_abapgit_repo IMPLEMENTATION. METHOD bind_listener. @@ -402,7 +402,7 @@ CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. METHOD get_unsupported_objects_local. DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, - lt_supported_types TYPE zcl_abapgit_objects=>ty_types_tt. + lt_supported_types TYPE zif_abapgit_objects=>ty_types_tt. FIELD-SYMBOLS: LIKE LINE OF lt_tadir, LIKE LINE OF rt_objects. diff --git a/src/ui/pages/sett/zcl_abapgit_gui_page_sett_info.clas.abap b/src/ui/pages/sett/zcl_abapgit_gui_page_sett_info.clas.abap index 3125d605c..690b144cc 100644 --- a/src/ui/pages/sett/zcl_abapgit_gui_page_sett_info.clas.abap +++ b/src/ui/pages/sett/zcl_abapgit_gui_page_sett_info.clas.abap @@ -422,7 +422,7 @@ CLASS zcl_abapgit_gui_page_sett_info IMPLEMENTATION. DATA: ls_stats TYPE ty_stats, ls_item TYPE zif_abapgit_definitions=>ty_item, - lt_supported_types TYPE zcl_abapgit_objects=>ty_types_tt. + lt_supported_types TYPE zif_abapgit_objects=>ty_types_tt. ls_stats-measure = 'Number of Objects'. diff --git a/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap index 9fc930243..c2b561118 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap @@ -298,15 +298,15 @@ CLASS zcl_abapgit_gui_page_debuginfo IMPLEMENTATION. DATA: lv_list TYPE string, li_html TYPE REF TO zif_abapgit_html, - lt_types TYPE zcl_abapgit_objects=>ty_types_tt, + lt_types TYPE zif_abapgit_objects=>ty_types_tt, lv_type LIKE LINE OF lt_types, lt_obj TYPE STANDARD TABLE OF ko100 WITH DEFAULT KEY, lv_class TYPE seoclsname, li_object TYPE REF TO zif_abapgit_object, ls_item TYPE zif_abapgit_definitions=>ty_item, ls_metadata TYPE zif_abapgit_definitions=>ty_metadata, - lv_step TYPE zif_abapgit_definitions=>ty_deserialization_step, - lt_steps TYPE zif_abapgit_definitions=>ty_deserialization_step_tt. + lv_step TYPE zif_abapgit_objects=>ty_deserialization_step, + lt_steps TYPE zif_abapgit_objects=>ty_deserialization_step_tt. FIELD-SYMBOLS: TYPE ko100. diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index c205a0200..db0ca4e89 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -268,11 +268,6 @@ INTERFACE zif_abapgit_definitions prerelase TYPE string, prerelase_patch TYPE i, END OF ty_version. - TYPES: - ty_deserialization_step TYPE string. - TYPES: - ty_deserialization_step_tt TYPE STANDARD TABLE OF ty_deserialization_step - WITH DEFAULT KEY . TYPES ty_sci_result TYPE c LENGTH 1. CONSTANTS: BEGIN OF c_sci_result,