fix(NotificationUtils): Edit special char if using fallback email.

src/main/java/org/opentripplanner/middleware/utils/NotificationUtils.java

@@ -476,7 +476,9 @@ public static String replaceUserNameInFromEmail(String fromEmail, OtpUser otpUse
 
         int firstBracketIndex = fromEmail.indexOf('<');
         int lastBracketIndex = fromEmail.indexOf('>');
-        String displayedName = Strings.isBlank(otpUser.name) ? otpUser.email : otpUser.name;
+        // HACK: If falling back on email, replace the "@" sign so that the user's email does not override the
+        // application email in brackets.
+        String displayedName = Strings.isBlank(otpUser.name) ? otpUser.email.replace("@", " at ") : otpUser.name;
         return String.format("%s %s", displayedName, fromEmail.substring(firstBracketIndex, lastBracketIndex + 1));
     }
 

src/test/java/org/opentripplanner/middleware/utils/NotificationUtilsTest.java

@@ -162,8 +162,8 @@ private static Stream<Arguments> createCanReplaceUserNameInFromEmailCases() {
         String emailAlias = "<[email protected]>";
 
         return Stream.of(
-            Arguments.of(emailAlias, user1, user1.email),
-            Arguments.of(null, user1, user1.email),
+            Arguments.of(emailAlias, user1, "user1 at example.com"),
+            Arguments.of(null, user1, null),
             Arguments.of(emailAlias, user2, user2.name)
         );
     }