From 9f91e4f3ad200211be6b940328a157158f518ad9 Mon Sep 17 00:00:00 2001
From: Marc Bernard <59966492+mbtools@users.noreply.github.com>
Date: Fri, 8 Jan 2021 06:06:06 -0500
Subject: [PATCH] Move method is_sap_object_allowed (#4385)

Closes https://github.com/abapGit/abapGit/issues/4382

Co-authored-by: Lars Hvam <larshp@hotmail.com>
---
 src/repo/zcl_abapgit_repo_srv.clas.abap | 19 +------------------
 src/zcl_abapgit_environment.clas.abap   | 14 +++++++++++++-
 src/zif_abapgit_environment.intf.abap   |  3 +++
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/repo/zcl_abapgit_repo_srv.clas.abap b/src/repo/zcl_abapgit_repo_srv.clas.abap
index 0046e859f..3baca3cf8 100644
--- a/src/repo/zcl_abapgit_repo_srv.clas.abap
+++ b/src/repo/zcl_abapgit_repo_srv.clas.abap
@@ -46,9 +46,6 @@ CLASS zcl_abapgit_repo_srv DEFINITION
     METHODS refresh
       RAISING
         zcx_abapgit_exception .
-    METHODS is_sap_object_allowed
-      RETURNING
-        VALUE(rv_allowed) TYPE abap_bool .
     METHODS instantiate_and_add
       IMPORTING
         !is_repo_meta  TYPE zif_abapgit_persistence=>ty_repo
@@ -147,18 +144,6 @@ CLASS zcl_abapgit_repo_srv IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD is_sap_object_allowed.
-
-    rv_allowed = cl_enh_badi_def_utility=>is_sap_system( ).
-    IF rv_allowed = abap_true.
-      RETURN.
-    ENDIF.
-
-    rv_allowed = zcl_abapgit_exit=>get_instance( )->allow_sap_objects( ).
-
-  ENDMETHOD.
-
-
   METHOD refresh.
 
     DATA: lt_list TYPE zif_abapgit_persistence=>ty_repos.
@@ -576,7 +561,7 @@ CLASS zcl_abapgit_repo_srv IMPLEMENTATION.
       zcx_abapgit_exception=>raise( |Package { iv_package } not found| ).
     ENDIF.
 
-    IF is_sap_object_allowed( ) = abap_false AND lv_as4user = 'SAP'.
+    IF zcl_abapgit_factory=>get_environment( )->is_sap_object_allowed( ) = abap_false AND lv_as4user = 'SAP'.
       zcx_abapgit_exception=>raise( |Package { iv_package } not allowed, responsible user = 'SAP'| ).
     ENDIF.
 
@@ -618,6 +603,4 @@ CLASS zcl_abapgit_repo_srv IMPLEMENTATION.
     ENDIF.
 
   ENDMETHOD.
-
-
 ENDCLASS.
diff --git a/src/zcl_abapgit_environment.clas.abap b/src/zcl_abapgit_environment.clas.abap
index 4aecd5c59..00c9a7344 100644
--- a/src/zcl_abapgit_environment.clas.abap
+++ b/src/zcl_abapgit_environment.clas.abap
@@ -16,7 +16,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_ENVIRONMENT IMPLEMENTATION.
+CLASS zcl_abapgit_environment IMPLEMENTATION.
 
 
   METHOD zif_abapgit_environment~compare_with_inactive.
@@ -86,4 +86,16 @@ CLASS ZCL_ABAPGIT_ENVIRONMENT IMPLEMENTATION.
     ENDIF.
     rv_result = mv_cloud.
   ENDMETHOD.
+
+
+  METHOD zif_abapgit_environment~is_sap_object_allowed.
+
+    rv_allowed = cl_enh_badi_def_utility=>is_sap_system( ).
+    IF rv_allowed = abap_true.
+      RETURN.
+    ENDIF.
+
+    rv_allowed = zcl_abapgit_exit=>get_instance( )->allow_sap_objects( ).
+
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/zif_abapgit_environment.intf.abap b/src/zif_abapgit_environment.intf.abap
index 8a5fac357..6761dc7e3 100644
--- a/src/zif_abapgit_environment.intf.abap
+++ b/src/zif_abapgit_environment.intf.abap
@@ -15,4 +15,7 @@ INTERFACE zif_abapgit_environment
   METHODS is_restart_required
     RETURNING
       VALUE(rv_result) TYPE abap_bool.
+  METHODS is_sap_object_allowed
+    RETURNING
+      VALUE(rv_allowed) TYPE abap_bool.
 ENDINTERFACE.