Avoid opening a 2nd connection.

Author: MikeNeilson

cwms-data-api/src/main/java/cwms/cda/data/dao/LocationGroupDao.java

@@ -486,7 +486,7 @@ public void create(LocationGroup group) {
             CWMS_LOC_PACKAGE.call_CREATE_LOC_GROUP2(dslContext.configuration(), categoryId,
                     group.getId(), group.getDescription(), group.getOfficeId(), group.getSharedLocAliasId(),
                     group.getSharedRefLocationId());
-            assignLocs(group, office);
+            assignLocs(dslContext, group, office);
         });
     }
 
@@ -522,19 +522,28 @@ public void unassignAllLocs(LocationGroup group, String office) {
     }
 
     public void assignLocs(LocationGroup group, String office) {
+        connection(dsl, conn -> {
+            DSLContext dslContext = getDslContext(conn, office);
+            assignLocs(dslContext,group, office);
+        });
+    }
+
+    /**
+     * Used when an appropriate context already exists to avoid opening a second connection.
+     * @param dslContext a dslContext that is assumed to be fully prepared for use in this operation
+     * @param group
+     * @param office
+     */
+    public void assignLocs(DSLContext dslContext, LocationGroup group, String office) {
         List<AssignedLocation> assignedLocations = group.getAssignedLocations();
         if (assignedLocations != null) {
             List<LOC_ALIAS_TYPE3> collect = assignedLocations.stream()
                 .map(LocationGroupDao::convertToLocAliasType)
                 .collect(toList());
             LOC_ALIAS_ARRAY3 assignedLocs = new LOC_ALIAS_ARRAY3(collect);
-
-            LocationCategory cat = group.getLocationCategory();
-            connection(dsl, conn -> {
-                DSLContext dslContext = getDslContext(conn, office);
+            LocationCategory cat = group.getLocationCategory(); 
                 CWMS_LOC_PACKAGE.call_ASSIGN_LOC_GROUPS3(dslContext.configuration(),
                         cat.getId(), group.getId(), assignedLocs, office);
-            });
         }
     }
 }