CTS API: remove unused iv_resolve_task_to_request (#4633)

This commit is contained in:
Lars Hvam 2021-03-13 13:29:05 +01:00 committed by GitHub
parent 72f34f5bdf
commit 70fdc8771e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 46 deletions

View File

@ -10,28 +10,26 @@ CLASS zcl_abapgit_cts_api DEFINITION
zif_abapgit_cts_api. zif_abapgit_cts_api.
PROTECTED SECTION. PROTECTED SECTION.
PRIVATE SECTION. PRIVATE SECTION.
"! Returns the transport request / task the object is currently locked in "! Returns the transport request / task the object is currently locked in
"! @parameter iv_program_id | Program ID "! @parameter iv_program_id | Program ID
"! @parameter iv_object_type | Object type "! @parameter iv_object_type | Object type
"! @parameter iv_object_name | Object name "! @parameter iv_object_name | Object name
"! @parameter iv_resolve_task_to_request | Return the transport request number if the object is locked in a task
"! @parameter rv_transport | Transport request / task "! @parameter rv_transport | Transport request / task
"! @raising zcx_abapgit_exception | Object is not locked in a transport "! @raising zcx_abapgit_exception | Object is not locked in a transport
METHODS get_current_transport_for_obj METHODS get_current_transport_for_obj
IMPORTING IMPORTING
!iv_program_id TYPE pgmid DEFAULT 'R3TR' !iv_program_id TYPE pgmid DEFAULT 'R3TR'
!iv_object_type TYPE trobjtype !iv_object_type TYPE trobjtype
!iv_object_name TYPE sobj_name !iv_object_name TYPE sobj_name
!iv_resolve_task_to_request TYPE abap_bool DEFAULT abap_true
RETURNING RETURNING
VALUE(rv_transport) TYPE trkorr VALUE(rv_transport) TYPE trkorr
RAISING RAISING
zcx_abapgit_exception . zcx_abapgit_exception .
"! Returns the transport request / task that includes the object (even if not locked) "! Returns the transport request / task that includes the object (even if not locked)
"! @parameter iv_program_id | Program ID "! @parameter iv_program_id | Program ID
"! @parameter iv_object_type | Object type "! @parameter iv_object_type | Object type
"! @parameter iv_object_name | Object name "! @parameter iv_object_name | Object name
"! @parameter iv_resolve_task_to_request | Return the transport request number if the object is in a task
"! @parameter rv_transport | Transport request / task "! @parameter rv_transport | Transport request / task
"! @raising zcx_abapgit_exception | Object is not locked in a transport "! @raising zcx_abapgit_exception | Object is not locked in a transport
METHODS get_current_transport_from_db METHODS get_current_transport_from_db
@ -39,7 +37,6 @@ CLASS zcl_abapgit_cts_api DEFINITION
!iv_program_id TYPE pgmid DEFAULT 'R3TR' !iv_program_id TYPE pgmid DEFAULT 'R3TR'
!iv_object_type TYPE trobjtype !iv_object_type TYPE trobjtype
!iv_object_name TYPE sobj_name !iv_object_name TYPE sobj_name
!iv_resolve_task_to_request TYPE abap_bool DEFAULT abap_true
RETURNING RETURNING
VALUE(rv_transport) TYPE trkorr VALUE(rv_transport) TYPE trkorr
RAISING RAISING
@ -83,7 +80,7 @@ ENDCLASS.
CLASS zcl_abapgit_cts_api IMPLEMENTATION. CLASS ZCL_ABAPGIT_CTS_API IMPLEMENTATION.
METHOD get_current_transport_for_obj. METHOD get_current_transport_for_obj.
@ -123,27 +120,19 @@ CLASS zcl_abapgit_cts_api IMPLEMENTATION.
zcx_abapgit_exception=>raise( |Object type { iv_program_id }-{ iv_object_type } not lockable| ). zcx_abapgit_exception=>raise( |Object type { iv_program_id }-{ iv_object_type } not lockable| ).
ENDIF. ENDIF.
IF lv_task IS NOT INITIAL AND lv_task <> lv_transport_request AND iv_resolve_task_to_request = abap_false. rv_transport = lv_transport_request.
rv_transport = lv_task.
ELSE.
rv_transport = lv_transport_request.
ENDIF.
ENDMETHOD. ENDMETHOD.
METHOD get_current_transport_from_db. METHOD get_current_transport_from_db.
DATA lv_strkorr TYPE e070-strkorr.
" This method is used for objects that are included in transports but not locked " This method is used for objects that are included in transports but not locked
" for example, namespaces (NSPC) " for example, namespaces (NSPC)
SELECT SINGLE a~trkorr a~strkorr FROM e070 AS a JOIN e071 AS b ON a~trkorr = b~trkorr SELECT SINGLE a~trkorr FROM e070 AS a JOIN e071 AS b ON a~trkorr = b~trkorr
INTO (rv_transport, lv_strkorr) INTO rv_transport
WHERE ( a~trstatus = 'D' OR a~trstatus = 'L' ) WHERE ( a~trstatus = 'D' OR a~trstatus = 'L' )
AND b~pgmid = iv_program_id AND b~object = iv_object_type AND b~obj_name = iv_object_name. AND b~pgmid = iv_program_id AND b~object = iv_object_type AND b~obj_name = iv_object_name.
IF sy-subrc = 0 AND iv_resolve_task_to_request = abap_true.
rv_transport = lv_strkorr.
ENDIF.
ENDMETHOD. ENDMETHOD.
@ -233,16 +222,14 @@ CLASS zcl_abapgit_cts_api IMPLEMENTATION.
iv_object_name = is_item-obj_name ) = abap_true. iv_object_name = is_item-obj_name ) = abap_true.
rv_transport = get_current_transport_for_obj( rv_transport = get_current_transport_for_obj(
iv_object_type = is_item-obj_type iv_object_type = is_item-obj_type
iv_object_name = is_item-obj_name iv_object_name = is_item-obj_name ).
iv_resolve_task_to_request = iv_resolve_task_to_request ).
ELSEIF is_object_type_transportable( is_item-obj_type ) = abap_true. ELSEIF is_object_type_transportable( is_item-obj_type ) = abap_true.
rv_transport = get_current_transport_from_db( rv_transport = get_current_transport_from_db(
iv_object_type = is_item-obj_type iv_object_type = is_item-obj_type
iv_object_name = is_item-obj_name iv_object_name = is_item-obj_name ).
iv_resolve_task_to_request = iv_resolve_task_to_request ).
ENDIF. ENDIF.

View File

@ -4,15 +4,13 @@ INTERFACE zif_abapgit_cts_api
"! Returns the transport request / task the object is currently in "! Returns the transport request / task the object is currently in
"! @parameter is_item | Object "! @parameter is_item | Object
"! @parameter iv_resolve_task_to_request | Return the transport request number
"! @parameter rv_transport | Transport request / task "! @parameter rv_transport | Transport request / task
"! @raising zcx_abapgit_exception | Object is not in a transport "! @raising zcx_abapgit_exception | Object is not in a transport
METHODS get_transport_for_object METHODS get_transport_for_object
IMPORTING IMPORTING
!is_item TYPE zif_abapgit_definitions=>ty_item !is_item TYPE zif_abapgit_definitions=>ty_item
!iv_resolve_task_to_request TYPE abap_bool DEFAULT abap_false
RETURNING RETURNING
VALUE(rv_transport) TYPE trkorr VALUE(rv_transport) TYPE trkorr
RAISING RAISING
zcx_abapgit_exception . zcx_abapgit_exception .
"! Check if change recording is possible for the given package "! Check if change recording is possible for the given package

View File

@ -139,7 +139,7 @@ ENDCLASS.
CLASS zcl_abapgit_gui_page_stage IMPLEMENTATION. CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION.
METHOD build_menu. METHOD build_menu.
@ -348,9 +348,7 @@ CLASS zcl_abapgit_gui_page_stage IMPLEMENTATION.
CLEAR ls_new. CLEAR ls_new.
ls_new-item = <ls_local>-item. ls_new-item = <ls_local>-item.
ls_new-transport = li_cts_api->get_transport_for_object( ls_new-transport = li_cts_api->get_transport_for_object( <ls_local>-item ).
is_item = <ls_local>-item
iv_resolve_task_to_request = abap_false ).
IF ls_new-transport IS NOT INITIAL. IF ls_new-transport IS NOT INITIAL.
INSERT ls_new INTO TABLE ct_transports. INSERT ls_new INTO TABLE ct_transports.
@ -389,9 +387,7 @@ CLASS zcl_abapgit_gui_page_stage IMPLEMENTATION.
CONTINUE. CONTINUE.
ELSE. ELSE.
ls_new-item = ls_item. ls_new-item = ls_item.
ls_new-transport = li_cts_api->get_transport_for_object( ls_new-transport = li_cts_api->get_transport_for_object( ls_item ).
is_item = ls_item
iv_resolve_task_to_request = abap_false ).
IF ls_new-transport IS NOT INITIAL. IF ls_new-transport IS NOT INITIAL.
INSERT ls_new INTO TABLE ct_transports. INSERT ls_new INTO TABLE ct_transports.
@ -425,6 +421,14 @@ CLASS zcl_abapgit_gui_page_stage IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD init_files.
ms_files = zcl_abapgit_factory=>get_stage_logic( )->get( mo_repo ).
IF lines( ms_files-local ) = 0 AND lines( ms_files-remote ) = 0.
zcx_abapgit_exception=>raise( 'There are no changes that could be staged' ).
ENDIF.
ENDMETHOD.
METHOD render_actions. METHOD render_actions.
DATA: lv_local_count TYPE i, DATA: lv_local_count TYPE i,
@ -905,12 +909,4 @@ CLASS zcl_abapgit_gui_page_stage IMPLEMENTATION.
INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions.
ENDMETHOD. ENDMETHOD.
METHOD init_files.
ms_files = zcl_abapgit_factory=>get_stage_logic( )->get( mo_repo ).
IF lines( ms_files-local ) = 0 AND lines( ms_files-remote ) = 0.
zcx_abapgit_exception=>raise( 'There are no changes that could be staged' ).
ENDIF.
ENDMETHOD.
ENDCLASS. ENDCLASS.