cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Better handle of File reading / Input Streams

Browse Source
This commit is contained in:
Max Dor
2019-01-11 23:02:57 +01:00
parent 83377ebee0
commit c6b8f7d48e
8 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/io/kamax/mxisd/threepid/notification/email/EmailSendGridNotificationHandler.java
View File

@@ -31,14 +31,12 @@ import io.kamax.mxisd.invitation.IThreePidInviteReply;
import io.kamax.mxisd.notification.NotificationHandler;
import io.kamax.mxisd.threepid.generator.PlaceholderNotificationGenerator;
import io.kamax.mxisd.threepid.session.IThreePidSession;
import org.apache.commons.io.IOUtils;
import io.kamax.mxisd.util.FileUtil;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import static com.sendgrid.SendGrid.Email;
import static com.sendgrid.SendGrid.Response;
@@ -78,7 +76,7 @@ public class EmailSendGridNotificationHandler extends PlaceholderNotificationGen
private String getFromFile(String path) {
try {
return IOUtils.toString(new FileInputStream(path), StandardCharsets.UTF_8);
return FileUtil.load(path);
} catch (IOException e) {
throw new RuntimeException("Couldn't create notification content using file " + path, e);
}