From 57184295b3de4b93d5d58671cd31af9351cb2ad7 Mon Sep 17 00:00:00 2001
From: Chad Redman <credman@unicon.net>
Date: Mon, 22 Aug 2022 12:34:45 -0400
Subject: [PATCH] Remove temporary fix for GRP-4024

---
 TODO.md                                               |  2 +-
 .../ex201.end/container_files/seed-data/bootstrap.gsh |  9 ---------
 .../ex401.end/container_files/seed-data/bootstrap.gsh | 11 -----------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/TODO.md b/TODO.md
index 8a70d88..caf63b9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,7 @@ TODO
 
 202205
 -------
-- Once upgrading to 2.6.9, can remove gsh code marked "Temporary fix for GRP-4024" from bootstrap.gsh files
+- (DONE) Once upgrading to 2.6.9, can remove gsh code marked "Temporary fix for GRP-4024" from bootstrap.gsh files
 - Bug in 2.6.8, attr_read isn't enough to see attributes; need admin privileges on the object to see the option in the menu
 - Somehow add docker-compose to the vms so we don't have to download it
 
diff --git a/ex201/ex201.end/container_files/seed-data/bootstrap.gsh b/ex201/ex201.end/container_files/seed-data/bootstrap.gsh
index e155346..294e00e 100644
--- a/ex201/ex201.end/container_files/seed-data/bootstrap.gsh
+++ b/ex201/ex201.end/container_files/seed-data/bootstrap.gsh
@@ -21,9 +21,6 @@ java.util.Date RECENT_GRAD_END_DATE = cal.time
 /***** END Defaults that may need to be changed for each class *****/
 
 
-/***** Temporary fix for GRP-4024 *****/
-import edu.internet2.middleware.grouper.cfg.text.GrouperTextContainer
-
 /***** Start of script *****/
 GrouperSession gs = GrouperSession.start(SubjectFinder.findByIdentifierAndSource("banderson", "eduLDAP", true))
 
@@ -72,9 +69,6 @@ class HelperMethods {
         templateLogic.stemId = parentStem.uuid
         templateLogic.stemTemplateContainer = stemTemplateContainer
 
-        /***** Temporary fix for GRP-4024 *****/
-        GrouperTextContainer.assignThreadLocalVariable("groupStemTemplateContainer", stemTemplateContainer)
-
         List<ServiceAction> selectedServiceActions = []
         if (myServiceActionIds == null || myServiceActionIds.isEmpty()) {
             selectedServiceActions = templateLogic.getServiceActions()
@@ -104,9 +98,6 @@ class HelperMethods {
         policyTemplateLogic.stemId = parentStem.uuid
         policyTemplateLogic.stemTemplateContainer = policyStemTemplateContainer
 
-        /***** Temporary fix for GRP-4024 *****/
-        GrouperTextContainer.assignThreadLocalVariable("groupStemTemplateContainer", policyStemTemplateContainer)
-
         // simulate checking certain boxes in the ui
         List<ServiceAction> selectedServiceActions = []
         if (myServiceActionIds == null || myServiceActionIds.isEmpty()) {
diff --git a/ex401/ex401.end/container_files/seed-data/bootstrap.gsh b/ex401/ex401.end/container_files/seed-data/bootstrap.gsh
index 5a60a42..fd7f7fa 100644
--- a/ex401/ex401.end/container_files/seed-data/bootstrap.gsh
+++ b/ex401/ex401.end/container_files/seed-data/bootstrap.gsh
@@ -13,11 +13,6 @@ import java.text.SimpleDateFormat;
 
 GrouperSession gs = GrouperSession.start(SubjectFinder.findByIdentifierAndSource("banderson", "eduLDAP", true))
 
-
-/***** Temporary fix for GRP-4024 *****/
-import edu.internet2.middleware.grouper.cfg.text.GrouperTextContainer
-
-
 /* Creating a class for methods helps with gsh from the command line, which can't do functions called from other functions */
 class HelperMethods {
     static void assignObjectTypeForGroup(Group g, String type, String owner=null, String description=null) {
@@ -63,9 +58,6 @@ class HelperMethods {
         templateLogic.stemId = parentStem.uuid
         templateLogic.stemTemplateContainer = stemTemplateContainer
 
-        /***** Temporary fix for GRP-4024 *****/
-        GrouperTextContainer.assignThreadLocalVariable("groupStemTemplateContainer", stemTemplateContainer)
-
         List<ServiceAction> selectedServiceActions = []
         if (myServiceActionIds == null || myServiceActionIds.isEmpty()) {
             selectedServiceActions = templateLogic.getServiceActions()
@@ -95,9 +87,6 @@ class HelperMethods {
         policyTemplateLogic.stemId = parentStem.uuid
         policyTemplateLogic.stemTemplateContainer = policyStemTemplateContainer
 
-        /***** Temporary fix for GRP-4024 *****/
-        GrouperTextContainer.assignThreadLocalVariable("groupStemTemplateContainer", policyStemTemplateContainer)
-
         // simulate checking certain boxes in the ui
         List<ServiceAction> selectedServiceActions = []
         if (myServiceActionIds == null || myServiceActionIds.isEmpty()) {