LPS-60774 MailService is a special case, although service builder con…

…sider it as remote service, it does not do any permission checking, just redirecting calls to MessageBus. It is actually safe to use it within local services, but let's do it manually to avoid over complexing SB logic.
jbalsas · Nov 26, 2015 · 8ba29c8 · 8ba29c8
1 parent e85d148
commit 8ba29c8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/...e/src/main/java/com/liferay/social/networking/service/impl/WallEntryLocalServiceImpl.java b/...e/src/main/java/com/liferay/social/networking/service/impl/WallEntryLocalServiceImpl.java
@@ -14,6 +14,8 @@
 
 package com.liferay.social.networking.service.impl;
 
+import com.liferay.mail.service.MailService;
+import com.liferay.portal.kernel.bean.BeanReference;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
@@ -234,4 +236,7 @@ protected void sendEmail(WallEntry wallEntry, ThemeDisplay themeDisplay)
 		mailService.sendEmail(mailMessage);
 	}
 
+	@BeanReference(type = MailService.class)
+	protected MailService mailService;
+
 }
diff --git a/portal-impl/src/com/liferay/portal/service/impl/UserLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/UserLocalServiceImpl.java
@@ -14,6 +14,7 @@
 
 package com.liferay.portal.service.impl;
 
+import com.liferay.mail.service.MailService;
 import com.liferay.portal.CompanyMaxUsersException;
 import com.liferay.portal.ContactBirthdayException;
 import com.liferay.portal.ContactNameException;
@@ -34,6 +35,7 @@
 import com.liferay.portal.UserReminderQueryException;
 import com.liferay.portal.UserScreenNameException;
 import com.liferay.portal.UserSmsException;
+import com.liferay.portal.kernel.bean.BeanReference;
 import com.liferay.portal.kernel.cache.PortalCache;
 import com.liferay.portal.kernel.cache.PortalCacheMapSynchronizeUtil;
 import com.liferay.portal.kernel.cache.PortalCacheMapSynchronizeUtil.Synchronizer;
@@ -6605,6 +6607,9 @@ protected void validateScreenName(
 		}
 	}
 
+	@BeanReference(type = MailService.class)
+	protected MailService mailService;
+
 	private static final Log _log = LogFactoryUtil.getLog(
 		UserLocalServiceImpl.class);
 

diff --git a/portal-impl/src/com/liferay/portlet/calendar/service/impl/CalEventLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/calendar/service/impl/CalEventLocalServiceImpl.java
@@ -14,6 +14,8 @@
 
 package com.liferay.portlet.calendar.service.impl;
 
+import com.liferay.mail.service.MailService;
+import com.liferay.portal.kernel.bean.BeanReference;
 import com.liferay.portal.kernel.cal.DayAndPosition;
 import com.liferay.portal.kernel.cal.Recurrence;
 import com.liferay.portal.kernel.cal.TZSRecurrence;
@@ -1771,6 +1773,9 @@ protected void validate(
 		}
 	}
 
+	@BeanReference(type = MailService.class)
+	protected MailService mailService;
+
 	private static final long _CALENDAR_EVENT_CHECK_INTERVAL =
 		PropsValues.CALENDAR_EVENT_CHECK_INTERVAL * Time.MINUTE;