Merge branch 'develop' into grails7

# Conflicts:
#	CHANGELOG.md

Author: lbwexler

CHANGELOG.md

@@ -10,21 +10,29 @@ Spring Boot 3.5, Spring 6.2, Groovy 4.0, Gradle 8.14, Tomcat 10.1, and Java 21.
 release grails is officially part of the Apache Foundation.  The main required changes to
 applications are the following:
 
-  * Change to logging config to accommodate the latest version of Logback, and its removal of the groovy DSL.
-    In order to allow hoist apps to continue to seamlessly provide configuration via groovy, we have replicated
-    the functionality of the logback DSL in methods on LogConfig.groovy.  Any custom logback.groovy scripts
-    should be moved to an override of `LogbackConfig` class. See `LogbackConfig.` for more details.
-    Misc. updates and simplification to `build.gradle` and `gradle.properties` to adapt to Gradle 8.
-    See toolbox for an example of these changes.
-  * Changes of various core imports from `javax` to `jakarta`.
-  * Java 17 and Java 21 are both now supported JDKs.
+* Change to logging config to accommodate the latest version of Logback, and its removal of the groovy DSL.
+  In order to allow hoist apps to continue to seamlessly provide configuration via groovy, we have replicated
+  the functionality of the logback DSL in methods on LogConfig.groovy.  Any custom logback.groovy scripts
+  should be moved to an override of `LogbackConfig` class. See `LogbackConfig.` for more details.
+  Misc. updates and simplification to `build.gradle` and `gradle.properties` to adapt to Gradle 8.
+  See toolbox for an example of these changes.
+* Changes of various core imports from `javax` to `jakarta`.
+* Java 17 and Java 21 are both now supported JDKs.
 
 See the grails documentation at  https://docs.grails.org/7.0.0/guide/upgrading.html#upgrading60x
 for more information.
 
+
+## 33.1.0 - 2025-10-24
+
+### 🎁 New Features
+
+* `EmailService.sendEmail` now supports `bcc` and `markImportant` properties.
+*  New `CollectionUtils` with java utilities for efficient collection creation.
+
 ### 🐞 Bug Fixes
-* Restore display of Timers in Service AdminStats.
 
+* Restore display of Timers in Service AdminStats.
 
 ## 33.0.0 - 2025-09-26
 

grails-app/services/io/xh/hoist/email/EmailService.groovy

@@ -32,8 +32,10 @@ class EmailService extends BaseService {
      * @param args
      *      to {String or List}     - required, email address(es) of recipient(s)
      *      from {String}           - optional, sender address, defaults to config
-     *      cc {String or List}     - optional, cc recipients;
+     *      cc {String or List}     - optional, cc recipients
+     *      bcc {String or List}    - optional, bcc recipients
      *      subject {String}        - optional
+     *      markImportant {boolean} - optional, to mark email as important via standard headers, default false
      *      async {Boolean}         - option to send email asynchronously, defaults to false
      *      doLog {Boolean}         - option to log email information on send, defaults to true
      *      logIdentifier {String}  - optional, string to append to log message, defaults to subject
@@ -60,10 +62,12 @@ class EmailService extends BaseService {
             def override = parseMailConfig('xhEmailOverride'),
                 filter = parseMailConfig('xhEmailFilter'),
                 toSpec = filterAddresses(formatAddresses(args.to), filter),
-                ccSpec = filterAddresses(formatAddresses(args.cc), filter)
+                ccSpec = filterAddresses(formatAddresses(args.cc), filter),
+                bccSpec = filterAddresses(formatAddresses(args.bcc), filter)
 
             List<String> toUse = override ? override : toSpec
             List<String> ccUse = override ? [] : ccSpec
+            List<String> bccUse = override ? [] : bccSpec
             String fromUse = args.from ? formatAddresses(args.from)[0] : parseMailConfig('xhEmailDefaultSender')[0]
             String subjectUse = args.subject ?: ''
             List<Map> attachments = parseAttachments(args.attachments)
@@ -92,7 +96,7 @@ class EmailService extends BaseService {
                 devContext << Utils.appEnvironment.displayName.toUpperCase();
             }
             if (override) {
-                devContext << (toSpec.size() > 1 ? "for ${toSpec.size()} receipients" : "for ${toSpec.first()}")
+                devContext << (toSpec.size() > 1 ? "for ${toSpec.size()} recipients" : "for ${toSpec.first()}")
             }
             if (devContext) {
                 subjectUse += " [${devContext.join(', ')}]"
@@ -107,6 +111,17 @@ class EmailService extends BaseService {
                 if (ccUse) {
                     cc ccUse.toArray()
                 }
+                if (bccUse) {
+                    bcc bccUse.toArray()
+                }
+                if (args.markImportant) {
+                    headers (
+                        'Importance': 'High',
+                        'X-MSMail-Priority': 'High',
+                        'X-Priority': 1
+                    )
+                }
+
                 subject subjectUse.take(255)
 
                 if (args.containsKey('html')) {

src/main/groovy/io/xh/hoist/util/CollectionUtils.java

@@ -0,0 +1,54 @@
+package io.xh.hoist.util;
+
+import java.util.*;
+import java.util.function.Function;
+
+/**
+ * Hoist tools for creating/manipulating collections in Java using groovy
+ * like syntax.Useful for applications with large datasets and high performance
+ * requirements.
+ */
+public class CollectionUtils {
+
+    /**
+     * Create an HashMap for a pre-determined number of items.
+     * Will size appropriately to avoid any rehashing/re-allocation.
+     */
+    public static <K, V> HashMap<K, V> sizedHashMap(int size) {
+        return new HashMap<K, V>((int) ((size / 0.75d) + 1d));
+    }
+
+    /**
+     * Create a declarative hashmap from an alternating collection of key, value pairs
+     */
+    public static <K, V> HashMap<K, V> quickMap(Object... args) {
+        HashMap<K, V> ret = sizedHashMap(args.length);
+        for (int i = 0; i < args.length; i += 2) {
+            ret.put((K) args[i], (V) args[i + 1]);
+        }
+        return ret;
+    }
+
+    /**
+     * Java version of Groovy collectEntries
+     */
+    public static <S, K, V> Map<K, V> collectEntries(Collection<S> col, Function<S, Map.Entry<K, V>> mapper) {
+        HashMap<K, V> ret = sizedHashMap(col.size());
+        for (S val : col) {
+            Map.Entry<K, V> e = mapper.apply(val);
+            ret.put(e.getKey(), e.getValue());
+        }
+        return ret;
+    }
+
+    /**
+     * Java version of Groovy collect
+     */
+    public static <S, T> List<T> collect(Collection<S> col, Function<S, T> mapper) {
+        List<T> ret = new ArrayList<>(col.size());
+        for (S val : col) {
+            ret.add(mapper.apply(val));
+        }
+        return ret;
+    }
+}