Store notification content as binary to support unicode

components/email-mgt/org.wso2.carbon.email.mgt/pom.xml

@@ -249,8 +249,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>

components/email-mgt/org.wso2.carbon.email.mgt/src/main/java/org/wso2/carbon/email/mgt/constants/I18nMgtConstants.java

@@ -157,9 +157,7 @@ public static class NotificationTableColumns {
         public static final String TENANT_ID = "TENANT_ID";
         public static final String TEMPLATE_KEY = "TEMPLATE_KEY";
         public static final String LOCALE = "LOCALE";
-        public static final String SUBJECT = "SUBJECT";
-        public static final String BODY = "BODY";
-        public static final String FOOTER = "FOOTER";
+        public static final String CONTENT = "CONTENT";
         public static final String CONTENT_TYPE = "CONTENT_TYPE";
         public static final String TYPE_ID = "TYPE_ID";
         public static final String APP_ID = "APP_ID";

components/email-mgt/org.wso2.carbon.email.mgt/src/main/java/org/wso2/carbon/email/mgt/constants/SQLConstants.java

@@ -43,22 +43,22 @@ public class SQLConstants {
     // sql constants for org notification template
     public static final String INSERT_ORG_NOTIFICATION_TEMPLATE_SQL =
             "INSERT INTO IDN_NOTIFICATION_ORG_TEMPLATE " +
-                    "(TEMPLATE_KEY, LOCALE, SUBJECT, BODY, FOOTER, CONTENT_TYPE, TYPE_ID, TENANT_ID) " +
-                    "VALUES (:TEMPLATE_KEY;, :LOCALE;, :SUBJECT;, :BODY;, :FOOTER;, :CONTENT_TYPE;, (" +
+                    "(TEMPLATE_KEY, LOCALE, CONTENT, CONTENT_TYPE, TYPE_ID, TENANT_ID) " +
+                    "VALUES (:TEMPLATE_KEY;, :LOCALE;, :CONTENT;, :CONTENT_TYPE;, (" +
                     GET_NOTIFICATION_TYPE_ID_SQL + "), :TENANT_ID;)";
     public static final String GET_ORG_NOTIFICATION_TEMPLATE_SQL =
-            "SELECT SUBJECT, BODY, FOOTER, CONTENT_TYPE FROM IDN_NOTIFICATION_ORG_TEMPLATE " +
+            "SELECT CONTENT, CONTENT_TYPE FROM IDN_NOTIFICATION_ORG_TEMPLATE " +
                     "WHERE TEMPLATE_KEY = :TEMPLATE_KEY; AND TYPE_ID = (" + GET_NOTIFICATION_TYPE_ID_SQL +
                     ") AND TENANT_ID = :TENANT_ID;";
     public static final String IS_ORG_NOTIFICATION_TEMPLATE_EXISTS_SQL =
             "SELECT ID FROM IDN_NOTIFICATION_ORG_TEMPLATE " +
                     "WHERE TEMPLATE_KEY = :TEMPLATE_KEY; AND TYPE_ID = :TYPE_ID; AND TENANT_ID = :TENANT_ID;";
     public static final String LIST_ORG_NOTIFICATION_TEMPLATES_BY_TYPE_SQL =
-            "SELECT SUBJECT, BODY, FOOTER, CONTENT_TYPE, LOCALE FROM IDN_NOTIFICATION_ORG_TEMPLATE " +
+            "SELECT CONTENT, CONTENT_TYPE, LOCALE FROM IDN_NOTIFICATION_ORG_TEMPLATE " +
                     "WHERE TYPE_ID = (" + GET_NOTIFICATION_TYPE_ID_SQL + ") AND TENANT_ID = :TENANT_ID;";
     public static final String UPDATE_ORG_NOTIFICATION_TEMPLATE_SQL =
             "UPDATE IDN_NOTIFICATION_ORG_TEMPLATE " +
-                    "SET SUBJECT = :SUBJECT;, BODY = :BODY;, FOOTER = :FOOTER;, CONTENT_TYPE = :CONTENT_TYPE; " +
+                    "SET CONTENT = :CONTENT;, CONTENT_TYPE = :CONTENT_TYPE; " +
                     "WHERE TEMPLATE_KEY = :TEMPLATE_KEY; AND TYPE_ID = (" + GET_NOTIFICATION_TYPE_ID_SQL +
                     ") AND TENANT_ID = :TENANT_ID;";
     public static final String DELETE_ORG_NOTIFICATION_TEMPLATE_SQL =
@@ -71,24 +71,24 @@ public class SQLConstants {
     // sql constants for app notification template
     public static final String INSERT_APP_NOTIFICATION_TEMPLATE_SQL =
             "INSERT INTO IDN_NOTIFICATION_APP_TEMPLATE " +
-                    "(TEMPLATE_KEY, LOCALE, SUBJECT, BODY, FOOTER, CONTENT_TYPE, TYPE_ID, APP_ID, TENANT_ID) " +
-                    "VALUES (:TEMPLATE_KEY;, :LOCALE;, :SUBJECT;, :BODY;, :FOOTER;, :CONTENT_TYPE;, (" +
+                    "(TEMPLATE_KEY, LOCALE, CONTENT, CONTENT_TYPE, TYPE_ID, APP_ID, TENANT_ID) " +
+                    "VALUES (:TEMPLATE_KEY;, :LOCALE;, :CONTENT;, :CONTENT_TYPE;, (" +
                     GET_NOTIFICATION_TYPE_ID_SQL + "), :APP_ID;, :TENANT_ID;)";
     public static final String GET_APP_NOTIFICATION_TEMPLATE_SQL =
-            "SELECT SUBJECT, BODY, FOOTER, CONTENT_TYPE FROM IDN_NOTIFICATION_APP_TEMPLATE " +
+            "SELECT CONTENT, CONTENT_TYPE FROM IDN_NOTIFICATION_APP_TEMPLATE " +
                     "WHERE TEMPLATE_KEY = :TEMPLATE_KEY; AND TYPE_ID = (" + GET_NOTIFICATION_TYPE_ID_SQL +
                     ") AND APP_ID = :APP_ID; AND TENANT_ID = :TENANT_ID;";
     public static final String IS_APP_NOTIFICATION_TEMPLATE_EXISTS_SQL =
             "SELECT ID FROM IDN_NOTIFICATION_APP_TEMPLATE " +
                     "WHERE TEMPLATE_KEY = :TEMPLATE_KEY; AND TYPE_ID = :TYPE_ID; AND APP_ID = :APP_ID; " +
                     "AND TENANT_ID = :TENANT_ID;";
     public static final String LIST_APP_NOTIFICATION_TEMPLATES_BY_APP_SQL =
-            "SELECT SUBJECT, BODY, FOOTER, CONTENT_TYPE, LOCALE FROM IDN_NOTIFICATION_APP_TEMPLATE " +
+            "SELECT CONTENT, CONTENT_TYPE, LOCALE FROM IDN_NOTIFICATION_APP_TEMPLATE " +
                     "WHERE TYPE_ID = (" + GET_NOTIFICATION_TYPE_ID_SQL +
                     ") AND APP_ID = :APP_ID; AND TENANT_ID = :TENANT_ID;";
     public static final String UPDATE_APP_NOTIFICATION_TEMPLATE_SQL =
             "UPDATE IDN_NOTIFICATION_APP_TEMPLATE " +
-                    "SET SUBJECT = :SUBJECT;, BODY = :BODY;, FOOTER = :FOOTER;, CONTENT_TYPE = :CONTENT_TYPE; " +
+                    "SET CONTENT = :CONTENT;, CONTENT_TYPE = :CONTENT_TYPE; " +
                     "WHERE TEMPLATE_KEY = :TEMPLATE_KEY; AND TYPE_ID = (" + GET_NOTIFICATION_TYPE_ID_SQL +
                     ") AND APP_ID = :APP_ID; AND TENANT_ID = :TENANT_ID;";
     public static final String DELETE_APP_NOTIFICATION_TEMPLATE_SQL =

components/email-mgt/org.wso2.carbon.email.mgt/src/main/java/org/wso2/carbon/email/mgt/store/dao/AppNotificationTemplateDAO.java

@@ -24,17 +24,17 @@
 import org.wso2.carbon.identity.governance.exceptions.notiification.NotificationTemplateManagerServerException;
 import org.wso2.carbon.identity.governance.model.NotificationTemplate;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.APP_ID;
-import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.BODY;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.CHANNEL;
+import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.CONTENT;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.CONTENT_TYPE;
-import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.FOOTER;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.ID;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.LOCALE;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.TEMPLATE_KEY;
-import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.SUBJECT;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.TENANT_ID;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.TYPE_ID;
 import static org.wso2.carbon.email.mgt.constants.I18nMgtConstants.NotificationTableColumns.TYPE_KEY;
@@ -47,6 +47,8 @@
 import static org.wso2.carbon.email.mgt.constants.SQLConstants.IS_APP_NOTIFICATION_TEMPLATE_EXISTS_SQL;
 import static org.wso2.carbon.email.mgt.constants.SQLConstants.LIST_APP_NOTIFICATION_TEMPLATES_BY_APP_SQL;
 import static org.wso2.carbon.email.mgt.constants.SQLConstants.UPDATE_APP_NOTIFICATION_TEMPLATE_SQL;
+import static org.wso2.carbon.email.mgt.util.I18nEmailUtil.getContentStream;
+import static org.wso2.carbon.email.mgt.util.I18nEmailUtil.setContent;
 
 /**
  * This class is to perform CRUD operations for Application NotificationTemplates.
@@ -61,13 +63,12 @@ public void addNotificationTemplate(NotificationTemplate notificationTemplate, S
         String channelName = notificationTemplate.getNotificationChannel();
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
-        try {
+        try (InputStream contentStream = getContentStream(notificationTemplate))  {
+            int contentLength = contentStream.available();
             namedJdbcTemplate.executeInsert(INSERT_APP_NOTIFICATION_TEMPLATE_SQL, (preparedStatement -> {
                 preparedStatement.setString(TEMPLATE_KEY, locale.toLowerCase());
                 preparedStatement.setString(LOCALE, locale);
-                preparedStatement.setString(SUBJECT, notificationTemplate.getSubject());
-                preparedStatement.setString(BODY, notificationTemplate.getBody());
-                preparedStatement.setString(FOOTER, notificationTemplate.getFooter());
+                preparedStatement.setBinaryStream(CONTENT, contentStream, contentLength);
                 preparedStatement.setString(CONTENT_TYPE, notificationTemplate.getContentType());
                 preparedStatement.setString(TYPE_KEY, displayName.toLowerCase());
                 preparedStatement.setString(CHANNEL, channelName);
@@ -80,6 +81,8 @@ public void addNotificationTemplate(NotificationTemplate notificationTemplate, S
                     String.format("Error while adding %s template %s of type %s to application %s in %s tenant.",
                             channelName, locale, displayName, applicationUuid, tenantId);
             throw new NotificationTemplateManagerServerException(error, e);
+        } catch (IOException e) {
+            throw new NotificationTemplateManagerServerException("Error while closing content stream.", e);
         }
     }
 
@@ -94,9 +97,7 @@ public NotificationTemplate getNotificationTemplate(String locale, String templa
             notificationTemplate = namedJdbcTemplate.fetchSingleRecord(GET_APP_NOTIFICATION_TEMPLATE_SQL,
                     (resultSet, rowNumber) -> {
                         NotificationTemplate notificationTemplateResult = new NotificationTemplate();
-                        notificationTemplateResult.setSubject(resultSet.getString(SUBJECT));
-                        notificationTemplateResult.setBody(resultSet.getString(BODY));
-                        notificationTemplateResult.setFooter(resultSet.getString(FOOTER));
+                        setContent(resultSet.getBinaryStream(CONTENT), notificationTemplateResult);
                         notificationTemplateResult.setContentType(resultSet.getString(CONTENT_TYPE));
                         notificationTemplateResult.setLocale(locale);
                         notificationTemplateResult.setType(templateType);
@@ -170,9 +171,7 @@ public List<NotificationTemplate> listNotificationTemplates(String templateType,
             notificationTemplates = namedJdbcTemplate.executeQuery(LIST_APP_NOTIFICATION_TEMPLATES_BY_APP_SQL,
                     (resultSet, rowNumber) -> {
                         NotificationTemplate notificationTemplateResult = new NotificationTemplate();
-                        notificationTemplateResult.setSubject(resultSet.getString(SUBJECT));
-                        notificationTemplateResult.setBody(resultSet.getString(BODY));
-                        notificationTemplateResult.setFooter(resultSet.getString(FOOTER));
+                        setContent(resultSet.getBinaryStream(CONTENT), notificationTemplateResult);
                         notificationTemplateResult.setContentType(resultSet.getString(CONTENT_TYPE));
                         notificationTemplateResult.setLocale(resultSet.getString(LOCALE));
                         notificationTemplateResult.setType(templateType.toLowerCase());
@@ -204,12 +203,11 @@ public void updateNotificationTemplate(NotificationTemplate notificationTemplate
         String channelName = notificationTemplate.getNotificationChannel();
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
-        try {
+        try (InputStream contentStream = getContentStream(notificationTemplate))  {
+            int contentLength = contentStream.available();
             namedJdbcTemplate.executeUpdate(UPDATE_APP_NOTIFICATION_TEMPLATE_SQL,
                     preparedStatement -> {
-                        preparedStatement.setString(SUBJECT, notificationTemplate.getSubject());
-                        preparedStatement.setString(BODY, notificationTemplate.getBody());
-                        preparedStatement.setString(FOOTER, notificationTemplate.getFooter());
+                        preparedStatement.setBinaryStream(CONTENT, contentStream, contentLength);
                         preparedStatement.setString(CONTENT_TYPE, notificationTemplate.getContentType());
                         preparedStatement.setString(TEMPLATE_KEY, locale.toLowerCase());
                         preparedStatement.setString(TYPE_KEY, displayName.toLowerCase());
@@ -223,6 +221,8 @@ public void updateNotificationTemplate(NotificationTemplate notificationTemplate
                     String.format("Error while updating %s template %s of type %s from application %s in %s tenant.",
                             channelName, locale, displayName, applicationUuid, tenantId);
             throw new NotificationTemplateManagerServerException(error, e);
+        } catch (IOException e) {
+            throw new NotificationTemplateManagerServerException("Error while closing content stream.", e);
         }
 
     }