D-Net
/
dnet-applications
23
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a NPE

This commit is contained in:
Michele Artini 2024-04-04 11:31:30 +02:00
parent 90effab182
commit d750fc7180
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/MailDispatcher.java
View File

@ -42,12 +42,12 @@ public class MailDispatcher {
}
public void configure(final SystemConfiguration conf) {
this.enabled = conf.getSmtpEnabled();
this.fromMail = conf.getSmtpFromMail();
this.fromName = conf.getSmtpFromName();
this.toMailAdmin = conf.getSmtpToMailAdmin();
this.newUserMessage = conf.getSmtpNewUserMessage();
this.updateUserMessage = conf.getSmtpUpdateUserMessage();
enabled = conf.getSmtpEnabled();
fromMail = conf.getSmtpFromMail();
fromName = conf.getSmtpFromName();
toMailAdmin = conf.getSmtpToMailAdmin();
newUserMessage = conf.getSmtpNewUserMessage();
updateUserMessage = conf.getSmtpUpdateUserMessage();
if (StringUtils.isNotBlank(conf.getSmtpHost())) {
emailFactory.setSmtpHost(conf.getSmtpHost());
@ -70,7 +70,7 @@ public class MailDispatcher {
public void sendRequestRegistrationMail(final UserView user) {
if (StringUtils.isNotBlank(newUserMessage)) {
final String message = prepareMessage(this.newUserMessage, user);
final String message = prepareMessage(newUserMessage, user);
for (final String to : StringUtils.split(toMailAdmin, ",")) {
sendMail("OpenOrgs: new registration request", message, to.trim());
@ -82,7 +82,7 @@ public class MailDispatcher {
public void sendUpdatedUserMail(final UserView user) {
if (StringUtils.isNotBlank(updateUserMessage)) {
final String message = prepareMessage(this.updateUserMessage, user);
final String message = prepareMessage(updateUserMessage, user);
sendMail("OpenOrgs: user updated", message, user.getEmail());
} else {
log.warn("Template is empty (updateUserMessage)");
@ -92,13 +92,13 @@ public class MailDispatcher {
private String prepareMessage(final String template, final UserView user) {
final String countries = user.getRole().equals(UserRole.ADMIN.toString()) ? "All" : StringUtils.join(user.getCountries(), ", ");
return template.replaceAll(":email:", user.getEmail())
.replaceAll(":fullname:", user.getFullname())
.replaceAll(":organization:", user.getOrganization())
.replaceAll(":refperson:", user.getReferencePerson())
.replaceAll(":reqmessage:", user.getRequestMessage())
.replaceAll(":role:", user.getRole())
.replaceAll(":countries:", countries);
return template.replaceAll(":email:", "" + user.getEmail())
.replaceAll(":fullname:", "" + user.getFullname())
.replaceAll(":organization:", "" + user.getOrganization())
.replaceAll(":refperson:", "" + user.getReferencePerson())
.replaceAll(":reqmessage:", "" + user.getRequestMessage())
.replaceAll(":role:", "" + user.getRole())
.replaceAll(":countries:", countries);
}