mirror of
https://github.com/abapGit/abapGit.git
synced 2025-05-02 04:36:49 +08:00
SRFC: Improvements (#4912)
* SRFC: Improvements - Check if `SRFC` is supported in `constructor`. This will ensure proper error handling (closes #4899). Note: Using the constructor is how it should be checked for other object types as well. - Added `changed_by` logic - Simplified catch code * SRFC: Improvements * SRFC: Improvements * Update message * Raise Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
parent
a94d06d493
commit
68c4f10e02
|
@ -1,8 +1,19 @@
|
||||||
CLASS zcl_abapgit_object_srfc DEFINITION PUBLIC INHERITING FROM zcl_abapgit_objects_super FINAL.
|
CLASS zcl_abapgit_object_srfc DEFINITION
|
||||||
|
PUBLIC
|
||||||
|
INHERITING FROM zcl_abapgit_objects_super
|
||||||
|
FINAL
|
||||||
|
CREATE PUBLIC .
|
||||||
|
|
||||||
PUBLIC SECTION.
|
PUBLIC SECTION.
|
||||||
INTERFACES zif_abapgit_object.
|
|
||||||
|
|
||||||
|
INTERFACES zif_abapgit_object .
|
||||||
|
|
||||||
|
METHODS constructor
|
||||||
|
IMPORTING
|
||||||
|
!is_item TYPE zif_abapgit_definitions=>ty_item
|
||||||
|
!iv_language TYPE spras
|
||||||
|
RAISING
|
||||||
|
zcx_abapgit_exception .
|
||||||
PROTECTED SECTION.
|
PROTECTED SECTION.
|
||||||
PRIVATE SECTION.
|
PRIVATE SECTION.
|
||||||
ENDCLASS.
|
ENDCLASS.
|
||||||
|
@ -12,9 +23,59 @@ ENDCLASS.
|
||||||
CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
|
|
||||||
|
|
||||||
|
METHOD constructor.
|
||||||
|
|
||||||
|
DATA li_srfc_persist TYPE REF TO if_wb_object_persist.
|
||||||
|
|
||||||
|
super->constructor(
|
||||||
|
is_item = is_item
|
||||||
|
iv_language = iv_language ).
|
||||||
|
|
||||||
|
TRY.
|
||||||
|
CREATE OBJECT li_srfc_persist TYPE ('CL_UCONRFC_OBJECT_PERSIST').
|
||||||
|
CATCH cx_root.
|
||||||
|
zcx_abapgit_exception=>raise( 'Object type SRFC is not supported by this system' ).
|
||||||
|
ENDTRY.
|
||||||
|
|
||||||
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
METHOD zif_abapgit_object~changed_by.
|
METHOD zif_abapgit_object~changed_by.
|
||||||
|
|
||||||
|
DATA: li_object_data TYPE REF TO if_wb_object_data_model,
|
||||||
|
li_srfc_persist TYPE REF TO if_wb_object_persist,
|
||||||
|
lr_srfc_data TYPE REF TO data,
|
||||||
|
lx_error TYPE REF TO cx_root.
|
||||||
|
|
||||||
|
FIELD-SYMBOLS: <lg_srfc_data> TYPE any,
|
||||||
|
<lg_any> TYPE any.
|
||||||
|
|
||||||
|
TRY.
|
||||||
|
CREATE DATA lr_srfc_data TYPE ('UCONRFCSERV_COMPLETE').
|
||||||
|
ASSIGN lr_srfc_data->* TO <lg_srfc_data>.
|
||||||
|
ASSERT sy-subrc = 0.
|
||||||
|
|
||||||
|
CREATE OBJECT li_srfc_persist TYPE ('CL_UCONRFC_OBJECT_PERSIST').
|
||||||
|
|
||||||
|
li_srfc_persist->get(
|
||||||
|
EXPORTING
|
||||||
|
p_object_key = |{ ms_item-obj_name }|
|
||||||
|
p_version = 'A'
|
||||||
|
CHANGING
|
||||||
|
p_object_data = li_object_data ).
|
||||||
|
|
||||||
|
li_object_data->get_data( IMPORTING p_data = <lg_srfc_data> ).
|
||||||
|
|
||||||
|
ASSIGN COMPONENT 'HEADER-CHANGEDBY' OF STRUCTURE <lg_srfc_data> TO <lg_any>.
|
||||||
|
IF sy-subrc = 0 AND <lg_any> IS NOT INITIAL.
|
||||||
|
rv_user = <lg_any>.
|
||||||
|
ELSE.
|
||||||
rv_user = c_user_unknown.
|
rv_user = c_user_unknown.
|
||||||
|
ENDIF.
|
||||||
|
|
||||||
|
CATCH cx_root INTO lx_error.
|
||||||
|
zcx_abapgit_exception=>raise_with_text( lx_error ).
|
||||||
|
ENDTRY.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
||||||
|
@ -22,14 +83,7 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
METHOD zif_abapgit_object~delete.
|
METHOD zif_abapgit_object~delete.
|
||||||
|
|
||||||
DATA: li_srfc_persist TYPE REF TO if_wb_object_persist,
|
DATA: li_srfc_persist TYPE REF TO if_wb_object_persist,
|
||||||
lx_error TYPE REF TO cx_root,
|
lx_error TYPE REF TO cx_root.
|
||||||
lv_text TYPE string.
|
|
||||||
|
|
||||||
|
|
||||||
IF zif_abapgit_object~exists( ) = abap_false.
|
|
||||||
* the SRFC might already have been deleted with the function module
|
|
||||||
RETURN.
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
TRY.
|
TRY.
|
||||||
CREATE OBJECT li_srfc_persist TYPE ('CL_UCONRFC_OBJECT_PERSIST').
|
CREATE OBJECT li_srfc_persist TYPE ('CL_UCONRFC_OBJECT_PERSIST').
|
||||||
|
@ -38,8 +92,7 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
p_version = 'A' ).
|
p_version = 'A' ).
|
||||||
|
|
||||||
CATCH cx_root INTO lx_error.
|
CATCH cx_root INTO lx_error.
|
||||||
lv_text = lx_error->get_text( ).
|
zcx_abapgit_exception=>raise_with_text( lx_error ).
|
||||||
zcx_abapgit_exception=>raise( lv_text ).
|
|
||||||
ENDTRY.
|
ENDTRY.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
@ -49,14 +102,12 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
|
|
||||||
DATA: li_srfc_persist TYPE REF TO if_wb_object_persist,
|
DATA: li_srfc_persist TYPE REF TO if_wb_object_persist,
|
||||||
li_object_data TYPE REF TO if_wb_object_data_model,
|
li_object_data TYPE REF TO if_wb_object_data_model,
|
||||||
lv_text TYPE string,
|
|
||||||
lr_srfc_data TYPE REF TO data,
|
lr_srfc_data TYPE REF TO data,
|
||||||
lx_error TYPE REF TO cx_root.
|
lx_error TYPE REF TO cx_root.
|
||||||
|
|
||||||
FIELD-SYMBOLS: <lg_srfc_data> TYPE any,
|
FIELD-SYMBOLS: <lg_srfc_data> TYPE any,
|
||||||
<lg_any> TYPE any.
|
<lg_any> TYPE any.
|
||||||
|
|
||||||
|
|
||||||
TRY.
|
TRY.
|
||||||
CREATE DATA lr_srfc_data TYPE ('UCONRFCSERV_COMPLETE').
|
CREATE DATA lr_srfc_data TYPE ('UCONRFCSERV_COMPLETE').
|
||||||
ASSIGN lr_srfc_data->* TO <lg_srfc_data>.
|
ASSIGN lr_srfc_data->* TO <lg_srfc_data>.
|
||||||
|
@ -93,8 +144,7 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
tadir_insert( iv_package ).
|
tadir_insert( iv_package ).
|
||||||
|
|
||||||
CATCH cx_root INTO lx_error.
|
CATCH cx_root INTO lx_error.
|
||||||
lv_text = lx_error->get_text( ).
|
zcx_abapgit_exception=>raise_with_text( lx_error ).
|
||||||
zcx_abapgit_exception=>raise( lv_text ).
|
|
||||||
ENDTRY.
|
ENDTRY.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
@ -136,10 +186,8 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
|
|
||||||
|
|
||||||
METHOD zif_abapgit_object~get_metadata.
|
METHOD zif_abapgit_object~get_metadata.
|
||||||
|
|
||||||
rs_metadata = get_metadata( ).
|
rs_metadata = get_metadata( ).
|
||||||
rs_metadata-delete_tadir = abap_true.
|
rs_metadata-delete_tadir = abap_true.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
|
@ -178,13 +226,11 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
DATA: li_object_data TYPE REF TO if_wb_object_data_model,
|
DATA: li_object_data TYPE REF TO if_wb_object_data_model,
|
||||||
li_srfc_persist TYPE REF TO if_wb_object_persist,
|
li_srfc_persist TYPE REF TO if_wb_object_persist,
|
||||||
lr_srfc_data TYPE REF TO data,
|
lr_srfc_data TYPE REF TO data,
|
||||||
lx_error TYPE REF TO cx_root,
|
lx_error TYPE REF TO cx_root.
|
||||||
lv_text TYPE string.
|
|
||||||
|
|
||||||
FIELD-SYMBOLS: <lg_srfc_data> TYPE any,
|
FIELD-SYMBOLS: <lg_srfc_data> TYPE any,
|
||||||
<lg_any> TYPE any.
|
<lg_any> TYPE any.
|
||||||
|
|
||||||
|
|
||||||
TRY.
|
TRY.
|
||||||
CREATE DATA lr_srfc_data TYPE ('UCONRFCSERV_COMPLETE').
|
CREATE DATA lr_srfc_data TYPE ('UCONRFCSERV_COMPLETE').
|
||||||
ASSIGN lr_srfc_data->* TO <lg_srfc_data>.
|
ASSIGN lr_srfc_data->* TO <lg_srfc_data>.
|
||||||
|
@ -201,7 +247,6 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
|
|
||||||
li_object_data->get_data( IMPORTING p_data = <lg_srfc_data> ).
|
li_object_data->get_data( IMPORTING p_data = <lg_srfc_data> ).
|
||||||
|
|
||||||
|
|
||||||
ASSIGN COMPONENT 'HEADER-CREATEDBY' OF STRUCTURE <lg_srfc_data> TO <lg_any>.
|
ASSIGN COMPONENT 'HEADER-CREATEDBY' OF STRUCTURE <lg_srfc_data> TO <lg_any>.
|
||||||
IF sy-subrc = 0.
|
IF sy-subrc = 0.
|
||||||
CLEAR <lg_any>.
|
CLEAR <lg_any>.
|
||||||
|
@ -218,8 +263,7 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
CATCH cx_root INTO lx_error.
|
CATCH cx_root INTO lx_error.
|
||||||
lv_text = lx_error->get_text( ).
|
zcx_abapgit_exception=>raise_with_text( lx_error ).
|
||||||
zcx_abapgit_exception=>raise( lv_text ).
|
|
||||||
ENDTRY.
|
ENDTRY.
|
||||||
|
|
||||||
io_xml->add( iv_name = 'SRFC'
|
io_xml->add( iv_name = 'SRFC'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user