From b9a8de1ad2b22a556b7257176dc0409715d80a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20M=C3=BCller?= <101019006+fmabap@users.noreply.github.com> Date: Fri, 1 Sep 2023 06:47:37 +0200 Subject: [PATCH] Replace `zcl_abapgit_objects=>ty_serialization` with same type in interface (#6451) Co-authored-by: Lars Hvam Co-authored-by: Marc Bernard <59966492+mbtools@users.noreply.github.com> --- ...abapgit_parallel.fugr.z_abapgit_serialize_parallel.abap | 2 +- src/objects/zcl_abapgit_objects.clas.abap | 7 +------ src/objects/zcl_abapgit_objects.clas.testclasses.abap | 2 +- src/utils/zcl_abapgit_zip.clas.abap | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/objects/core/zabapgit_parallel.fugr.z_abapgit_serialize_parallel.abap b/src/objects/core/zabapgit_parallel.fugr.z_abapgit_serialize_parallel.abap index 5e8cc1477..be76e3b04 100644 --- a/src/objects/core/zabapgit_parallel.fugr.z_abapgit_serialize_parallel.abap +++ b/src/objects/core/zabapgit_parallel.fugr.z_abapgit_serialize_parallel.abap @@ -21,7 +21,7 @@ FUNCTION z_abapgit_serialize_parallel. DATA: ls_item TYPE zif_abapgit_definitions=>ty_item, lx_error TYPE REF TO zcx_abapgit_exception, lv_text TYPE c LENGTH 200, - ls_files TYPE zcl_abapgit_objects=>ty_serialization. + ls_files TYPE zif_abapgit_objects=>ty_serialization. TRY. ls_item-obj_type = iv_obj_type. diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 42bc7ce32..5c427c9ea 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -6,18 +6,13 @@ CLASS zcl_abapgit_objects DEFINITION TYPES: ty_types_tt TYPE SORTED TABLE OF tadir-object WITH UNIQUE KEY table_line . - TYPES: - BEGIN OF ty_serialization, - files TYPE zif_abapgit_git_definitions=>ty_files_tt, - item TYPE zif_abapgit_definitions=>ty_item, - END OF ty_serialization . CLASS-METHODS serialize IMPORTING !is_item TYPE zif_abapgit_definitions=>ty_item !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params RETURNING - VALUE(rs_files_and_item) TYPE ty_serialization + VALUE(rs_files_and_item) TYPE zif_abapgit_objects=>ty_serialization RAISING zcx_abapgit_exception . CLASS-METHODS deserialize diff --git a/src/objects/zcl_abapgit_objects.clas.testclasses.abap b/src/objects/zcl_abapgit_objects.clas.testclasses.abap index 1b9919849..5db3b6f5b 100644 --- a/src/objects/zcl_abapgit_objects.clas.testclasses.abap +++ b/src/objects/zcl_abapgit_objects.clas.testclasses.abap @@ -248,7 +248,7 @@ CLASS ltcl_serialize IMPLEMENTATION. METHOD check. - DATA: ls_files_item TYPE zcl_abapgit_objects=>ty_serialization. + DATA: ls_files_item TYPE zif_abapgit_objects=>ty_serialization. ls_files_item = zcl_abapgit_objects=>serialize( is_item = is_item diff --git a/src/utils/zcl_abapgit_zip.clas.abap b/src/utils/zcl_abapgit_zip.clas.abap index be6ab45d8..d0a22cfb9 100644 --- a/src/utils/zcl_abapgit_zip.clas.abap +++ b/src/utils/zcl_abapgit_zip.clas.abap @@ -142,7 +142,7 @@ CLASS ZCL_ABAPGIT_ZIP IMPLEMENTATION. lv_folder TYPE string, lv_fullpath TYPE string, lv_sep TYPE c LENGTH 1, - ls_files_item TYPE zcl_abapgit_objects=>ty_serialization, + ls_files_item TYPE zif_abapgit_objects=>ty_serialization, lo_frontend_serv TYPE REF TO zif_abapgit_frontend_services. FIELD-SYMBOLS: LIKE LINE OF ls_files_item-files.