diff --git a/src/objects/aff/zcl_abapgit_aff_registry.clas.abap b/src/objects/aff/zcl_abapgit_aff_registry.clas.abap index a0ca81ef4..589441013 100644 --- a/src/objects/aff/zcl_abapgit_aff_registry.clas.abap +++ b/src/objects/aff/zcl_abapgit_aff_registry.clas.abap @@ -46,6 +46,7 @@ CLASS ZCL_ABAPGIT_AFF_REGISTRY IMPLEMENTATION. METHOD initialize_registry_table. + register( 'APLO' ). register( 'BGQC' ). register( 'CDBO' ). register( 'CHKC' ). @@ -61,6 +62,8 @@ CLASS ZCL_ABAPGIT_AFF_REGISTRY IMPLEMENTATION. register( 'GSMP' ). register( iv_obj_type = 'INTF' iv_experimental = abap_true ). + register( 'SAJT' ). + register( 'SAJC' ). register( 'SMBC' ). register( 'SWCR' ). register( 'NONT' ). diff --git a/src/objects/aff/zcl_abapgit_object_aplo.clas.abap b/src/objects/aff/zcl_abapgit_object_aplo.clas.abap new file mode 100644 index 000000000..70673c92d --- /dev/null +++ b/src/objects/aff/zcl_abapgit_object_aplo.clas.abap @@ -0,0 +1,24 @@ +CLASS zcl_abapgit_object_aplo DEFINITION + PUBLIC + INHERITING FROM zcl_abapgit_object_common_aff + FINAL + CREATE PUBLIC . + + PUBLIC SECTION. + + METHODS zif_abapgit_object~changed_by + REDEFINITION . + PROTECTED SECTION. + PRIVATE SECTION. + +ENDCLASS. + + + +CLASS ZCL_ABAPGIT_OBJECT_APLO IMPLEMENTATION. + + + METHOD zif_abapgit_object~changed_by. + CLEAR rv_user. + ENDMETHOD. +ENDCLASS. diff --git a/src/objects/aff/zcl_abapgit_object_aplo.clas.xml b/src/objects/aff/zcl_abapgit_object_aplo.clas.xml new file mode 100644 index 000000000..cfec6c94b --- /dev/null +++ b/src/objects/aff/zcl_abapgit_object_aplo.clas.xml @@ -0,0 +1,16 @@ + + + + + + ZCL_ABAPGIT_OBJECT_APLO + E + abapGit - APLO - Application Log Object + 1 + X + X + X + + + + diff --git a/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap b/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap index 9ab7c2101..e7e6f7a3b 100644 --- a/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap +++ b/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap @@ -55,7 +55,9 @@ CLASS zcl_abapgit_object_common_aff DEFINITION METHODS create_aff_setting_deserialize FINAL RETURNING - VALUE(ro_settings_deserialize) TYPE REF TO object. + VALUE(ro_settings_deserialize) TYPE REF TO object + RAISING + zcx_abapgit_exception. PRIVATE SECTION. METHODS is_file_empty @@ -110,6 +112,29 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. ENDMETHOD. + METHOD create_aff_setting_deserialize. + IF ms_item-abap_language_version <> zcl_abapgit_abap_language_vers=>c_any_abap_language_version AND + ms_item-abap_language_version <> zcl_abapgit_abap_language_vers=>c_no_abap_language_version. + TRY. + CREATE OBJECT ro_settings_deserialize TYPE ('CL_AFF_SETTINGS_DESERIALIZE') + EXPORTING + version = 'A' + language = mv_language + user = sy-uname + abap_language_version = ms_item-abap_language_version. + CATCH cx_root. + zcx_abapgit_exception=>raise( |System does not supported ABAP language version for AFF| ). + ENDTRY. + ELSE. + CREATE OBJECT ro_settings_deserialize TYPE ('CL_AFF_SETTINGS_DESERIALIZE') + EXPORTING + version = 'A' + language = mv_language + user = sy-uname. + ENDIF. + ENDMETHOD. + + METHOD get_additional_extensions. RETURN. ENDMETHOD. @@ -412,25 +437,6 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. ENDMETHOD. - METHOD create_aff_setting_deserialize. - IF ms_item-abap_language_version <> zcl_abapgit_abap_language_vers=>c_any_abap_language_version AND - ms_item-abap_language_version <> zcl_abapgit_abap_language_vers=>c_no_abap_language_version. - CREATE OBJECT ro_settings_deserialize TYPE ('CL_AFF_SETTINGS_DESERIALIZE') - EXPORTING - version = 'A' - language = mv_language - user = sy-uname - abap_language_version = ms_item-abap_language_version. - ELSE. - CREATE OBJECT ro_settings_deserialize TYPE ('CL_AFF_SETTINGS_DESERIALIZE') - EXPORTING - version = 'A' - language = mv_language - user = sy-uname. - ENDIF. - ENDMETHOD. - - METHOD zif_abapgit_object~exists. DATA: lr_intf_aff_obj TYPE REF TO data, lo_object_handler TYPE REF TO object, diff --git a/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap b/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap index 488c13ea8..0d46738a8 100644 --- a/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap +++ b/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap @@ -226,7 +226,13 @@ CLASS ltcl_aff_settings_deserialize IMPLEMENTATION. is_item = ls_item iv_language = 'E'. - lo_settings_deserialize = lo_cut->create_aff_setting_deserialize( ). + TRY. + lo_settings_deserialize = lo_cut->create_aff_setting_deserialize( ). + CATCH cx_root. + " System doesn't support AFF with ABAP language version + RETURN. + ENDTRY. + CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_ABAP_LANGUAGE_VERSION') RECEIVING result = lv_act_setting_abap_lv. diff --git a/src/objects/aff/zcl_abapgit_object_sajc.clas.abap b/src/objects/aff/zcl_abapgit_object_sajc.clas.abap new file mode 100644 index 000000000..31f00d70d --- /dev/null +++ b/src/objects/aff/zcl_abapgit_object_sajc.clas.abap @@ -0,0 +1,38 @@ +CLASS zcl_abapgit_object_sajc DEFINITION + PUBLIC + INHERITING FROM zcl_abapgit_object_common_aff + FINAL + CREATE PUBLIC . + + PUBLIC SECTION. + + METHODS zif_abapgit_object~changed_by + REDEFINITION . + PROTECTED SECTION. + PRIVATE SECTION. +ENDCLASS. + + + +CLASS ZCL_ABAPGIT_OBJECT_SAJC IMPLEMENTATION. + + + METHOD zif_abapgit_object~changed_by. + + CONSTANTS lc_table_name TYPE tabname VALUE 'APJ_W_JCE_ROOT'. + + SELECT SINGLE lst_ch_user_acct + FROM (lc_table_name) + INTO rv_user + WHERE job_catalog_entry_name = ms_item-obj_name + AND job_catalog_entry_version = 'I'. + + IF rv_user IS INITIAL. + SELECT SINGLE lst_ch_user_acct + FROM (lc_table_name) + INTO rv_user + WHERE job_catalog_entry_name = ms_item-obj_name + AND job_catalog_entry_version = 'A'. + ENDIF. + ENDMETHOD. +ENDCLASS. diff --git a/src/objects/aff/zcl_abapgit_object_sajc.clas.xml b/src/objects/aff/zcl_abapgit_object_sajc.clas.xml new file mode 100644 index 000000000..6c5841001 --- /dev/null +++ b/src/objects/aff/zcl_abapgit_object_sajc.clas.xml @@ -0,0 +1,16 @@ + + + + + + ZCL_ABAPGIT_OBJECT_SAJC + E + abapGit - SAJC - Application Job Catalog Entry + 1 + X + X + X + + + + diff --git a/src/objects/aff/zcl_abapgit_object_sajt.clas.abap b/src/objects/aff/zcl_abapgit_object_sajt.clas.abap new file mode 100644 index 000000000..86b19688e --- /dev/null +++ b/src/objects/aff/zcl_abapgit_object_sajt.clas.abap @@ -0,0 +1,39 @@ +CLASS zcl_abapgit_object_sajt DEFINITION + PUBLIC + INHERITING FROM zcl_abapgit_object_common_aff + FINAL + CREATE PUBLIC . + + PUBLIC SECTION. + + METHODS zif_abapgit_object~changed_by + REDEFINITION . + PROTECTED SECTION. + PRIVATE SECTION. +ENDCLASS. + + + +CLASS ZCL_ABAPGIT_OBJECT_SAJT IMPLEMENTATION. + + + METHOD zif_abapgit_object~changed_by. + + CONSTANTS lc_table_name TYPE tabname VALUE 'APJ_W_JT_ROOT'. + + SELECT SINGLE lst_ch_user_acct + FROM (lc_table_name) + INTO rv_user + WHERE job_template_name = ms_item-obj_name + AND job_template_version = 'I'. + + IF rv_user IS INITIAL. + SELECT SINGLE lst_ch_user_acct + FROM (lc_table_name) + INTO rv_user + WHERE job_template_name = ms_item-obj_name + AND job_template_version = 'A'. + ENDIF. + + ENDMETHOD. +ENDCLASS. diff --git a/src/objects/aff/zcl_abapgit_object_sajt.clas.xml b/src/objects/aff/zcl_abapgit_object_sajt.clas.xml new file mode 100644 index 000000000..7c093d89d --- /dev/null +++ b/src/objects/aff/zcl_abapgit_object_sajt.clas.xml @@ -0,0 +1,16 @@ + + + + + + ZCL_ABAPGIT_OBJECT_SAJT + E + abapGit - SAJT - Application Job Template + 1 + X + X + X + + + + diff --git a/src/objects/zcl_abapgit_object_shi8.clas.abap b/src/objects/zcl_abapgit_object_shi8.clas.abap index b0ddb12e7..3f287bfaa 100644 --- a/src/objects/zcl_abapgit_object_shi8.clas.abap +++ b/src/objects/zcl_abapgit_object_shi8.clas.abap @@ -76,6 +76,8 @@ CLASS zcl_abapgit_object_shi8 IMPLEMENTATION. ls_node_data-tree_id = ls_assignment_data-tree_id. ls_node_data-node_id = ls_assignment_data-node_id. + tadir_insert( iv_package ). + CALL FUNCTION 'STREE_SFW_ASSIGNMENT_SAVE' EXPORTING assignment_id = ls_assignment_data-sfw_ass_id diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap index 093c1fa19..fc75e7f71 100644 --- a/src/objects/zcl_abapgit_objects_program.clas.abap +++ b/src/objects/zcl_abapgit_objects_program.clas.abap @@ -131,6 +131,8 @@ CLASS zcl_abapgit_objects_program DEFINITION inactive TYPE r3state VALUE 'I', END OF c_state. + CONSTANTS c_native_dynpro TYPE c LENGTH 2 VALUE 'IN'. + METHODS: uncondense_flow IMPORTING it_flow TYPE swydyflow @@ -359,6 +361,9 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION. it_flow = ls_dynpro-flow_logic it_spaces = ls_dynpro-spaces ). + IF ls_dynpro-flow_logic IS INITIAL. + ls_dynpro-flow_logic = mo_files->read_abap( iv_extra = 'screen_' && ls_dynpro-header-screen ). + ENDIF. LOOP AT ls_dynpro-fields ASSIGNING . * if the DDIC element has a PARAMETER_ID and the flag "from_dict" is active @@ -390,7 +395,7 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION. ENDLOOP. - IF ls_dynpro-header-type = 'N' AND ls_dynpro-nat_header IS NOT INITIAL. + IF ls_dynpro-header-type CA c_native_dynpro AND ls_dynpro-nat_header IS NOT INITIAL. DELETE FROM d021t WHERE prog = ls_dynpro-header-program AND dynr = ls_dynpro-header-screen ##SUBRC_OK. INSERT d021t FROM TABLE ls_dynpro-nat_texts ##SUBRC_OK. @@ -913,11 +918,15 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION. ENDLOOP. APPEND INITIAL LINE TO rt_dynpro ASSIGNING . - -header = ls_header. - -flow_logic = lt_flow_logic. + -header = ls_header. + + " Store flow logic as separate ABAP files instead of XML + mo_files->add_abap( + iv_extra = 'screen_' && ls_header-screen + it_abap = lt_flow_logic ). READ TABLE lt_fieldlist_int TRANSPORTING NO FIELDS WITH KEY fill = 'X'. - IF ls_header-type = 'N' AND sy-subrc = 0. + IF ls_header-type CA c_native_dynpro AND sy-subrc = 0. " In particular for dynpros with splitter -nat_header = . CLEAR: -nat_header-dgen, -nat_header-tgen.