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

Refactor: MESSAGE ... INTO (#6008)

Browse Source
This commit is contained in:
Marc Bernard 2023-01-25 09:55:41 +01:00 committed by GitHub
parent 95f7844065
commit 6485ec50c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cts/zcl_abapgit_transport.clas.abap
View File

@ -81,7 +81,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION.
CLASS zcl_abapgit_transport IMPLEMENTATION.
METHOD add_all_objects_to_trans_req.
@ -387,8 +387,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION.
DATA:
ls_trkorr TYPE trwbo_request_header,
ls_request TYPE trwbo_request,
lv_text TYPE string.
ls_request TYPE trwbo_request.
ls_trkorr-trkorr = iv_transport_request.
@ -397,7 +396,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT IMPLEMENTATION.
IF ls_request-h-trstatus <> c_tr_status-modifiable
AND ls_request-h-trstatus <> c_tr_status-modifiable_protected.
" Task/request &1 has already been released
MESSAGE e064(tk) WITH iv_transport_request INTO lv_text.
MESSAGE e064(tk) WITH iv_transport_request INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

31
src/objects/aff/zcl_abapgit_object_common_aff.clas.abap
View File

@ -32,6 +32,20 @@ ENDCLASS.
CLASS zcl_abapgit_object_common_aff IMPLEMENTATION.
METHOD get_additional_extensions.
RETURN.
ENDMETHOD.
METHOD is_file_empty.
CALL METHOD io_object_json_file->('IF_AFF_FILE~IS_DELETION')
RECEIVING
result = rv_is_empty.
ENDMETHOD.
METHOD zif_abapgit_object~delete.
DATA: lr_intf_aff_obj TYPE REF TO data,
@ -411,7 +425,6 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION.
lv_name TYPE c LENGTH 120,
lv_file_name TYPE string,
lo_file_name_mapper TYPE REF TO object,
lv_dummy TYPE string,
ls_additional_extensions TYPE ty_extension_mapper_pairs,
lv_file_as_xstring TYPE xstring.
@ -508,7 +521,7 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION.
" avoid to serialize empty content (object was never activated, exists inactive only).
IF is_file_empty( lo_object_json_file ) = abap_true.
MESSAGE s821(eu) WITH lv_name INTO lv_dummy.
MESSAGE s821(eu) WITH lv_name INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.
@ -551,18 +564,4 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION.
ENDTRY.
ENDMETHOD.
METHOD is_file_empty.
CALL METHOD io_object_json_file->('IF_AFF_FILE~IS_DELETION')
RECEIVING
result = rv_is_empty.
ENDMETHOD.
METHOD get_additional_extensions.
RETURN.
ENDMETHOD.
ENDCLASS.

11
src/objects/zcl_abapgit_object_auth.clas.abap
View File

@ -43,34 +43,33 @@ CLASS zcl_abapgit_object_auth IMPLEMENTATION.
DATA:
lt_objlst TYPE susr_t_xuobject,
lo_auth TYPE REF TO cl_auth_tools,
lv_dummy TYPE string.
lo_auth TYPE REF TO cl_auth_tools.
" authority check
CREATE OBJECT lo_auth.
IF lo_auth->authority_check_suso( actvt = '06'
fieldname = mv_fieldname ) <> 0.
MESSAGE e463(01) WITH mv_fieldname INTO lv_dummy.
MESSAGE e463(01) WITH mv_fieldname INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.
" if field is used check
lt_objlst = lo_auth->suso_where_used_afield( mv_fieldname ).
IF lt_objlst IS NOT INITIAL.
MESSAGE i453(01) WITH mv_fieldname INTO lv_dummy.
MESSAGE i453(01) WITH mv_fieldname INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.
" collect fieldname into a transport task
IF lo_auth->add_afield_to_trkorr( mv_fieldname ) <> 0.
"no transport -> no deletion
MESSAGE e507(0m) INTO lv_dummy.
MESSAGE e507(0m) INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.
DELETE FROM authx WHERE fieldname = mv_fieldname.
IF sy-subrc <> 0.
MESSAGE e507(0m) INTO lv_dummy.
MESSAGE e507(0m) INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

5
src/objects/zcl_abapgit_object_oa2p.clas.abap
View File

@ -75,11 +75,8 @@ CLASS zcl_abapgit_object_oa2p IMPLEMENTATION.
METHOD zif_abapgit_object~delete.
DATA lv_dummy TYPE string.
CONSTANTS: lc_actvt TYPE c LENGTH 2 VALUE `06`.
DATA: lo_persist TYPE REF TO object,
lv_profile_key TYPE seu_objkey.
@ -87,7 +84,7 @@ CLASS zcl_abapgit_object_oa2p IMPLEMENTATION.
AUTHORITY-CHECK OBJECT 'S_OA2C_ADM'
ID 'ACTVT' FIELD lc_actvt.
IF sy-subrc <> 0.
MESSAGE e463(01) WITH mv_profile INTO lv_dummy.
MESSAGE e463(01) WITH mv_profile INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

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

@ -68,8 +68,6 @@ CLASS zcl_abapgit_object_scvi IMPLEMENTATION.
DATA: ls_screen_variant TYPE ty_screen_variant.
DATA: lv_text TYPE natxt.
io_xml->read(
EXPORTING
iv_name = 'SCVI'
@ -82,7 +80,7 @@ CLASS zcl_abapgit_object_scvi IMPLEMENTATION.
EXCEPTIONS
OTHERS = 01.
IF sy-subrc <> 0.
MESSAGE e413(ms) WITH ls_screen_variant-shdsvci-scvariant INTO lv_text.
MESSAGE e413(ms) WITH ls_screen_variant-shdsvci-scvariant INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

6
src/objects/zcl_abapgit_object_stvi.clas.abap
View File

@ -21,7 +21,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_OBJECT_STVI IMPLEMENTATION.
CLASS zcl_abapgit_object_stvi IMPLEMENTATION.
METHOD zif_abapgit_object~changed_by.
@ -67,8 +67,6 @@ CLASS ZCL_ABAPGIT_OBJECT_STVI IMPLEMENTATION.
DATA: ls_transaction_variant TYPE ty_transaction_variant.
DATA: lv_text TYPE natxt.
io_xml->read(
EXPORTING
iv_name = 'STVI'
@ -81,7 +79,7 @@ CLASS ZCL_ABAPGIT_OBJECT_STVI IMPLEMENTATION.
EXCEPTIONS
OTHERS = 01.
IF sy-subrc <> 0.
MESSAGE e413(ms) WITH ls_transaction_variant-shdtvciu-tcvariant INTO lv_text.
MESSAGE e413(ms) WITH ls_transaction_variant-shdtvciu-tcvariant INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

3
src/objects/zcl_abapgit_object_suso.clas.abap
View File

@ -90,7 +90,6 @@ CLASS zcl_abapgit_object_suso IMPLEMENTATION.
DATA:
lv_act_head TYPE activ_auth,
lv_dummy TYPE string,
lo_suso TYPE REF TO object,
lv_failed TYPE abap_bool,
lv_suso_collect_in_cts TYPE i,
@ -126,7 +125,7 @@ CLASS zcl_abapgit_object_suso IMPLEMENTATION.
IF lv_failed = abap_true.
" Object & does not exist; choose an existing object
MESSAGE s111(01) WITH mv_objectname INTO lv_dummy.
MESSAGE s111(01) WITH mv_objectname INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

7
src/objects/zcl_abapgit_object_xinx.clas.abap
View File

@ -117,8 +117,7 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION.
lv_concname TYPE rsdxx-objname,
ls_transp_key TYPE trkey,
ls_e071 TYPE e071,
lv_clm_corrnum TYPE e070-trkorr,
lv_message TYPE string.
lv_clm_corrnum TYPE e070-trkorr.
CONCATENATE mv_name '-' mv_id INTO lv_concname.
ls_enqueue-objtype = c_objtype_extension_index.
@ -152,7 +151,7 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION.
IF sy-subrc <> 0.
" & was not deleted (correction entry not possible or canceled)
MESSAGE s015(e2) WITH lv_concname INTO lv_message.
MESSAGE s015(e2) WITH lv_concname INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.
@ -196,7 +195,7 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION.
IF sy-subrc <> 0.
" Internal error & in & (contact person in charge)
MESSAGE i008(e2) WITH 'DD_DD_TO_E071' 'RS_DD_INDX_DELETE' INTO lv_message.
MESSAGE i008(e2) WITH 'DD_DD_TO_E071' 'RS_DD_INDX_DELETE' INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
ENDIF.

7
src/zcx_abapgit_exception.clas.abap
View File

@ -22,6 +22,9 @@ CLASS zcx_abapgit_exception DEFINITION
what_to_do TYPE string VALUE `&WHAT_TO_DO&`,
sys_admin TYPE string VALUE `&SYS_ADMIN&`,
END OF c_section_token .
CLASS-DATA null TYPE string.
DATA msgv1 TYPE symsgv READ-ONLY .
DATA msgv2 TYPE symsgv READ-ONLY .
DATA msgv3 TYPE symsgv READ-ONLY .
@ -133,7 +136,7 @@ ENDCLASS.
CLASS ZCX_ABAPGIT_EXCEPTION IMPLEMENTATION.
CLASS zcx_abapgit_exception IMPLEMENTATION.
METHOD constructor ##ADT_SUPPRESS_GENERATION.
@ -488,7 +491,7 @@ CLASS ZCX_ABAPGIT_EXCEPTION IMPLEMENTATION.
ENDDO.
" Set syst using generic error message
MESSAGE e001(00) WITH ls_msg-msgv1 ls_msg-msgv2 ls_msg-msgv3 ls_msg-msgv4 INTO lv_rest.
MESSAGE e001(00) WITH ls_msg-msgv1 ls_msg-msgv2 ls_msg-msgv3 ls_msg-msgv4 INTO null.
rs_msg = ls_msg.

3
src/zcx_abapgit_exception.clas.testclasses.abap
View File

@ -295,11 +295,10 @@ CLASS ltcl_get_t100_longtext IMPLEMENTATION.
METHOD test01.
DATA: lx_err TYPE REF TO zcx_abapgit_exception,
lv_dummy TYPE string,
lv_result TYPE string.
TRY.
MESSAGE e058(00) WITH 'Value_1' 'Value_2' 'Value_3' 'Value_4' INTO lv_dummy.
MESSAGE e058(00) WITH 'Value_1' 'Value_2' 'Value_3' 'Value_4' INTO zcx_abapgit_exception=>null.
zcx_abapgit_exception=>raise_t100( ).
CATCH zcx_abapgit_exception INTO lx_err.
lv_result = lx_err->get_longtext( ).