Merge branch 'main' into mbtools/alav-ddic

package.json

@@ -23,11 +23,11 @@
     ]
   },
   "devDependencies": {
-    "@abaplint/cli": "^2.113.108",
+    "@abaplint/cli": "^2.113.109",
     "@abaplint/database-sqlite": "^2.10.24",
-    "@abaplint/runtime": "^2.10.42",
+    "@abaplint/runtime": "^2.10.44",
     "express": "^4.21.2",
-    "@abaplint/transpiler-cli": "^2.10.42",
+    "@abaplint/transpiler-cli": "^2.10.44",
     "globals": "^16.0.0",
     "abapmerge": "^0.16.6",
     "c8": "^10.1.3",

src/background/zcl_abapgit_background_push_au.clas.abap

@@ -69,12 +69,12 @@ CLASS zcl_abapgit_background_push_au IMPLEMENTATION.
 
   METHOD determine_user_details.
 
-    DATA: lo_user_record TYPE REF TO zcl_abapgit_user_record.
+    DATA li_user_record TYPE REF TO zif_abapgit_user_record.
 
 
-    lo_user_record = zcl_abapgit_user_record=>get_instance( iv_changed_by ).
+    li_user_record = zcl_abapgit_env_factory=>get_user_record( ).
-    rs_user-name = lo_user_record->get_name( ).
+    rs_user-name = li_user_record->get_name( iv_changed_by ).
-    rs_user-email = lo_user_record->get_email( ).
+    rs_user-email = li_user_record->get_email( iv_changed_by ).
 
 *   If no email, fall back to localhost/default email
     IF rs_user-email IS INITIAL.

src/env/zcl_abapgit_env_factory.clas.abap

@@ -0,0 +1,21 @@
+CLASS zcl_abapgit_env_factory DEFINITION PUBLIC GLOBAL FRIENDS zcl_abapgit_env_injector.
+  PUBLIC SECTION.
+    CLASS-METHODS get_user_record
+      RETURNING
+        VALUE(ri_user_record) TYPE REF TO zif_abapgit_user_record.
+
+  PRIVATE SECTION.
+    CLASS-DATA gi_user_record TYPE REF TO zif_abapgit_user_record.
+ENDCLASS.
+
+CLASS zcl_abapgit_env_factory IMPLEMENTATION.
+
+  METHOD get_user_record.
+    IF gi_user_record IS NOT BOUND.
+      CREATE OBJECT gi_user_record TYPE zcl_abapgit_user_record.
+    ENDIF.
+
+    ri_user_record = gi_user_record.
+  ENDMETHOD.
+
+ENDCLASS.

src/env/zcl_abapgit_env_factory.clas.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_ENV_FACTORY</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>ZCL_ABAPGIT_ENV_FACTORY</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>

src/env/zcl_abapgit_env_injector.clas.abap

@@ -0,0 +1,14 @@
+CLASS zcl_abapgit_env_injector DEFINITION PUBLIC.
+  PUBLIC SECTION.
+    CLASS-METHODS set_user_record
+      IMPORTING
+        !ii_user_record TYPE REF TO zif_abapgit_user_record.
+ENDCLASS.
+
+CLASS zcl_abapgit_env_injector IMPLEMENTATION.
+
+  METHOD set_user_record.
+    zcl_abapgit_env_factory=>gi_user_record = ii_user_record.
+  ENDMETHOD.
+
+ENDCLASS.

src/env/zcl_abapgit_env_injector.clas.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_ENV_INJECTOR</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>ZCL_ABAPGIT_ENV_INJECTOR</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>

src/env/zcl_abapgit_user_record.clas.abap

@@ -1,45 +1,26 @@
 CLASS zcl_abapgit_user_record DEFINITION
   PUBLIC
   FINAL
-  CREATE PRIVATE.
+  CREATE PRIVATE
+  GLOBAL FRIENDS zcl_abapgit_env_factory.
 
   PUBLIC SECTION.
     CLASS-METHODS reset.
-    CLASS-METHODS get_instance
+
-      IMPORTING
+    INTERFACES zif_abapgit_user_record.
-        !iv_user       TYPE sy-uname
+
-      RETURNING
-        VALUE(ro_user) TYPE REF TO zcl_abapgit_user_record.
-    METHODS constructor
-      IMPORTING
-        !iv_user TYPE sy-uname.
-    METHODS get_name
-      RETURNING
-        VALUE(rv_name) TYPE string.
-    METHODS get_email
-      RETURNING
-        VALUE(rv_email) TYPE string.
-    CLASS-METHODS get_title
-      IMPORTING
-        iv_username     TYPE sy-uname
-      RETURNING
-        VALUE(rv_title) TYPE string.
   PROTECTED SECTION.
   PRIVATE SECTION.
     TYPES:
       BEGIN OF ty_user,
         user  TYPE sy-uname,
-        o_user TYPE REF TO zcl_abapgit_user_record,
+        name  TYPE string,
+        email TYPE string,
       END OF ty_user.
 
     CLASS-DATA gt_user TYPE HASHED TABLE OF ty_user WITH UNIQUE KEY user.
 
-    DATA: BEGIN OF ms_user,
+    CLASS-METHODS check_user_exists
-            name  TYPE string,
-            email TYPE string,
-          END OF ms_user .
-
-    METHODS check_user_exists
       IMPORTING
         iv_user     TYPE sy-uname
       EXPORTING
@@ -48,46 +29,51 @@ CLASS zcl_abapgit_user_record DEFINITION
       RAISING
         zcx_abapgit_exception.
 
-    METHODS get_user_dtls_from_other_clnt
+    CLASS-METHODS get_user_dtls_from_other_clnt
       IMPORTING
-        iv_user TYPE sy-uname.
+        iv_user        TYPE sy-uname
+      RETURNING
+        VALUE(rs_user) TYPE ty_user.
+
+    CLASS-METHODS build_cache
+      IMPORTING
+        iv_user        TYPE sy-uname
+      RETURNING
+        VALUE(rs_user) TYPE ty_user.
+
+    CLASS-METHODS read_cache
+      IMPORTING
+        iv_user        TYPE sy-uname
+      RETURNING
+        VALUE(rs_user) TYPE ty_user.
 ENDCLASS.
 
 
 
-CLASS zcl_abapgit_user_record IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_USER_RECORD IMPLEMENTATION.
 
 
-  METHOD get_title.
+  METHOD build_cache.
-* the queried username might not exist, so this method is static
-* refactored for open-abap compatibility
-
-    DATA lr_addr3             TYPE REF TO data.
-    FIELD-SYMBOLS <ls_addr3>  TYPE any.
-    FIELD-SYMBOLS <lv_simple> TYPE simple.
 
+    " Get user details
     TRY.
-        CREATE DATA lr_addr3 TYPE ('ADDR3_VAL').
+        check_user_exists(
-      CATCH cx_sy_create_data_error.
-        RETURN.
-    ENDTRY.
-    ASSIGN lr_addr3->* TO <ls_addr3>.
-
-    CALL FUNCTION 'SUSR_USER_ADDRESS_READ'
           EXPORTING
-        user_name              = iv_username
+            iv_user     = iv_user
           IMPORTING
-        user_address           = <ls_addr3>
+            ev_fullname = rs_user-name
-      EXCEPTIONS
+            ev_email    = rs_user-email ).
-        user_address_not_found = 1
+      CATCH zcx_abapgit_exception.
-        OTHERS                 = 2.
+        " Could not find user, try to get from other clients
-    IF sy-subrc = 0.
+        rs_user = get_user_dtls_from_other_clnt( iv_user ).
-      ASSIGN COMPONENT 'NAME_TEXT' OF STRUCTURE <ls_addr3> TO <lv_simple>.
+    ENDTRY.
-      rv_title = <lv_simple>.
+
-    ENDIF.
+    rs_user-user = iv_user.
+    INSERT rs_user INTO TABLE gt_user.
 
   ENDMETHOD.
 
+
   METHOD check_user_exists.
 
     DATA lt_return  TYPE STANDARD TABLE OF bapiret2 WITH DEFAULT KEY.
@@ -120,63 +106,6 @@ CLASS zcl_abapgit_user_record IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD constructor.
-
-    DATA ls_user TYPE ty_user.
-
-    " Get user details
-    TRY.
-        check_user_exists(
-          EXPORTING
-            iv_user     = iv_user
-          IMPORTING
-            ev_fullname = ms_user-name
-            ev_email    = ms_user-email ).
-      CATCH zcx_abapgit_exception.
-        " Could not find user, try to get from other clients
-        get_user_dtls_from_other_clnt( iv_user ).
-    ENDTRY.
-
-    " If the user has been found add it to the list
-    IF ms_user-name IS NOT INITIAL AND ms_user-email IS NOT INITIAL.
-      ls_user-user = iv_user.
-      ls_user-o_user = me.
-      INSERT ls_user INTO TABLE gt_user.
-    ENDIF.
-
-  ENDMETHOD.
-
-
-  METHOD get_email.
-
-    rv_email = ms_user-email.
-
-  ENDMETHOD.
-
-
-  METHOD get_instance.
-
-    FIELD-SYMBOLS <ls_user> TYPE ty_user.
-
-    READ TABLE gt_user ASSIGNING <ls_user> WITH TABLE KEY user = iv_user.
-    IF sy-subrc = 0.
-      ro_user = <ls_user>-o_user.
-    ELSE.
-      CREATE OBJECT ro_user
-        EXPORTING
-          iv_user = iv_user.
-    ENDIF.
-
-  ENDMETHOD.
-
-
-  METHOD get_name.
-
-    rv_name = ms_user-name.
-
-  ENDMETHOD.
-
-
   METHOD get_user_dtls_from_other_clnt.
 
     CONSTANTS lc_cc_category TYPE string VALUE 'C'.
@@ -190,7 +119,7 @@ CLASS zcl_abapgit_user_record IMPLEMENTATION.
         ORDER BY PRIMARY KEY.
 
     LOOP AT lt_dev_clients ASSIGNING <lv_dev_client>.
-      SELECT SINGLE p~name_text a~smtp_addr INTO (ms_user-name, ms_user-email)
+      SELECT SINGLE u~bname p~name_text a~smtp_addr INTO (rs_user-user, rs_user-name, rs_user-email)
           FROM usr21 AS u
           INNER JOIN adrp AS p ON p~persnumber = u~persnumber
                               AND p~client     = u~mandt
@@ -211,7 +140,61 @@ CLASS zcl_abapgit_user_record IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD read_cache.
+
+    READ TABLE gt_user INTO rs_user WITH TABLE KEY user = iv_user.
+    IF sy-subrc <> 0.
+      rs_user = build_cache( iv_user ).
+    ENDIF.
+
+  ENDMETHOD.
+
+
   METHOD reset.
     CLEAR gt_user.
   ENDMETHOD.
+
+
+  METHOD zif_abapgit_user_record~get_email.
+
+    rv_email = read_cache( iv_username )-email.
+
+  ENDMETHOD.
+
+
+  METHOD zif_abapgit_user_record~get_name.
+
+    rv_name = read_cache( iv_username )-name.
+
+  ENDMETHOD.
+
+
+  METHOD zif_abapgit_user_record~get_title.
+* the queried username might not exist, refactored for open-abap compatibility
+
+    DATA lr_addr3             TYPE REF TO data.
+    FIELD-SYMBOLS <ls_addr3>  TYPE any.
+    FIELD-SYMBOLS <lv_simple> TYPE simple.
+
+    TRY.
+        CREATE DATA lr_addr3 TYPE ('ADDR3_VAL').
+      CATCH cx_sy_create_data_error.
+        RETURN.
+    ENDTRY.
+    ASSIGN lr_addr3->* TO <ls_addr3>.
+
+    CALL FUNCTION 'SUSR_USER_ADDRESS_READ'
+      EXPORTING
+        user_name              = iv_username
+      IMPORTING
+        user_address           = <ls_addr3>
+      EXCEPTIONS
+        user_address_not_found = 1
+        OTHERS                 = 2.
+    IF sy-subrc = 0.
+      ASSIGN COMPONENT 'NAME_TEXT' OF STRUCTURE <ls_addr3> TO <lv_simple>.
+      rv_title = <lv_simple>.
+    ENDIF.
+
+  ENDMETHOD.
 ENDCLASS.

src/env/zcl_abapgit_user_record.clas.testclasses.abap

@@ -16,10 +16,10 @@ ENDCLASS.
 CLASS ltcl_user_record IMPLEMENTATION.
 
   METHOD test_invalid_user.
-    DATA: lo_user_record TYPE REF TO zcl_abapgit_user_record.
+    DATA li_user_record TYPE REF TO zif_abapgit_user_record.
 
     zcl_abapgit_user_record=>reset( ).
-    lo_user_record = zcl_abapgit_user_record=>get_instance( c_wrong_user ).
+    li_user_record = zcl_abapgit_env_factory=>get_user_record( ).
 
     cl_abap_unit_assert=>assert_equals(
       exp = 0

src/env/zif_abapgit_user_record.intf.abap

@@ -0,0 +1,21 @@
+INTERFACE zif_abapgit_user_record PUBLIC.
+
+  METHODS get_name
+    IMPORTING
+      iv_username    TYPE sy-uname
+    RETURNING
+      VALUE(rv_name) TYPE string.
+
+  METHODS get_email
+    IMPORTING
+      iv_username     TYPE sy-uname
+    RETURNING
+      VALUE(rv_email) TYPE string.
+
+  METHODS get_title
+    IMPORTING
+      iv_username     TYPE sy-uname
+    RETURNING
+      VALUE(rv_title) TYPE string.
+
+ENDINTERFACE.

src/env/zif_abapgit_user_record.intf.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_INTF" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOINTERF>
+    <CLSNAME>ZIF_ABAPGIT_USER_RECORD</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>ZIF_ABAPGIT_USER_RECORD</DESCRIPT>
+    <EXPOSURE>2</EXPOSURE>
+    <STATE>1</STATE>
+    <UNICODE>X</UNICODE>
+   </VSEOINTERF>
+  </asx:values>
+ </asx:abap>
+</abapGit>

src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap

@@ -1323,7 +1323,7 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION.
     ENDIF.
 
     IF iv_username <> zcl_abapgit_objects_super=>c_user_unknown AND iv_suppress_title = abap_false.
-      lv_title = zcl_abapgit_user_record=>get_title( iv_username ).
+      lv_title = zcl_abapgit_env_factory=>get_user_record( )->get_title( iv_username ).
     ENDIF.
 
     lv_jump = |{ zif_abapgit_definitions=>c_action-jump_user }?user={ iv_username }|.

src/ui/pages/db/zcl_abapgit_gui_page_db.clas.abap

@@ -367,7 +367,7 @@ CLASS zcl_abapgit_gui_page_db IMPLEMENTATION.
 
       WHEN zcl_abapgit_persistence_db=>c_type_user.
         lv_descr       = 'Personal Settings'.
-        ls_explanation-value = zcl_abapgit_user_record=>get_instance( is_data-value )->get_name( ).
+        ls_explanation-value = zcl_abapgit_env_factory=>get_user_record( )->get_name( is_data-value ).
 
       WHEN zcl_abapgit_persistence_db=>c_type_settings.
         lv_descr       = 'Global Settings'.

src/ui/pages/sett/zcl_abapgit_gui_page_sett_info.clas.abap

@@ -194,7 +194,7 @@ CLASS zcl_abapgit_gui_page_sett_info IMPLEMENTATION.
     ENDIF.
 
     IF iv_username <> zcl_abapgit_objects_super=>c_user_unknown.
-      lv_title = zcl_abapgit_user_record=>get_title( iv_username ).
+      lv_title = zcl_abapgit_env_factory=>get_user_record( )->get_title( iv_username ).
     ENDIF.
 
     rv_user = iv_username.

src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap

@@ -241,7 +241,7 @@ CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION.
     ENDIF.
     IF rv_email IS INITIAL.
       " get default from user record
-      rv_email = zcl_abapgit_user_record=>get_instance( sy-uname )->get_email( ).
+      rv_email = zcl_abapgit_env_factory=>get_user_record( )->get_email( sy-uname ).
     ENDIF.
 
   ENDMETHOD.
@@ -259,7 +259,7 @@ CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION.
     ENDIF.
     IF rv_user IS INITIAL.
       " get default from user record
-      rv_user = zcl_abapgit_user_record=>get_instance( sy-uname )->get_name( ).
+      rv_user = zcl_abapgit_env_factory=>get_user_record( )->get_name( sy-uname ).
     ENDIF.
 
   ENDMETHOD.

src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap

@@ -237,7 +237,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
     ENDIF.
     IF rv_email IS INITIAL.
       " get default from user record
-      rv_email = zcl_abapgit_user_record=>get_instance( sy-uname )->get_email( ).
+      rv_email = zcl_abapgit_env_factory=>get_user_record( )->get_email( sy-uname ).
     ENDIF.
 
   ENDMETHOD.
@@ -255,7 +255,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
     ENDIF.
     IF rv_user IS INITIAL.
       " get default from user record
-      rv_user = zcl_abapgit_user_record=>get_instance( sy-uname )->get_name( ).
+      rv_user = zcl_abapgit_env_factory=>get_user_record( )->get_name( sy-uname ).
     ENDIF.
 
   ENDMETHOD.