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

Prefer RETURNING to EXPORTING (#3204)

Browse Source 
* refactor: Prefer RETURNING to EXPORTING

* refactor: Prefer RETURNING to EXPORTING
This commit is contained in:
Mauricio Lauffer 2020-02-11 20:20:45 +11:00 committed by GitHub
parent eb7e819b25
commit a9a505faf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 56 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/objects/zcl_abapgit_object_iatu.clas.abap
View File

@ -16,7 +16,7 @@ CLASS zcl_abapgit_object_iatu DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_load w3_api_load
IMPORTING is_name TYPE iacikeyt IMPORTING is_name TYPE iacikeyt
EXPORTING eo_template TYPE REF TO if_w3_api_template RETURNING VALUE(ro_template) TYPE REF TO if_w3_api_template
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_set_changeable w3_api_set_changeable
IMPORTING iv_changeable TYPE abap_bool IMPORTING iv_changeable TYPE abap_bool
@ -30,15 +30,15 @@ CLASS zcl_abapgit_object_iatu DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_get_attributes w3_api_get_attributes
IMPORTING io_template TYPE REF TO if_w3_api_template IMPORTING io_template TYPE REF TO if_w3_api_template
EXPORTING es_attributes TYPE w3tempattr RETURNING VALUE(rs_attributes) TYPE w3tempattr
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_get_source w3_api_get_source
IMPORTING io_template TYPE REF TO if_w3_api_template IMPORTING io_template TYPE REF TO if_w3_api_template
EXPORTING et_source TYPE w3htmltabtype RETURNING VALUE(rt_source) TYPE w3htmltabtype
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_create_new w3_api_create_new
IMPORTING is_template_data TYPE w3tempattr IMPORTING is_template_data TYPE w3tempattr
EXPORTING eo_template TYPE REF TO if_w3_api_template RETURNING VALUE(ro_template) TYPE REF TO if_w3_api_template
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_set_attributes w3_api_set_attributes
IMPORTING io_template TYPE REF TO if_w3_api_template IMPORTING io_template TYPE REF TO if_w3_api_template
@ -65,19 +65,16 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
ls_name = ms_item-obj_name. ls_name = ms_item-obj_name.
w3_api_load( EXPORTING is_name = ls_name lo_template = w3_api_load( is_name = ls_name ).
IMPORTING eo_template = lo_template ).
w3_api_get_attributes( EXPORTING io_template = lo_template es_attr = w3_api_get_attributes( io_template = lo_template ).
IMPORTING es_attributes = es_attr ).
CLEAR: es_attr-chname, CLEAR: es_attr-chname,
es_attr-tdate, es_attr-tdate,
es_attr-ttime, es_attr-ttime,
es_attr-devclass. es_attr-devclass.
w3_api_get_source( EXPORTING io_template = lo_template lt_source = w3_api_get_source( io_template = lo_template ).
IMPORTING et_source = lt_source ).
CONCATENATE LINES OF lt_source INTO ev_source RESPECTING BLANKS. CONCATENATE LINES OF lt_source INTO ev_source RESPECTING BLANKS.
@ -91,8 +88,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
lo_template TYPE REF TO if_w3_api_template. lo_template TYPE REF TO if_w3_api_template.
w3_api_create_new( EXPORTING is_template_data = is_attr lo_template = w3_api_create_new( is_template_data = is_attr ).
IMPORTING eo_template = lo_template ).
w3_api_set_attributes( io_template = lo_template w3_api_set_attributes( io_template = lo_template
is_attr = is_attr ). is_attr = is_attr ).
@ -127,8 +123,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
ls_name = ms_item-obj_name. ls_name = ms_item-obj_name.
w3_api_load( EXPORTING is_name = ls_name lo_template = w3_api_load( is_name = ls_name ).
IMPORTING eo_template = lo_template ).
w3_api_set_changeable( io_template = lo_template w3_api_set_changeable( io_template = lo_template
iv_changeable = abap_true ). iv_changeable = abap_true ).
@ -235,7 +230,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
EXPORTING EXPORTING
p_template_name = is_name p_template_name = is_name
IMPORTING IMPORTING
p_template = eo_template p_template = ro_template
EXCEPTIONS EXCEPTIONS
object_not_existing = 1 object_not_existing = 1
permission_failure = 2 permission_failure = 2
@ -315,7 +310,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
io_template->get_attributes( io_template->get_attributes(
IMPORTING IMPORTING
p_attributes = es_attributes p_attributes = rs_attributes
EXCEPTIONS EXCEPTIONS
object_invalid = 1 object_invalid = 1
template_deleted = 2 template_deleted = 2
@ -333,7 +328,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
io_template->get_source( io_template->get_source(
IMPORTING IMPORTING
p_source = et_source p_source = rt_source
EXCEPTIONS EXCEPTIONS
object_invalid = 1 object_invalid = 1
template_deleted = 2 template_deleted = 2
@ -354,7 +349,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION.
p_template_data = is_template_data p_template_data = is_template_data
p_program_name = is_template_data-programm p_program_name = is_template_data-programm
IMPORTING IMPORTING
p_template = eo_template p_template = ro_template
EXCEPTIONS EXCEPTIONS
object_already_existing = 1 object_already_existing = 1
object_just_created = 2 object_just_created = 2

23
src/objects/zcl_abapgit_object_iaxu.clas.abap
View File

@ -10,7 +10,7 @@ CLASS zcl_abapgit_object_iaxu DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
METHODS: METHODS:
read read
EXPORTING es_attr TYPE w3tempattr RETURNING VALUE(rs_attr) TYPE w3tempattr
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
save save
IMPORTING is_attr TYPE w3tempattr IMPORTING is_attr TYPE w3tempattr
@ -31,8 +31,8 @@ CLASS zcl_abapgit_object_iaxu DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
IMPORTING io_xml_api TYPE REF TO object IMPORTING io_xml_api TYPE REF TO object
RAISING zcx_abapgit_exception, RAISING zcx_abapgit_exception,
w3_api_create_new w3_api_create_new
IMPORTING is_attr TYPE w3tempattr IMPORTING is_attr TYPE w3tempattr
EXPORTING eo_xml_api TYPE REF TO object RETURNING VALUE(ro_xml_api) TYPE REF TO object
RAISING zcx_abapgit_exception. RAISING zcx_abapgit_exception.
ENDCLASS. ENDCLASS.
@ -50,12 +50,12 @@ CLASS zcl_abapgit_object_iaxu IMPLEMENTATION.
ls_name = ms_item-obj_name. ls_name = ms_item-obj_name.
w3_api_load( EXPORTING is_name = ls_name w3_api_load( EXPORTING is_name = ls_name
IMPORTING es_attr = es_attr ). IMPORTING es_attr = rs_attr ).
CLEAR: es_attr-chname, CLEAR: rs_attr-chname,
es_attr-tdate, rs_attr-tdate,
es_attr-ttime, rs_attr-ttime,
es_attr-devclass. rs_attr-devclass.
ENDMETHOD. ENDMETHOD.
@ -64,8 +64,7 @@ CLASS zcl_abapgit_object_iaxu IMPLEMENTATION.
DATA: lo_xml_api TYPE REF TO object. DATA: lo_xml_api TYPE REF TO object.
w3_api_create_new( EXPORTING is_attr = is_attr lo_xml_api = w3_api_create_new( is_attr = is_attr ).
IMPORTING eo_xml_api = lo_xml_api ).
w3_api_save( io_xml_api = lo_xml_api ). w3_api_save( io_xml_api = lo_xml_api ).
@ -105,7 +104,7 @@ CLASS zcl_abapgit_object_iaxu IMPLEMENTATION.
zcx_abapgit_exception=>raise( |Error from w3_api_xml3~create_new subrc={ sy-subrc }| ). zcx_abapgit_exception=>raise( |Error from w3_api_xml3~create_new subrc={ sy-subrc }| ).
ENDIF. ENDIF.
eo_xml_api ?= <lo_xml_api>. ro_xml_api ?= <lo_xml_api>.
ENDMETHOD. ENDMETHOD.
@ -310,7 +309,7 @@ CLASS zcl_abapgit_object_iaxu IMPLEMENTATION.
RETURN. RETURN.
ENDIF. ENDIF.
read( IMPORTING es_attr = ls_attr ). ls_attr = read( ).
io_xml->add( iv_name = 'ATTR' io_xml->add( iv_name = 'ATTR'
ig_data = ls_attr ). ig_data = ls_attr ).

12
src/ui/zcl_abapgit_log_viewer.clas.abap
View File

@ -42,8 +42,8 @@ CLASS zcl_abapgit_log_viewer DEFINITION
prepare_log_for_display prepare_log_for_display
IMPORTING IMPORTING
ii_log TYPE REF TO zif_abapgit_log ii_log TYPE REF TO zif_abapgit_log
EXPORTING RETURNING
et_log_out TYPE tty_log_out, VALUE(rt_log_out) TYPE tty_log_out,
show_longtext show_longtext
IMPORTING IMPORTING
@ -276,7 +276,7 @@ CLASS ZCL_ABAPGIT_LOG_VIEWER IMPLEMENTATION.
ls_log-obj_type = lr_message->obj_type. ls_log-obj_type = lr_message->obj_type.
ls_log-obj_name = lr_message->obj_name. ls_log-obj_name = lr_message->obj_name.
INSERT ls_log INTO TABLE et_log_out. INSERT ls_log INTO TABLE rt_log_out.
ENDLOOP. ENDLOOP.
@ -295,11 +295,7 @@ CLASS ZCL_ABAPGIT_LOG_VIEWER IMPLEMENTATION.
lv_add_obj_col TYPE abap_bool, lv_add_obj_col TYPE abap_bool,
lo_event TYPE REF TO cl_salv_events_table. lo_event TYPE REF TO cl_salv_events_table.
prepare_log_for_display( gt_log = prepare_log_for_display( ii_log = ii_log ).
EXPORTING
ii_log = ii_log
IMPORTING
et_log_out = gt_log ).
"check if log contains any object info "check if log contains any object info
LOOP AT gt_log REFERENCE INTO lr_log. LOOP AT gt_log REFERENCE INTO lr_log.

8
src/utils/zcl_abapgit_log.clas.abap
View File

@ -155,17 +155,15 @@ CLASS zcl_abapgit_log IMPLEMENTATION.
DATA ls_item_status TYPE zif_abapgit_log=>ty_item_status_out. DATA ls_item_status TYPE zif_abapgit_log=>ty_item_status_out.
DATA lr_item_status TYPE REF TO zif_abapgit_log=>ty_item_status_out. DATA lr_item_status TYPE REF TO zif_abapgit_log=>ty_item_status_out.
CLEAR et_item_status.
"collect all message for all objects "collect all message for all objects
LOOP AT mt_log REFERENCE INTO lr_log. LOOP AT mt_log REFERENCE INTO lr_log.
CLEAR ls_item_status. CLEAR ls_item_status.
ls_item_status-item = lr_log->item. ls_item_status-item = lr_log->item.
READ TABLE et_item_status REFERENCE INTO lr_item_status READ TABLE rt_item_status REFERENCE INTO lr_item_status
WITH KEY item-obj_type = ls_item_status-item-obj_type WITH KEY item-obj_type = ls_item_status-item-obj_type
item-obj_name = ls_item_status-item-obj_name. item-obj_name = ls_item_status-item-obj_name.
IF sy-subrc <> 0. IF sy-subrc <> 0.
INSERT ls_item_status INTO TABLE et_item_status. INSERT ls_item_status INTO TABLE rt_item_status.
GET REFERENCE OF ls_item_status INTO lr_item_status. GET REFERENCE OF ls_item_status INTO lr_item_status.
ENDIF. ENDIF.
CLEAR ls_msg. CLEAR ls_msg.
@ -175,7 +173,7 @@ CLASS zcl_abapgit_log IMPLEMENTATION.
ENDLOOP. ENDLOOP.
"determine object status from object messages "determine object status from object messages
LOOP AT et_item_status REFERENCE INTO lr_item_status. LOOP AT rt_item_status REFERENCE INTO lr_item_status.
lr_item_status->status = get_messages_status( lr_item_status->messages ). lr_item_status->status = get_messages_status( lr_item_status->messages ).
IF lr_item_status->messages IS INITIAL. IF lr_item_status->messages IS INITIAL.
CLEAR ls_msg. CLEAR ls_msg.

3
src/utils/zif_abapgit_log.intf.abap
View File

@ -71,8 +71,7 @@ INTERFACE zif_abapgit_log
RETURNING RETURNING
VALUE(rt_msg) TYPE tty_log_out . VALUE(rt_msg) TYPE tty_log_out .
METHODS get_item_status METHODS get_item_status
EXPORTING RETURNING VALUE(rt_item_status) TYPE tty_item_status_out .
!et_item_status TYPE tty_item_status_out .
METHODS get_status METHODS get_status
RETURNING RETURNING
VALUE(rv_status) TYPE symsgty . VALUE(rv_status) TYPE symsgty .

78
src/zcl_abapgit_message_helper.clas.abap
View File

@ -76,27 +76,27 @@ CLASS zcl_abapgit_message_helper DEFINITION
set_single_msg_var set_single_msg_var
IMPORTING IMPORTING
iv_arg TYPE clike iv_arg TYPE clike
EXPORTING RETURNING
ev_target TYPE c, VALUE(rv_target) TYPE char01,
set_single_msg_var_clike set_single_msg_var_clike
IMPORTING IMPORTING
iv_arg TYPE clike iv_arg TYPE clike
EXPORTING RETURNING
ev_target TYPE c, VALUE(rv_target) TYPE char01,
set_single_msg_var_numeric set_single_msg_var_numeric
IMPORTING IMPORTING
iv_arg TYPE numeric iv_arg TYPE numeric
EXPORTING RETURNING
ev_target TYPE c, VALUE(rv_target) TYPE char01,
set_single_msg_var_xseq set_single_msg_var_xseq
IMPORTING IMPORTING
iv_arg TYPE xsequence iv_arg TYPE xsequence
EXPORTING RETURNING
ev_target TYPE c. VALUE(rv_target) TYPE char01.
ENDCLASS. ENDCLASS.
@ -137,38 +137,22 @@ CLASS ZCL_ABAPGIT_MESSAGE_HELPER IMPLEMENTATION.
OTHERS = 1. OTHERS = 1.
IF sy-subrc = 0. IF sy-subrc = 0.
set_single_msg_var( sy-msgv1 = set_single_msg_var( iv_arg = mi_t100_message->t100key-attr1 ).
EXPORTING
iv_arg = mi_t100_message->t100key-attr1
IMPORTING
ev_target = sy-msgv1 ).
REPLACE '&V1&' IN TABLE rt_itf REPLACE '&V1&' IN TABLE rt_itf
WITH sy-msgv1. WITH sy-msgv1.
set_single_msg_var( sy-msgv2 = set_single_msg_var( iv_arg = mi_t100_message->t100key-attr2 ).
EXPORTING
iv_arg = mi_t100_message->t100key-attr2
IMPORTING
ev_target = sy-msgv2 ).
REPLACE '&V2&' IN TABLE rt_itf REPLACE '&V2&' IN TABLE rt_itf
WITH sy-msgv2. WITH sy-msgv2.
set_single_msg_var( sy-msgv3 = set_single_msg_var( iv_arg = mi_t100_message->t100key-attr3 ).
EXPORTING
iv_arg = mi_t100_message->t100key-attr3
IMPORTING
ev_target = sy-msgv3 ).
REPLACE '&V3&' IN TABLE rt_itf REPLACE '&V3&' IN TABLE rt_itf
WITH sy-msgv3. WITH sy-msgv3.
set_single_msg_var( sy-msgv4 = set_single_msg_var( iv_arg = mi_t100_message->t100key-attr4 ).
EXPORTING
iv_arg = mi_t100_message->t100key-attr4
IMPORTING
ev_target = sy-msgv4 ).
REPLACE '&V4&' IN TABLE rt_itf REPLACE '&V4&' IN TABLE rt_itf
WITH sy-msgv4. WITH sy-msgv4.
@ -293,24 +277,18 @@ CLASS ZCL_ABAPGIT_MESSAGE_HELPER IMPLEMENTATION.
FIELD-SYMBOLS <lv_arg> TYPE any. FIELD-SYMBOLS <lv_arg> TYPE any.
CLEAR ev_target.
IF iv_arg IS INITIAL. IF iv_arg IS INITIAL.
RETURN. RETURN.
ENDIF. ENDIF.
ASSIGN me->(iv_arg) TO <lv_arg>. ASSIGN me->(iv_arg) TO <lv_arg>.
IF sy-subrc <> 0. IF sy-subrc <> 0.
CONCATENATE '&' iv_arg '&' INTO ev_target. CONCATENATE '&' iv_arg '&' INTO rv_target.
RETURN. RETURN.
ENDIF. ENDIF.
TRY. TRY.
set_single_msg_var_clike( rv_target = set_single_msg_var_clike( iv_arg = <lv_arg> ).
EXPORTING
iv_arg = <lv_arg>
IMPORTING
ev_target = ev_target ).
RETURN. RETURN.
@ -318,11 +296,7 @@ CLASS ZCL_ABAPGIT_MESSAGE_HELPER IMPLEMENTATION.
ENDTRY. ENDTRY.
TRY. TRY.
set_single_msg_var_numeric( rv_target = set_single_msg_var_numeric( iv_arg = <lv_arg> ).
EXPORTING
iv_arg = <lv_arg>
IMPORTING
ev_target = ev_target ).
RETURN. RETURN.
@ -330,37 +304,33 @@ CLASS ZCL_ABAPGIT_MESSAGE_HELPER IMPLEMENTATION.
ENDTRY. ENDTRY.
TRY. TRY.
set_single_msg_var_xseq( rv_target = set_single_msg_var_xseq( iv_arg = <lv_arg> ).
EXPORTING
iv_arg = <lv_arg>
IMPORTING
ev_target = ev_target ).
RETURN. RETURN.
CATCH cx_sy_dyn_call_illegal_type ##no_handler. CATCH cx_sy_dyn_call_illegal_type ##no_handler.
ENDTRY. ENDTRY.
CONCATENATE '&' iv_arg '&' INTO ev_target. CONCATENATE '&' iv_arg '&' INTO rv_target.
ENDMETHOD. ENDMETHOD.
METHOD set_single_msg_var_clike. METHOD set_single_msg_var_clike.
" a kind of MOVE where all conversion errors are signalled by exceptions " a kind of MOVE where all conversion errors are signalled by exceptions
WRITE iv_arg LEFT-JUSTIFIED TO ev_target. WRITE iv_arg LEFT-JUSTIFIED TO rv_target.
ENDMETHOD. ENDMETHOD.
METHOD set_single_msg_var_numeric. METHOD set_single_msg_var_numeric.
" a kind of MOVE where all conversion errors are signalled by exceptions " a kind of MOVE where all conversion errors are signalled by exceptions
WRITE iv_arg LEFT-JUSTIFIED TO ev_target. WRITE iv_arg LEFT-JUSTIFIED TO rv_target.
ENDMETHOD. ENDMETHOD.
METHOD set_single_msg_var_xseq. METHOD set_single_msg_var_xseq.
" a kind of MOVE where all conversion errors are signalled by exceptions " a kind of MOVE where all conversion errors are signalled by exceptions
WRITE iv_arg LEFT-JUSTIFIED TO ev_target. WRITE iv_arg LEFT-JUSTIFIED TO rv_target.
ENDMETHOD. ENDMETHOD.