From 021f0f7b4dd80e5440d21d8ea36fb370818e9b70 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Mon, 4 Nov 2013 15:01:29 +1000 Subject: [PATCH] Switch from Seam Logging to Slf4j --- .../org/zanata/ApplicationConfiguration.java | 12 ++-- .../org/zanata/H2DocumentHistoryTrigger.java | 11 ++-- .../zanata/action/AccountSearchAction.java | 5 -- .../org/zanata/action/ActivateAction.java | 5 -- .../org/zanata/action/AdminStatsAction.java | 5 -- .../zanata/action/AuthenticationEvents.java | 16 ++--- .../java/org/zanata/action/Breadcrumbs.java | 5 -- .../zanata/action/ConfigurationAction.java | 7 +-- .../org/zanata/action/DashboardAction.java | 5 -- .../org/zanata/action/GlossaryAction.java | 11 +--- .../action/IterationTranslationAction.java | 4 -- .../org/zanata/action/LanguageTeamAction.java | 13 ++-- .../org/zanata/action/LocaleListAction.java | 7 +-- .../org/zanata/action/PagedListDataModel.java | 7 +-- .../zanata/action/PasswordChangeAction.java | 9 --- .../zanata/action/PasswordResetAction.java | 5 -- .../action/PasswordResetRequestAction.java | 10 ++-- .../java/org/zanata/action/PersonHome.java | 10 ++-- .../java/org/zanata/action/ProfileAction.java | 9 +-- .../java/org/zanata/action/ProjectAction.java | 5 -- .../java/org/zanata/action/ProjectHome.java | 5 -- .../action/ProjectIterationFilesAction.java | 9 +-- .../action/ProjectIterationLocaleAction.java | 7 +-- .../action/ProjectMaintainerManageAction.java | 11 ++-- .../org/zanata/action/RegisterAction.java | 8 +-- .../org/zanata/action/ReindexAsyncBean.java | 16 +++-- .../org/zanata/action/SendEmailAction.java | 12 ++-- .../action/ServerConfigurationBean.java | 9 --- .../zanata/action/ValidateEmailAction.java | 10 ++-- .../org/zanata/action/VersionGroupAction.java | 5 -- .../org/zanata/action/VersionGroupHome.java | 8 +-- .../zanata/action/VersionGroupJoinAction.java | 11 ++-- .../VersionGroupMaintainerManageAction.java | 12 ++-- .../zanata/action/ViewAllStatusAction.java | 11 +--- .../main/java/org/zanata/dao/AccountDAO.java | 2 +- .../zanata/job/DownloadFileCleanupJob.java | 10 ++-- .../org/zanata/job/ZanataSchedulableJob.java | 14 ++--- .../ConstraintViolationExceptionMapper.java | 8 +-- .../zanata/rest/HibernateExceptionMapper.java | 7 +-- .../rest/ZanataRestSecurityInterceptor.java | 8 +-- .../zanata/rest/ZanataResteasyBootstrap.java | 8 +-- .../zanata/rest/service/AccountService.java | 13 ++-- .../org/zanata/rest/service/ETagUtils.java | 4 -- .../zanata/rest/service/GlossaryService.java | 7 +-- .../zanata/rest/service/ProjectService.java | 4 -- .../zanata/rest/service/ProjectsService.java | 5 -- .../zanata/rest/service/ResourceUtils.java | 23 ++++---- .../service/SourceDocResourceService.java | 56 +++++++++--------- .../service/TranslatedDocResourceService.java | 7 +-- .../service/impl/ActivityServiceImpl.java | 5 -- .../service/impl/CopyTransServiceImpl.java | 21 +++---- .../zanata/service/impl/EmailServiceImpl.java | 19 +++--- .../service/impl/LocaleServiceImpl.java | 8 +-- .../impl/TranslationFileServiceImpl.java | 46 +++++++++------ .../service/impl/UserAccountServiceImpl.java | 10 ++-- .../service/impl/ValidationServiceImpl.java | 59 ++++++++++++------- .../zanata/service/impl/VersionManager.java | 7 +-- .../org/zanata/util/EssentialDataCreator.java | 8 +-- .../main/java/org/zanata/util/UrlUtil.java | 16 ++--- .../server/TranslationWorkspaceImpl.java | 19 +++--- .../org/zanata/ZanataGroovyJpaTest.groovy | 7 +-- .../test/java/org/zanata/ZanataJpaTest.java | 8 +-- .../java/org/zanata/dao/LocaleDAOTest.java | 6 +- .../java/org/zanata/provider/JPAProvider.java | 7 +-- .../java/org/zanata/seam/SeamAutowire.java | 28 ++++----- 65 files changed, 297 insertions(+), 448 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java index 676d7674cf..fc50d43775 100644 --- a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java +++ b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java @@ -30,8 +30,9 @@ import javax.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; + import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.In; @@ -40,8 +41,6 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Synchronized; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.jboss.seam.web.ServletContexts; import org.zanata.config.DatabaseBackedConfig; import org.zanata.config.JndiBackedConfig; @@ -60,10 +59,8 @@ @Scope(ScopeType.APPLICATION) @Startup @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) +@Slf4j public class ApplicationConfiguration implements Serializable { - - private static final Log log = Logging - .getLog(ApplicationConfiguration.class); private static final long serialVersionUID = -4970657841198107092L; private static final String EMAIL_APPENDER_NAME = @@ -153,7 +150,8 @@ private void validateConfiguration() { * Apply logging configuration. */ public void applyLoggingConfiguration() { - final Logger rootLogger = Logger.getRootLogger(); + // TODO is this still working with jboss logging? + final org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger(); if (isEmailLogAppenderEnabled()) { // NB: This appender uses Seam's email configuration (no need for diff --git a/zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java b/zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java index 0d8a7e2744..73d80fbbd5 100644 --- a/zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java +++ b/zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java @@ -5,15 +5,12 @@ import java.sql.ResultSet; import java.sql.SQLException; +import lombok.extern.slf4j.Slf4j; + import org.h2.tools.TriggerAdapter; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; +@Slf4j public class H2DocumentHistoryTrigger extends TriggerAdapter { - - private static final Log log = Logging - .getLog(H2DocumentHistoryTrigger.class); - @Override public void fire(Connection conn, ResultSet oldRow, ResultSet newRow) throws SQLException { @@ -25,7 +22,7 @@ public void fire(Connection conn, ResultSet oldRow, ResultSet newRow) if (oldRev != newRev) { log.debug( - "revision incremented from {0} to {1}. Executing trigger..", + "revision incremented from {} to {}. Executing trigger..", oldRev, newRev); PreparedStatement prep = diff --git a/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java b/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java index fd162051c1..3b49ed01cb 100644 --- a/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java +++ b/zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java @@ -27,10 +27,8 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.zanata.dao.AccountDAO; import org.zanata.dao.PersonDAO; import org.zanata.model.HAccount; @@ -50,9 +48,6 @@ public class AccountSearchAction implements Serializable { @In private PersonDAO personDAO; - @Logger - Log log; - public void setMaintainer(String sr) { this.maintainer = sr; } diff --git a/zanata-war/src/main/java/org/zanata/action/ActivateAction.java b/zanata-war/src/main/java/org/zanata/action/ActivateAction.java index a05626c562..0940925577 100644 --- a/zanata-war/src/main/java/org/zanata/action/ActivateAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ActivateAction.java @@ -28,11 +28,9 @@ import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityManager; import org.zanata.dao.AccountActivationKeyDAO; @@ -46,9 +44,6 @@ public class ActivateAction implements Serializable { private static final long serialVersionUID = -8079131168179421345L; - @Logger - Log log; - @In private AccountActivationKeyDAO accountActivationKeyDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java b/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java index 7386e48608..176032ecc5 100644 --- a/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java +++ b/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java @@ -24,10 +24,8 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.zanata.dao.DocumentDAO; import org.zanata.dao.PersonDAO; import org.zanata.dao.ProjectDAO; @@ -48,9 +46,6 @@ public class AdminStatsAction implements Serializable { */ private static final long serialVersionUID = 1L; - @Logger - Log log; - @In ProjectDAO projectDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java b/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java index f26d06d290..0c54a9feed 100644 --- a/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java +++ b/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java @@ -22,12 +22,12 @@ import java.io.Serializable; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.jboss.seam.security.Identity; import org.jboss.seam.security.management.JpaIdentityStore; import org.jboss.seam.security.permission.RuleBasedPermissionResolver; @@ -36,19 +36,13 @@ @Name("authenticationEvents") @Scope(ScopeType.STATELESS) +@Slf4j public class AuthenticationEvents implements Serializable { - - /** - * - */ private static final long serialVersionUID = 1L; - @Logger - Log log; - @Observer(JpaIdentityStore.EVENT_USER_AUTHENTICATED) public void loginSuccessful(HAccount account) { - log.info("Account {0} authenticated", account.getUsername()); + log.info("Account {} authenticated", account.getUsername()); injectAuthenticatedPersonIntoWorkingMemory(account); } @@ -61,7 +55,7 @@ public void injectAuthenticatedPersonIntoWorkingMemory(HAccount account) { @Observer(JpaIdentityStore.EVENT_USER_CREATED) public void createSuccessful(HAccount account) { - log.info("Account {0} created", account.getUsername()); + log.info("Account {} created", account.getUsername()); } @Observer(Identity.EVENT_LOGIN_SUCCESSFUL) diff --git a/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java b/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java index 5ad578cc1c..6c01cc3aeb 100644 --- a/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java +++ b/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java @@ -8,10 +8,8 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; @Name("breadcrumbs") @AutoCreate @@ -19,9 +17,6 @@ public class Breadcrumbs implements Serializable { private static final long serialVersionUID = 1L; - @Logger - Log log; - private List locations; public List getLocations() { diff --git a/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java b/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java index f4317285d4..2de84ce5b7 100644 --- a/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java @@ -26,18 +26,19 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.log.Log; import org.zanata.model.HLocale; import org.zanata.service.ConfigurationService; @Name("configurationAction") @Scope(ScopeType.EVENT) +@Slf4j public class ConfigurationAction implements Serializable { private static final long serialVersionUID = 1L; @RequestParameter @@ -45,8 +46,6 @@ public class ConfigurationAction implements Serializable { @RequestParameter private String projectSlug; - @Logger - private Log log; @In private ConfigurationService configurationServiceImpl; diff --git a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java index b0b7ca9e7f..3d4c62b845 100644 --- a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java +++ b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java @@ -29,11 +29,9 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.annotation.CachedMethodResult; import org.zanata.common.EntityStatus; @@ -53,9 +51,6 @@ public class DashboardAction implements Serializable { private static final long serialVersionUID = 1L; - @Logger - private Log log; - @In private GravatarService gravatarServiceImpl; diff --git a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java index a06b659646..1578a5b011 100644 --- a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java +++ b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java @@ -11,15 +11,15 @@ import javax.faces.context.FacesContext; import javax.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessage.Severity; -import org.jboss.seam.log.Log; import org.zanata.annotation.CachedMethods; import org.zanata.common.LocaleId; import org.zanata.dao.GlossaryDAO; @@ -32,15 +32,10 @@ @Name("glossaryAction") @Scope(ScopeType.PAGE) @CachedMethods +@Slf4j public class GlossaryAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 1L; - @Logger - Log log; - @In private GlossaryDAO glossaryDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java b/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java index 05cc0bf9b2..0c6ee89ecf 100644 --- a/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java +++ b/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java @@ -26,10 +26,8 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.jboss.seam.security.Identity; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.annotation.CachedMethodResult; @@ -49,8 +47,6 @@ public class IterationTranslationAction implements Serializable { @In LocaleService localeServiceImpl; - @Logger - Log log; @In Identity identity; diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java index 9854b54c93..840eb34efb 100644 --- a/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java @@ -26,10 +26,10 @@ import lombok.Getter; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; @@ -37,7 +37,6 @@ import org.jboss.seam.core.Events; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessage.Severity; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; @@ -52,6 +51,7 @@ @Name("languageTeamAction") @Scope(ScopeType.PAGE) +@Slf4j public class LanguageTeamAction implements Serializable { private static final long serialVersionUID = 1L; @@ -73,9 +73,6 @@ public class LanguageTeamAction implements Serializable { @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) private HAccount authenticatedAccount; - @Logger - private Log log; - @Getter @Setter private String language; @@ -144,11 +141,11 @@ public void joinTribe() { this.language, authenticatedAccount.getPerson().getId(), true, true, true); Events.instance().raiseEvent("personJoinedTribe"); - log.info("{0} joined tribe {1}", + log.info("{} joined tribe {}", authenticatedAccount.getUsername(), this.language); // FIXME use localizable string FacesMessages.instance().add( - "You are now a member of the {0} language team", + "You are now a member of the {} language team", getLocale().retrieveNativeName()); } catch (Exception e) { FacesMessages.instance().add(Severity.ERROR, e.getMessage()); @@ -165,7 +162,7 @@ public void leaveTribe() { languageTeamServiceImpl.leaveLanguageTeam(this.language, authenticatedAccount.getPerson().getId()); Events.instance().raiseEvent("personLeftTribe"); - log.info("{0} left tribe {1}", authenticatedAccount.getUsername(), + log.info("{} left tribe {}", authenticatedAccount.getUsername(), this.language); FacesMessages.instance().add("You have left the {0} language team", getLocale().retrieveNativeName()); diff --git a/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java b/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java index 49af1453c0..d5ad05818d 100644 --- a/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java @@ -26,21 +26,22 @@ import java.util.Map; import java.util.TreeMap; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.zanata.dao.ProjectDAO; import org.zanata.model.HProject; import org.zanata.service.LocaleService; @Name("localeListAction") @Scope(ScopeType.PAGE) +@Slf4j public class LocaleListAction implements Serializable { private static final long serialVersionUID = 1L; private List customizedLocales = new ArrayList(); @@ -52,8 +53,6 @@ public class LocaleListAction implements Serializable { @Out(required = false) private Boolean overrideLocales; private boolean setting; - @Logger - Log log; @In ProjectDAO projectDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java b/zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java index d96cd04b67..bd6234b4ce 100644 --- a/zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java +++ b/zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java @@ -24,10 +24,11 @@ import javax.faces.model.DataModel; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; +import lombok.extern.slf4j.Slf4j; + import org.zanata.exception.ZanataServiceException; +@Slf4j public abstract class PagedListDataModel extends DataModel implements Serializable { private static final long serialVersionUID = 1L; @@ -35,8 +36,6 @@ public abstract class PagedListDataModel extends DataModel implements private int pageSize = DEFAULT_PAGESIZE; private int rowIndex; private DataPage page; - protected static final LogProvider log = Logging - .getLogProvider(PagedListDataModel.class); public PagedListDataModel() { super(); diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java index fb7a95ee50..df28e67790 100644 --- a/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java +++ b/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java @@ -29,11 +29,9 @@ import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityManager; import org.jboss.seam.security.management.JpaIdentityStore; @@ -42,18 +40,11 @@ @Name("passwordChange") @Scope(ScopeType.PAGE) public class PasswordChangeAction implements Serializable { - - /** - * - */ private static final long serialVersionUID = 1L; @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) HAccount authenticatedAccount; - @Logger - Log log; - @In private IdentityManager identityManager; diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java index 32ff9e8405..cb51ef6a31 100644 --- a/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java +++ b/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java @@ -10,11 +10,9 @@ import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.AuthorizationException; import org.jboss.seam.security.NotLoggedInException; import org.jboss.seam.security.RunAsOperation; @@ -28,9 +26,6 @@ public class PasswordResetAction implements Serializable { private static final long serialVersionUID = -3966625589007754411L; - @Logger - Log log; - @In private EntityManager entityManager; diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java index fe347cfe91..f9e89cb794 100644 --- a/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java +++ b/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java @@ -5,17 +5,17 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.faces.Renderer; -import org.jboss.seam.log.Log; import org.zanata.dao.AccountDAO; import org.zanata.model.HAccount; import org.zanata.model.HAccountResetPasswordKey; @@ -23,12 +23,10 @@ @Name("passwordResetRequest") @Scope(ScopeType.EVENT) +@Slf4j public class PasswordResetRequestAction implements Serializable { private static final long serialVersionUID = 1L; - @Logger - Log log; - @In private AccountDAO accountDAO; @@ -81,7 +79,7 @@ public String requestReset() { } else { setActivationKey(key.getKeyHash()); renderer.render("/WEB-INF/facelets/email/password_reset.xhtml"); - log.info("Sent password reset key to {0} ({1})", account + log.info("Sent password reset key to {} ({})", account .getPerson().getName(), account.getUsername()); FacesMessages .instance() diff --git a/zanata-war/src/main/java/org/zanata/action/PersonHome.java b/zanata-war/src/main/java/org/zanata/action/PersonHome.java index d919363a77..c881c1ce70 100644 --- a/zanata-war/src/main/java/org/zanata/action/PersonHome.java +++ b/zanata-war/src/main/java/org/zanata/action/PersonHome.java @@ -23,13 +23,13 @@ import javax.faces.context.ExternalContext; import javax.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.framework.EntityHome; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.AccountDAO; import org.zanata.model.HAccount; @@ -37,6 +37,7 @@ @Name("personHome") @Scope(ScopeType.CONVERSATION) +@Slf4j public class PersonHome extends EntityHome { /** @@ -55,9 +56,6 @@ public class PersonHome extends EntityHome { @In AccountDAO accountDAO; - @Logger - Log log; - @Override public Object getId() { Object id = super.getId(); @@ -71,7 +69,7 @@ public Object getId() { public void regenerateApiKey() { accountDAO.createApiKey(getInstance().getAccount()); getEntityManager().merge(getInstance().getAccount()); - log.info("Reset API key for {0}", getInstance().getAccount() + log.info("Reset API key for {}", getInstance().getAccount() .getUsername()); } diff --git a/zanata-war/src/main/java/org/zanata/action/ProfileAction.java b/zanata-war/src/main/java/org/zanata/action/ProfileAction.java index 788f4ae25e..105b95d314 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProfileAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProfileAction.java @@ -22,22 +22,21 @@ import java.io.Serializable; -import javax.faces.event.ValueChangeEvent; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.faces.Renderer; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.ApplicationConfiguration; import org.zanata.dao.AccountDAO; @@ -53,6 +52,7 @@ @Name("profileAction") @Scope(ScopeType.PAGE) +@Slf4j public class ProfileAction implements Serializable { /** * @@ -68,9 +68,6 @@ public class ProfileAction implements Serializable { @In ApplicationConfiguration applicationConfiguration; - @Logger - Log log; - @In ZanataIdentity identity; diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectAction.java index fb25580fe6..40a1424136 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectAction.java @@ -26,10 +26,8 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.jboss.seam.security.Identity; import org.zanata.dao.ProjectDAO; import org.zanata.model.HProject; @@ -51,9 +49,6 @@ public class ProjectAction implements Serializable { private int scrollerPage = 1; - @Logger - Log log; - @In private ProjectDAO projectDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java index 23243be316..31b6067c7b 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java @@ -40,12 +40,10 @@ import org.hibernate.criterion.NaturalIdentifier; import org.hibernate.criterion.Restrictions; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Events; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; import org.zanata.dao.LocaleDAO; @@ -76,9 +74,6 @@ public class ProjectHome extends SlugHome { @In ZanataIdentity identity; - @Logger - Log log; - @In private PersonDAO personDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java index 6c51b1b6ed..04a22d87c2 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java @@ -41,16 +41,15 @@ import lombok.Getter; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessage.Severity; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.jboss.seam.util.Hex; import org.zanata.annotation.CachedMethods; @@ -98,6 +97,7 @@ @Name("projectIterationFilesAction") @Scope(ScopeType.PAGE) @CachedMethods +@Slf4j public class ProjectIterationFilesAction implements Serializable { private static final long serialVersionUID = 1L; @@ -108,9 +108,6 @@ public class ProjectIterationFilesAction implements Serializable { private String localeId; - @Logger - private Log log; - @In private ZanataIdentity identity; @@ -350,7 +347,7 @@ private void uploadAdapterFile() { translationFileServiceImpl.persistToTempFile(fileContents); md5hash = md.digest(); } catch (ZanataServiceException e) { - log.error("Failed writing temp file for document {0}", e, + log.error("Failed writing temp file for document {}", e, documentFileUpload.getDocId()); FacesMessages.instance().add(Severity.ERROR, "Error saving uploaded document {0} to server.", fileName); diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java index 3717c308c5..e8a61c0daa 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java @@ -26,19 +26,20 @@ import java.util.Map; import java.util.TreeMap; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.zanata.model.HProjectIteration; import org.zanata.service.LocaleService; @Name("projectIterationLocaleAction") @Scope(ScopeType.PAGE) +@Slf4j public class ProjectIterationLocaleAction implements Serializable { private static final long serialVersionUID = 1L; @@ -51,8 +52,6 @@ public class ProjectIterationLocaleAction implements Serializable { @Out(required = false) private Boolean iterationOverrideLocales; private boolean setting; - @Logger - Log log; @In private ProjectIterationHome projectIterationHome; diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java index 5dd314d1d7..f0e6638a58 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java @@ -4,16 +4,16 @@ import java.util.List; import java.util.Set; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.datamodel.DataModel; import org.jboss.seam.annotations.datamodel.DataModelSelection; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityManager; import org.zanata.dao.AccountDAO; @@ -24,6 +24,7 @@ @Name("projectMaintainerManageAction") @Scope(ScopeType.PAGE) +@Slf4j public class ProjectMaintainerManageAction implements Serializable { private static final long serialVersionUID = 1L; @DataModel @@ -40,8 +41,6 @@ public class ProjectMaintainerManageAction implements Serializable { ProjectDAO projectDAO; @In AccountDAO accountDAO; - @Logger - Log log; public void loadAllMaintainers() { allList = projectDAO.getProjectMaintainerBySlug(this.slug); @@ -66,7 +65,7 @@ public HProject getProject() { @Restrict("#{s:hasPermission(projectMaintainerManageAction.project, 'update')}") public void deleteMaintainer(HPerson person) { - log.debug("try to delete maintainer {0} from slug {1}", + log.debug("try to delete maintainer {} from slug {}", person.getName(), this.slug); final HProject project = projectDAO.getBySlug(this.slug); Set personList = project.getMaintainers(); @@ -95,7 +94,7 @@ String addMaintainers(String account) { project.addMaintainer(a.getPerson()); projectDAO.makePersistent(project); projectDAO.flush(); - log.debug("add {0} into maintainers", account); + log.debug("add {} into maintainers", account); return "success"; } FacesMessages.instance().add("This account does not exist."); diff --git a/zanata-war/src/main/java/org/zanata/action/RegisterAction.java b/zanata-war/src/main/java/org/zanata/action/RegisterAction.java index c25782fb52..d7c3627728 100644 --- a/zanata-war/src/main/java/org/zanata/action/RegisterAction.java +++ b/zanata-war/src/main/java/org/zanata/action/RegisterAction.java @@ -27,18 +27,18 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.faces.Renderer; -import org.jboss.seam.log.Log; import org.zanata.action.validator.NotDuplicateEmail; import org.zanata.dao.PersonDAO; import org.zanata.model.HPerson; @@ -47,13 +47,11 @@ @Name("register") @Scope(ScopeType.CONVERSATION) +@Slf4j public class RegisterAction implements Serializable { private static final long serialVersionUID = -7883627570614588182L; - @Logger - Log log; - @In private EntityManager entityManager; diff --git a/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java b/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java index 9a365d2c59..53fe5c6680 100644 --- a/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java +++ b/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java @@ -7,18 +7,18 @@ import javax.persistence.EntityManagerFactory; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.Session; import org.hibernate.search.FullTextSession; import org.hibernate.search.Search; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Synchronized; -import org.jboss.seam.log.Log; import org.zanata.ServerConstants; import org.zanata.async.AsyncTask; import org.zanata.async.AsyncTaskHandle; @@ -39,12 +39,10 @@ @Scope(ScopeType.APPLICATION) @Startup @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) +@Slf4j public class ReindexAsyncBean implements Serializable { private static final long serialVersionUID = 1L; - @Logger - private Log log; - @In EntityManagerFactory entityManagerFactory; @@ -202,20 +200,20 @@ public Boolean call() throws Exception { for (Class clazz : indexables) { if (!getHandle().isCancelled() && indexingOptions.get(clazz).isPurge()) { - log.info("purging index for {0}", clazz); + log.info("purging index for {}", clazz); currentClass = clazz; session.purgeAll(clazz); getHandle().increaseProgress(1); } if (!getHandle().isCancelled() && indexingOptions.get(clazz).isReindex()) { - log.info("reindexing {0}", clazz); + log.info("reindexing {}", clazz); currentClass = clazz; getIndexer(clazz).index(); } if (!getHandle().isCancelled() && indexingOptions.get(clazz).isOptimize()) { - log.info("optimizing {0}", clazz); + log.info("optimizing {}", clazz); currentClass = clazz; session.getSearchFactory().optimize(clazz); getHandle().increaseProgress(1); @@ -229,7 +227,7 @@ public Boolean call() throws Exception { .getMaxProgress()) { // @formatter: off log.warn( - "Did not reindex the expected number of objects. Counted {0} but indexed {1}. " + "Did not reindex the expected number of objects. Counted {} but indexed {}. " + "The index may be out-of-sync. " + "This may be caused by lack of sufficient memory, or by database activity during reindexing.", getHandle().getMaxProgress(), getHandle() diff --git a/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java b/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java index 99e9f489cb..66a99e0b63 100644 --- a/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java +++ b/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java @@ -25,16 +25,16 @@ import java.util.List; import java.util.Locale; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.validator.constraints.Email; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.LocaleSelector; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; import org.zanata.model.HAccount; @@ -54,6 +54,7 @@ */ @Name("sendEmail") @Scope(ScopeType.PAGE) +@Slf4j public class SendEmailAction implements Serializable { private static final long serialVersionUID = 1L; @@ -79,9 +80,6 @@ public class SendEmailAction implements Serializable { @In private LocaleSelector localeSelector; - @Logger - private Log log; - private String fromName; private String fromLoginName; private String replyEmail; @@ -243,7 +241,7 @@ public String send() { "There was a problem sending the message: " + e.getMessage()); log.error( - "Failed to send email: fromName '{0}', fromLoginName '{1}', replyEmail '{2}', subject '{3}', message '{4}'", + "Failed to send email: fromName '{}', fromLoginName '{}', replyEmail '{}', subject '{}', message '{}'", e, fromName, fromLoginName, replyEmail, subject, message); return "failure"; } finally { @@ -256,7 +254,7 @@ public String send() { */ public String cancel() { log.info( - "Canceled sending email: fromName '{0}', fromLoginName '{1}', replyEmail '{2}', subject '{3}', message '{4}'", + "Canceled sending email: fromName '{}', fromLoginName '{}', replyEmail '{}', subject '{}', message '{}'", fromName, fromLoginName, replyEmail, subject, message); FacesMessages.instance().add("Sending message canceled"); return "canceled"; diff --git a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java index 70a51af9f6..57fc9a8bfb 100644 --- a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java +++ b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java @@ -26,14 +26,12 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.core.Events; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.zanata.ApplicationConfiguration; import org.zanata.action.validator.EmailList; import org.zanata.dao.ApplicationConfigurationDAO; @@ -44,15 +42,8 @@ @Scope(ScopeType.PAGE) @Restrict("#{s:hasRole('admin')}") public class ServerConfigurationBean implements Serializable { - - /** - * - */ private static final long serialVersionUID = 1L; - @Logger - Log log; - @In ApplicationConfigurationDAO applicationConfigurationDAO; diff --git a/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java b/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java index f59629831c..c1dba4012d 100644 --- a/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java @@ -27,13 +27,13 @@ import javax.security.auth.login.LoginException; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.Identity; import org.zanata.dao.PersonDAO; import org.zanata.exception.KeyNotFoundException; @@ -43,6 +43,7 @@ import org.zanata.service.impl.EmailChangeService; @Name("validateEmail") +@Slf4j public class ValidateEmailAction implements Serializable { private static final long serialVersionUID = 1L; private String activationKey; @@ -56,9 +57,6 @@ public class ValidateEmailAction implements Serializable { @In EmailChangeService emailChangeService; - @Logger - Log log; - @Transactional public String validate() throws LoginException { String returnUrl = "/home.xhtml"; @@ -88,7 +86,7 @@ public String validate() throws LoginException { emailChangeService.removeEntry(entry); FacesMessages.instance().add( "You have successfully changed your email account."); - log.info("update email address to {0} successfully", + log.info("update email address to {} successfully", entry.getEmail()); } else { returnUrl = checkResult; diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java index da2e7e47c3..4d9b1d8065 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java @@ -26,13 +26,11 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; import org.zanata.model.HAccount; @@ -55,9 +53,6 @@ public class VersionGroupAction implements Serializable { @RequestParameter private String[] slugParam; - @Logger - Log log; - private List allVersionGroups; private List searchResults; diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java index 1a383ac717..084962d79e 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; + import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; @@ -30,20 +30,18 @@ import org.hibernate.criterion.NaturalIdentifier; import org.hibernate.criterion.Restrictions; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; import org.zanata.model.HAccount; import org.zanata.model.HIterationGroup; import org.zanata.model.HProjectIteration; import org.zanata.service.SlugEntityService; + import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; /** * @author Alex Eng aeng@redhat.com @@ -61,8 +59,6 @@ public class VersionGroupHome extends SlugHome { @In SlugEntityService slugEntityServiceImpl; - @Logger - Log log; private List statusList; @Override diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java index a811128dac..d1a4f11212 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java @@ -31,15 +31,17 @@ import org.apache.commons.lang.StringUtils; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.ProjectDAO; import org.zanata.dao.ProjectIterationDAO; -import org.zanata.model.*; +import org.zanata.model.HAccount; +import org.zanata.model.HIterationGroup; +import org.zanata.model.HPerson; +import org.zanata.model.HProject; +import org.zanata.model.HProjectIteration; import org.zanata.service.VersionGroupService; import org.zanata.service.VersionGroupService.SelectableHProject; @@ -63,9 +65,6 @@ public class VersionGroupJoinAction implements Serializable { @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) private HAccount authenticatedAccount; - @Logger - private Log log; - private List projectVersions; private HIterationGroup group; diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java index 6e90395eec..b2f8ce8f62 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java @@ -4,16 +4,16 @@ import java.util.List; import java.util.Set; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.datamodel.DataModel; import org.jboss.seam.annotations.datamodel.DataModelSelection; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; import org.zanata.dao.AccountDAO; import org.zanata.model.HAccount; import org.zanata.model.HIterationGroup; @@ -22,6 +22,7 @@ @Name("versionGroupMaintainerManageAction") @Scope(ScopeType.PAGE) +@Slf4j public class VersionGroupMaintainerManageAction implements Serializable { private static final long serialVersionUID = 1L; @@ -40,9 +41,6 @@ public class VersionGroupMaintainerManageAction implements Serializable { @In AccountDAO accountDAO; - @Logger - Log log; - public void init() { allList = versionGroupServiceImpl.getMaintainerBySlug(slug); } @@ -62,7 +60,7 @@ public String getSlug() { @Restrict("#{s:hasPermission(versionGroupMaintainerManageAction.group,'update')}") public void deleteMaintainer(HPerson person) { - log.debug("try to delete maintainer {0} from slug {1}", + log.debug("try to delete maintainer {} from slug {}", person.getName(), this.slug); HIterationGroup iterationGroup = versionGroupServiceImpl.getBySlug(this.slug); @@ -93,7 +91,7 @@ String addMaintainers(String account) { personList.add(a.getPerson()); versionGroupServiceImpl.makePersistent(iterationGroup); versionGroupServiceImpl.flush(); - log.debug("add {0} into maintainers", account); + log.debug("add {} into maintainers", account); return "success"; } else { FacesMessages.instance().add("This account is disabled."); diff --git a/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java b/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java index 3d186bf93f..47c5568c60 100644 --- a/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java @@ -20,6 +20,8 @@ */ package org.zanata.action; +import static org.zanata.rest.dto.stats.TranslationStatistics.StatUnit.WORD; + import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; @@ -34,18 +36,17 @@ import org.apache.commons.lang.StringUtils; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.framework.EntityNotFoundException; -import org.jboss.seam.log.Log; import org.jboss.seam.security.management.JpaIdentityStore; import org.joda.time.Period; import org.joda.time.format.PeriodFormatter; import org.joda.time.format.PeriodFormatterBuilder; import org.zanata.annotation.CachedMethodResult; import org.zanata.annotation.CachedMethods; +import org.zanata.async.tasks.CopyTransTask.CopyTransTaskHandle; import org.zanata.common.LocaleId; import org.zanata.common.ProjectType; import org.zanata.dao.PersonDAO; @@ -68,9 +69,6 @@ import com.google.common.base.Optional; -import static org.zanata.async.tasks.CopyTransTask.CopyTransTaskHandle; -import static org.zanata.rest.dto.stats.TranslationStatistics.StatUnit.WORD; - @Name("viewAllStatusAction") @Scope(ScopeType.PAGE) @CachedMethods @@ -84,9 +82,6 @@ public class ViewAllStatusAction implements Serializable { .appendSeparator(", ").appendMinutes() .appendSuffix(" min", " mins"); - @Logger - private Log log; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) private HAccount authenticatedAccount; diff --git a/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java b/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java index b62879a143..6385d84610 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java @@ -111,7 +111,7 @@ public HAccount create(String username, String password, boolean enabled) { // public List searchQuery(String searchQuery) throws // ParseException // { - // log.info("start searching {0}", searchQuery); + // log.info("start searching {}", searchQuery); // TermQuery tq = new TermQuery(new Term("username", searchQuery)); // EdgeNGramTokenFilter diff --git a/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java b/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java index 2505c15430..877f5721d0 100644 --- a/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java +++ b/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java @@ -22,10 +22,10 @@ import java.io.File; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; -import org.jboss.seam.log.Log; import org.zanata.service.FileSystemService; /** @@ -35,10 +35,8 @@ * href="mailto:camunoz@redhat.com">camunoz@redhat.com */ @Name("downloadFileCleanupJob") +@Slf4j public class DownloadFileCleanupJob extends ZanataSchedulableJob { - @Logger - private Log log; - @In private FileSystemService fileSystemServiceImpl; @@ -54,7 +52,7 @@ protected void execute() throws Exception { // Remove all files that match the filter for (File f : toRemove) { - log.debug("Removing file {0}", f.getName()); + log.debug("Removing file {}", f.getName()); f.delete(); } } diff --git a/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java b/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java index faab0e9ec0..4efda8134b 100644 --- a/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java +++ b/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java @@ -22,11 +22,11 @@ import java.util.Date; -import org.jboss.seam.annotations.Logger; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.annotations.async.Asynchronous; import org.jboss.seam.annotations.async.IntervalCron; import org.jboss.seam.async.QuartzTriggerHandle; -import org.jboss.seam.log.Log; /** * Base class for all Zanata jobs. Provides minor set pieces for jobs to be ran @@ -35,11 +35,9 @@ * @author Carlos Munoz camunoz@redhat.com */ +@Slf4j public abstract class ZanataSchedulableJob { - @Logger - private Log log; - public String getName() { return this.getClass().getName(); } @@ -47,19 +45,19 @@ public String getName() { @Asynchronous public QuartzTriggerHandle startJob(@IntervalCron String cron) { final Date startTime = new Date(); - log.info("Running Job {0} ({1})", this.getName(), startTime); + log.info("Running Job {} ({})", this.getName(), startTime); try { this.execute(); } catch (Exception e) { - log.error("Unexpected error while running Job {0}", e, + log.error("Unexpected error while running Job {}", e, this.getName()); } final Date endTime = new Date(); final long durationInSecs = (startTime.getTime() - endTime.getTime()) / 1000; - log.info("Finished running Job {0} ({1}). Total Duration {2} seconds", + log.info("Finished running Job {} ({}). Total Duration {} seconds", this.getName(), new Date(), durationInSecs); return null; diff --git a/zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java b/zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java index c66d3050d4..87427face5 100644 --- a/zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java +++ b/zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java @@ -9,19 +9,17 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; +import lombok.extern.slf4j.Slf4j; @Provider +@Slf4j public class ConstraintViolationExceptionMapper implements ExceptionMapper { - Log log = Logging.getLog(ConstraintViolationExceptionMapper.class); - @Override public Response toResponse(ConstraintViolationException e) { Set> invalidValues = e.getConstraintViolations(); for (ConstraintViolation invalidValue : invalidValues) { - log.error("Invalid state for leaf bean {0}: {1}", e, + log.error("Invalid state for leaf bean {}: {}", e, invalidValue.getLeafBean(), invalidValue); } return Response.status(Status.BAD_REQUEST).build(); diff --git a/zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java b/zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java index 98ce781687..49b483b122 100644 --- a/zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java +++ b/zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java @@ -5,16 +5,15 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.HibernateException; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; @Provider +@Slf4j public class HibernateExceptionMapper implements ExceptionMapper { - Log log = Logging.getLog(HibernateExceptionMapper.class); - @Override public Response toResponse(HibernateException exception) { log.error("Hibernate Exception in REST request", exception); diff --git a/zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java b/zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java index c8a99d886a..b43508fd72 100644 --- a/zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java +++ b/zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java @@ -4,6 +4,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import lombok.extern.slf4j.Slf4j; + import org.jboss.resteasy.annotations.interception.SecurityPrecedence; import org.jboss.resteasy.annotations.interception.ServerInterceptor; import org.jboss.resteasy.core.ResourceMethod; @@ -11,12 +13,11 @@ import org.jboss.resteasy.spi.Failure; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.interception.PreProcessInterceptor; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.zanata.security.ZanataIdentity; @SecurityPrecedence @ServerInterceptor +@Slf4j public class ZanataRestSecurityInterceptor implements PreProcessInterceptor { public static final String X_AUTH_TOKEN_HEADER = "X-Auth-Token"; @@ -27,7 +28,6 @@ public class ZanataRestSecurityInterceptor implements PreProcessInterceptor { preProcess(HttpRequest request, ResourceMethod method) throws Failure, WebApplicationException { - Log log = Logging.getLog(ZanataRestSecurityInterceptor.class); String username = request.getHttpHeaders().getRequestHeaders() .getFirst(X_AUTH_USER_HEADER); @@ -41,7 +41,7 @@ public class ZanataRestSecurityInterceptor implements PreProcessInterceptor { ZanataIdentity.instance().tryLogin(); if (!ZanataIdentity.instance().isLoggedIn()) { log.info( - "Failed attempt to authenticate REST request for user {0}", + "Failed attempt to authenticate REST request for user {}", username); return ServerResponse.copyIfNotServerResponse(Response.status( Status.UNAUTHORIZED).build()); diff --git a/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java b/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java index 77f7709d1a..68e1cb699d 100644 --- a/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java +++ b/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java @@ -5,6 +5,8 @@ import javax.ws.rs.core.Response.Status; +import lombok.extern.slf4j.Slf4j; + import org.jboss.resteasy.core.Dispatcher; import org.jboss.resteasy.core.SynchronousDispatcher; import org.jboss.resteasy.spi.HttpRequest; @@ -14,14 +16,12 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.deployment.AnnotationDeploymentHandler; import org.jboss.seam.deployment.HotDeploymentStrategy; -import org.jboss.seam.log.Log; import org.jboss.seam.resteasy.ResteasyBootstrap; import org.jboss.seam.resteasy.SeamResteasyProviderFactory; @@ -31,11 +31,9 @@ @AutoCreate @Install(classDependencies = "org.jboss.resteasy.spi.ResteasyProviderFactory", precedence = Install.DEPLOYMENT) +@Slf4j public class ZanataResteasyBootstrap extends ResteasyBootstrap { - @Logger - Log log; - @Observer("org.jboss.seam.postReInitialization") public void registerHotDeployedClasses() { diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java b/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java index 3cc015f1a4..44b5b97597 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java @@ -12,13 +12,13 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.Session; import org.jboss.resteasy.spi.NoLogWebApplicationException; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.jboss.seam.security.Identity; import org.zanata.common.LocaleId; import org.zanata.dao.AccountDAO; @@ -32,10 +32,9 @@ @Name("accountService") @Path(AccountResource.SERVICE_PATH) +@Slf4j @Transactional public class AccountService implements AccountResource { - private static final Log log = Logging.getLog(AccountService.class); - /** User name that identifies an account. */ @PathParam("username") String username; @@ -63,7 +62,7 @@ public class AccountService implements AccountResource { @Override public Response get() { - log.debug("HTTP GET {0}", request.getRequestURL()); + log.debug("HTTP GET {}", request.getRequestURL()); HAccount hAccount = accountDAO.getByUsername(username); if (hAccount == null) { return Response.status(Status.NOT_FOUND) @@ -78,7 +77,7 @@ public Response get() { @Override public Response put(Account account) { - log.debug("HTTP PUT {0} : \n{1}", request.getRequestURL(), account); + log.debug("HTTP PUT {} : \n{}", request.getRequestURL(), account); // RestUtils.validateEntity(account); HAccount hAccount = accountDAO.getByUsername(username); @@ -123,7 +122,7 @@ private void transfer(Account from, HAccount to) { HAccountRole hAccountRole = accountRoleDAO.findByName(role); if (hAccountRole == null) { // generate error for missing role - log.debug("Invalid role '{0}'", role); + log.debug("Invalid role '{}'", role); throw new NoLogWebApplicationException(Response .status(Status.BAD_REQUEST) .entity("Invalid role '" + role + "'").build()); diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java b/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java index 327bc46eff..59def73b39 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java @@ -13,8 +13,6 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.zanata.dao.DocumentDAO; import org.zanata.model.HDocument; import org.zanata.model.HLocale; @@ -34,8 +32,6 @@ public class ETagUtils { @In private DocumentDAO documentDAO; - Log log = Logging.getLog(ETagUtils.class); - /** * Retrieves the ETag for the Project * diff --git a/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java b/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java index 82ca870fbe..4ffd3c8043 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java @@ -12,12 +12,12 @@ import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.UriInfo; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.security.Restrict; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.zanata.common.LocaleId; import org.zanata.dao.GlossaryDAO; import org.zanata.model.HGlossaryEntry; @@ -30,6 +30,7 @@ @Name("glossaryService") @Path(GlossaryService.SERVICE_PATH) +@Slf4j @Transactional public class GlossaryService implements GlossaryResource { @Context @@ -51,8 +52,6 @@ public class GlossaryService implements GlossaryResource { @In private GlossaryFileService glossaryFileServiceImpl; - Log log = Logging.getLog(GlossaryService.class); - @Override public Response getEntries() { ResponseBuilder response = request.evaluatePreconditions(); diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java index e9e69e8422..b071138a3a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java @@ -24,8 +24,6 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.jboss.seam.security.Identity; import org.zanata.common.ProjectType; import org.zanata.dao.AccountDAO; @@ -59,8 +57,6 @@ public class ProjectService implements ProjectResource { @Context private Request request; - Log log = Logging.getLog(ProjectService.class); - @In ProjectDAO projectDAO; diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java index d7afcae187..6a8b88441f 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java @@ -39,10 +39,8 @@ import org.hibernate.Session; import org.jboss.resteasy.util.GenericType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.log.Log; import org.zanata.model.HProject; import org.zanata.rest.MediaTypes; import org.zanata.rest.dto.Link; @@ -58,9 +56,6 @@ public class ProjectsService implements ProjectsResource { @In private Session session; - @Logger - private Log log; - /** Type of media requested. */ @HeaderParam("Accept") @DefaultValue(MediaType.APPLICATION_XML) diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java b/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java index 696d449915..6fab9aa110 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java @@ -29,6 +29,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.fedorahosted.tennera.jgettext.HeaderFields; @@ -37,8 +39,6 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.zanata.ApplicationConfiguration; import org.zanata.common.ContentState; import org.zanata.common.LocaleId; @@ -76,6 +76,7 @@ @Name("resourceUtils") @Scope(ScopeType.STATELESS) +@Slf4j public class ResourceUtils { /** * Newline character used for multi-line comments @@ -107,8 +108,6 @@ public class ResourceUtils { private static final String PLURALS_FILE = "pluralforms.properties"; private static final String DEFAULT_PLURAL_FORM = "nplurals=1; plural=0"; - private static final Log log = Logging.getLog(ResourceUtils.class); - // private static int MAX_TARGET_CONTENTS = 6; private static Properties pluralForms; @@ -176,7 +175,7 @@ boolean transferFromTextFlows(List from, HDocument to, targ.setVersionNum(targ.getVersionNum() + 1); } } - log.debug("TextFlow with id {0} has changed", tf.getId()); + log.debug("TextFlow with id {} has changed", tf.getId()); } } else { textFlow = new HTextFlow(); @@ -188,7 +187,7 @@ boolean transferFromTextFlows(List from, HDocument to, to.getAllTextFlows().put(textFlow.getResId(), textFlow); to.getTextFlows().add(textFlow); entityManager.persist(textFlow); - log.debug("TextFlow with id {0} is new", tf.getId()); + log.debug("TextFlow with id {} is new", tf.getId()); } count++; @@ -202,7 +201,7 @@ boolean transferFromTextFlows(List from, HDocument to, HTextFlow textFlow = to.getAllTextFlows().get(id); if (!textFlow.isObsolete()) { changed = true; - log.debug("TextFlow with id {0} is now obsolete", id); + log.debug("TextFlow with id {} is now obsolete", id); textFlow.setRevision(to.getRevision()); textFlow.setObsolete(true); } @@ -329,7 +328,7 @@ public boolean transferFromTranslationsResourceExtensions( PoTargetHeader fromTargetHeader = from.findByType(PoTargetHeader.class); if (fromTargetHeader != null) { - log.debug("found PO header for locale: {0}", locale); + log.debug("found PO header for locale: {}", locale); try { changed = tryGetOrCreateTargetHeader(doc, locale, mergeType, @@ -402,7 +401,7 @@ private boolean transferFromTextFlowExtensions( changed = true; hComment.setComment(comment.getValue()); to.setComment(hComment); - log.debug("set comment:{0}", comment.getValue()); + log.debug("set comment:{}", comment.getValue()); } } } @@ -997,7 +996,7 @@ int getNPluralForms(String entries, LocaleId localeId) { pluralForms = getPluralForms(localeId); } if (pluralForms == null) { - log.error("No plural forms for locale {0} found in {1}", + log.error("No plural forms for locale {} found in {}", localeId, PLURALS_FILE); throw new RuntimeException( "No plural forms found; contact admin. Locale: " @@ -1141,7 +1140,7 @@ public void transferToTextFlowExtensions(HTextFlow from, && from.getPotEntryData() != null) { PotEntryHeader header = new PotEntryHeader(); transferToPotEntryHeader(from.getPotEntryData(), header); - log.debug("set header:{0}", from.getPotEntryData()); + log.debug("set header:{}", from.getPotEntryData()); to.add(header); } @@ -1150,7 +1149,7 @@ public void transferToTextFlowExtensions(HTextFlow from, && from.getComment() != null) { SimpleComment comment = new SimpleComment(from.getComment().getComment()); - log.debug("set comment:{0}", from.getComment().getComment()); + log.debug("set comment:{}", from.getComment().getComment()); to.add(comment); } diff --git a/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java index 031847e24a..29d6787fa2 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java @@ -20,13 +20,31 @@ */ package org.zanata.rest.service; +import java.lang.reflect.Type; +import java.net.URI; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.regex.Pattern; + +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.EntityTag; +import javax.ws.rs.core.GenericEntity; +import javax.ws.rs.core.Request; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; + +import lombok.extern.slf4j.Slf4j; + import org.jboss.resteasy.util.GenericType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.security.Restrict; -import org.jboss.seam.log.Log; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; import org.zanata.dao.DocumentDAO; @@ -45,36 +63,16 @@ import org.zanata.service.DocumentService; import org.zanata.service.LocaleService; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - -import java.lang.reflect.Type; -import java.net.URI; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.regex.Pattern; - /** * @author Carlos Munoz camunoz@redhat.com */ @Name("sourceDocResourceService") @Path(SourceDocResource.SERVICE_PATH) +@Slf4j @Transactional public class SourceDocResourceService implements SourceDocResource { - @Logger - private Log log; - @Context private Request request; @@ -161,7 +159,7 @@ Response post(Resource resource, Set extensions, String resourceName = resource.getName(); if (!Pattern.matches(SourceDocResource.RESOURCE_NAME_REGEX, resourceName)) { - log.warn("bad resource name in post(): {0}", resourceName); + log.warn("bad resource name in post(): {}", resourceName); throw new WebApplicationException(Response .status(Response.Status.BAD_REQUEST) .entity("not a legal resource name: " + resourceName) @@ -226,7 +224,7 @@ public Response getResource(String idNoSlash, Set extensions) { } Resource entity = new Resource(doc.getDocId()); - log.debug("get resource details {0}", entity.toString()); + log.debug("get resource details {}", entity.toString()); resourceUtils.transferToResource(doc, entity); for (HTextFlow htf : doc.getTextFlows()) { @@ -241,7 +239,7 @@ public Response getResource(String idNoSlash, Set extensions) { // handle extensions resourceUtils.transferToResourceExtensions(doc, entity.getExtensions(true), extensions); - log.debug("Get resource :{0}", entity.toString()); + log.debug("Get resource :{}", entity.toString()); return Response.ok().entity(entity).tag(etag) .lastModified(doc.getLastChanged()).build(); } @@ -331,7 +329,7 @@ public Response getResourceMeta(String idNoSlash, Set extensions) { resourceUtils.transferToResourceExtensions(doc, entity.getExtensions(true), extensions); - log.debug("successfuly get resource meta: {0}", entity); + log.debug("successfuly get resource meta: {}", entity); return Response.ok().entity(entity).tag(etag).build(); } @@ -354,7 +352,7 @@ Response putResourceMeta(String idNoSlash, } log.debug("pass evaluation"); - log.debug("put resource meta: {0}", messageBody); + log.debug("put resource meta: {}", messageBody); HDocument document = documentDAO.getByDocIdAndIteration(hProjectIteration, id); @@ -422,7 +420,7 @@ private HLocale validateTargetLocale(LocaleId locale, String projectSlug, return hLocale; } catch (ZanataServiceException e) { log.warn( - "Exception validating target locale {0} in proj {1} iter {2}", + "Exception validating target locale {} in proj {} iter {}", e, locale, projectSlug, iterationSlug); throw new WebApplicationException(Response .status(Response.Status.FORBIDDEN).entity(e.getMessage()) diff --git a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java index d1f4459046..7bca47b555 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java @@ -37,12 +37,12 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.security.Restrict; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.zanata.ApplicationConfiguration; import org.zanata.common.LocaleId; import org.zanata.common.MergeType; @@ -68,6 +68,7 @@ */ @Name("translatedDocResourceService") @Path(TranslatedDocResource.SERVICE_PATH) +@Slf4j @Transactional public class TranslatedDocResourceService implements TranslatedDocResource { @@ -133,8 +134,6 @@ public class TranslatedDocResourceService implements TranslatedDocResource { @In private TranslationService translationServiceImpl; - private final Log log = Logging.getLog(TranslatedDocResourceService.class); - @In private LocaleService localeServiceImpl; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java index 658837615d..beb0744635 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java @@ -30,12 +30,10 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.log.Log; import org.zanata.common.ActivityType; import org.zanata.dao.ActivityDAO; import org.zanata.dao.DocumentDAO; @@ -59,9 +57,6 @@ @AutoCreate @Scope(ScopeType.STATELESS) public class ActivityServiceImpl implements ActivityService { - @Logger - private Log log; - @In private ActivityDAO activityDAO; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java index e9a5f00a5b..2ae636ea31 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java @@ -20,7 +20,6 @@ */ package org.zanata.service.impl; -import static org.zanata.async.tasks.CopyTransTask.CopyTransTaskHandle; import static org.zanata.common.ContentState.Approved; import static org.zanata.common.ContentState.NeedReview; import static org.zanata.common.ContentState.New; @@ -34,18 +33,18 @@ import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.hibernate.HibernateException; import org.hibernate.ScrollableResults; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.jboss.seam.util.Work; import org.zanata.async.AsyncUtils; +import org.zanata.async.tasks.CopyTransTask.CopyTransTaskHandle; import org.zanata.common.ContentState; import org.zanata.dao.DatabaseConstants; import org.zanata.dao.DocumentDAO; @@ -62,15 +61,16 @@ import org.zanata.service.CopyTransService; import org.zanata.service.LocaleService; import org.zanata.service.ValidationService; +import org.zanata.webtrans.shared.model.ValidationAction; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import org.zanata.webtrans.shared.model.ValidationAction; //TODO unit test suite for this class @Name("copyTransServiceImpl") @Scope(ScopeType.STATELESS) +@Slf4j public class CopyTransServiceImpl implements CopyTransService { @In private EntityManager entityManager; @@ -90,13 +90,10 @@ public class CopyTransServiceImpl implements CopyTransService { @In private ValidationService validationServiceImpl; - @Logger - Log log; - @Observer(TranslatedDocResourceService.EVENT_COPY_TRANS) public void runCopyTrans(Long docId, String project, String iterationSlug) { HDocument document = documentDAO.findById(docId, true); - log.info("copyTrans start: document \"{0}\"", document.getDocId()); + log.info("copyTrans start: document \"{}\"", document.getDocId()); List localelist = localeServiceImpl.getSupportedLangugeByProjectIteration( project, iterationSlug); @@ -107,7 +104,7 @@ public void runCopyTrans(Long docId, String project, String iterationSlug) { for (HLocale locale : localelist) { copyTransForLocale(document, locale); } - log.info("copyTrans finished: document \"{0}\"", document.getDocId()); + log.info("copyTrans finished: document \"{}\"", document.getDocId()); } private String createComment(HTextFlowTarget target) { @@ -202,7 +199,7 @@ protected Void work() throws Exception { } log.info( - "copyTrans: {0} {1} translations for document \"{2}{3}\" ", + "copyTrans: {} {} translations for document \"{}{}\" ", copyCount, locale.getLocaleId(), document.getPath(), document.getName()); @@ -474,7 +471,7 @@ public void copyTransForDocument(HDocument document, copyTransOpts = new HCopyTransOptions(); } - log.info("copyTrans start: document \"{0}\"", document.getDocId()); + log.info("copyTrans start: document \"{}\"", document.getDocId()); Optional taskHandleOpt = AsyncUtils.getEventAsyncHandle(CopyTransTaskHandle.class); List localeList = @@ -492,7 +489,7 @@ public void copyTransForDocument(HDocument document, if (taskHandleOpt.isPresent()) { taskHandleOpt.get().incrementDocumentsProcessed(); } - log.info("copyTrans finished: document \"{0}\"", document.getDocId()); + log.info("copyTrans finished: document \"{}\"", document.getDocId()); } @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java index 24be47e01d..57e219572c 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java @@ -25,14 +25,14 @@ import java.util.List; import java.util.Map; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.ResourceBundle; import org.jboss.seam.faces.Renderer; -import org.jboss.seam.log.Log; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityManager; import org.zanata.ApplicationConfiguration; @@ -45,13 +45,12 @@ */ @Name("emailServiceImpl") @Scope(ScopeType.STATELESS) +@Slf4j +// TODO refactor class to minimise duplicate code public class EmailServiceImpl implements EmailService { @In(create = true) private Renderer renderer; - @Logger - private Log log; - @In private IdentityManager identityManager; @@ -78,7 +77,7 @@ public String sendActivationEmail(String emailTemplate, String toName, renderer.render(emailTemplate); log.info( - "Sent activation account email: toName '{0}', toEmailAddress '{1}'", + "Sent activation account email: toName '{}', toEmailAddress '{}'", toName, toEmailAddr); return "#{messages['jsf.Account.ActivationMessage']}"; } @@ -96,7 +95,7 @@ public String sendToLanguageCoordinators(String emailTemplate, renderer.render(emailTemplate); } log.info( - "Sent language team coordinator email: fromName '{0}', fromLoginName '{1}', replyEmail '{2}', subject '{3}', message '{4}', language '{5}'", + "Sent language team coordinator email: fromName '{}', fromLoginName '{}', replyEmail '{}', subject '{}', message '{}', language '{}'", fromName, fromLoginName, replyEmail, subject, message, language); return "#{messages['jsf.email.coordinator.SentNotification']}"; @@ -119,7 +118,7 @@ public String sendToVersionGroupMaintainer(String emailTemplate, renderer.render(emailTemplate); } log.info( - "Sent version group maintainer email: fromName '{0}', fromLoginName '{1}', replyEmail '{2}', subject '{3}', message '{4}'", + "Sent version group maintainer email: fromName '{}', fromLoginName '1}', replyEmail '{}', subject '{}', message '{}'", fromName, fromLoginName, replyEmail, subject, message); return "#{messages['jsf.email.group.maintainer.SentNotification']}"; } else { @@ -143,7 +142,7 @@ public String sendToAdminEmails(String emailTemplate, String fromName, renderer.render(emailTemplate); } log.info( - "Sent server admin email: fromName '{0}', fromLoginName '{1}', replyEmail '{2}', subject '{3}', message '{4}'", + "Sent server admin email: fromName '{}', fromLoginName '{}', replyEmail '{}', subject '{}', message '{}'", fromName, fromLoginName, replyEmail, subject, message); return "#{messages['jsf.email.admin.SentNotification']}"; } else { @@ -168,7 +167,7 @@ private String sendToAdminUsers(String emailTemplate, String fromName, } log.info( - "Sent admin users email: fromName '{0}', fromLoginName '{1}', replyEmail '{2}', subject '{3}', message '{4}'", + "Sent admin users email: fromName '{}', fromLoginName '{}', replyEmail '{}', subject '{}', message '{}'", fromName, fromLoginName, replyEmail, subject, message); return "#{messages['jsf.email.admin.SentNotification']}"; } diff --git a/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java index f0e94df694..d112671bdc 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java @@ -29,12 +29,12 @@ import javax.annotation.Nonnull; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; import org.zanata.dao.PersonDAO; @@ -56,6 +56,7 @@ */ @Name("localeServiceImpl") @Scope(ScopeType.STATELESS) +@Slf4j public class LocaleServiceImpl implements LocaleService { private LocaleDAO localeDAO; @@ -67,9 +68,6 @@ public class LocaleServiceImpl implements LocaleService { private TextFlowTargetDAO textFlowTargetDAO; - @Logger - Log log; - public LocaleServiceImpl() { } diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java index 2e9462fe07..832a63cebf 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java @@ -20,11 +20,37 @@ */ package org.zanata.service.impl; +import static org.jboss.seam.ScopeType.STATELESS; +import static org.zanata.common.DocumentType.GETTEXT_PORTABLE_OBJECT; +import static org.zanata.common.DocumentType.GETTEXT_PORTABLE_OBJECT_TEMPLATE; +import static org.zanata.common.DocumentType.IDML; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_DATABASE; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_FORMULA; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_GRAPHICS; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_GRAPHICS_FLAT; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_PRESENTATION; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_PRESENTATION_FLAT; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_SPREADSHEET; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_SPREADSHEET_FLAT; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_TEXT; +import static org.zanata.common.DocumentType.OPEN_DOCUMENT_TEXT_FLAT; +import static org.zanata.common.DocumentType.PLAIN_TEXT; +import static org.zanata.common.DocumentType.XML_DOCUMENT_TYPE_DEFINITION; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.xml.sax.InputSource; import org.zanata.adapter.DTDAdapter; import org.zanata.adapter.FileFormatAdapter; @@ -48,18 +74,6 @@ import com.google.common.base.Optional; import com.google.common.collect.MapMaker; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static org.jboss.seam.ScopeType.STATELESS; -import static org.zanata.common.DocumentType.*; - /** * Default implementation of the TranslationFileService interface. * @@ -68,6 +82,7 @@ */ @Name("translationFileServiceImpl") @Scope(STATELESS) +@Slf4j public class TranslationFileServiceImpl implements TranslationFileService { private static Map> DOCTYPEMAP = new MapMaker().makeMap(); @@ -98,9 +113,6 @@ private static Set buildSupportedExtensionSet() { return supported; } - @Logger - Log log; - @In private DocumentDAO documentDAO; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java index 472e5604c2..b004caf53f 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java @@ -23,15 +23,15 @@ import java.util.List; import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; + import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; import org.zanata.dao.AccountDAO; import org.zanata.dao.RoleAssignmentRuleDAO; import org.zanata.model.HAccount; @@ -47,10 +47,8 @@ */ @Name("userAccountServiceImpl") @Scope(ScopeType.STATELESS) +@Slf4j public class UserAccountServiceImpl implements UserAccountService { - @Logger - private Log log; - @In private Session session; @@ -90,7 +88,7 @@ public HAccountResetPasswordKey requestPasswordReset(HAccount account) { + account.getPerson().getName() + System.currentTimeMillis())); session.persist(key); - log.info("Sent password reset key to {0} ({1})", account.getPerson() + log.info("Sent password reset key to {} ({})", account.getPerson() .getName(), account.getUsername()); return key; } diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java index abdaf442b6..7cd8bb9d3f 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java @@ -3,22 +3,39 @@ */ package org.zanata.service.impl; -import java.util.*; - -import org.apache.commons.lang.*; -import org.jboss.seam.*; -import org.jboss.seam.annotations.*; -import org.jboss.seam.log.*; -import org.zanata.common.*; -import org.zanata.dao.*; -import org.zanata.model.*; -import org.zanata.service.*; -import org.zanata.webtrans.shared.model.*; -import org.zanata.webtrans.shared.model.ValidationAction.*; -import org.zanata.webtrans.shared.validation.*; - -import com.google.common.base.*; -import com.google.common.collect.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import lombok.extern.slf4j.Slf4j; + +import org.apache.commons.lang.StringUtils; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.zanata.common.LocaleId; +import org.zanata.dao.DocumentDAO; +import org.zanata.dao.ProjectDAO; +import org.zanata.dao.ProjectIterationDAO; +import org.zanata.dao.TextFlowTargetDAO; +import org.zanata.model.HDocument; +import org.zanata.model.HProject; +import org.zanata.model.HProjectIteration; +import org.zanata.model.HTextFlow; +import org.zanata.model.HTextFlowTarget; +import org.zanata.service.TranslationStateCache; +import org.zanata.service.ValidationFactoryProvider; +import org.zanata.service.ValidationService; +import org.zanata.webtrans.shared.model.ValidationAction; +import org.zanata.webtrans.shared.model.ValidationAction.State; +import org.zanata.webtrans.shared.model.ValidationId; +import org.zanata.webtrans.shared.validation.ValidationFactory; + +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; /** * @@ -27,10 +44,8 @@ */ @Name("validationServiceImpl") @Scope(ScopeType.STATELESS) +@Slf4j public class ValidationServiceImpl implements ValidationService { - @Logger - private Log log; - @In private ProjectDAO projectDAO; @@ -169,7 +184,7 @@ private List getValidationIds(HProjectIteration version, @Override public boolean runDocValidations(Long hDocId, List validationIds, LocaleId localeId) { - log.debug("Start runDocValidations {0}", hDocId); + log.debug("Start runDocValidations {}", hDocId); Stopwatch stopwatch = new Stopwatch().start(); HDocument hDoc = documentDAO.findById(hDocId, false); @@ -181,7 +196,7 @@ public boolean runDocValidations(Long hDocId, @Override public boolean runDocValidationsWithServerRules(HDocument hDoc, LocaleId localeId) { - log.debug("Start runDocValidationsWithServerRules {0}", hDoc.getId()); + log.debug("Start runDocValidationsWithServerRules {}", hDoc.getId()); Stopwatch stopwatch = new Stopwatch().start(); List validationIds = @@ -213,7 +228,7 @@ private boolean documentHasWarningOrError(HDocument hDoc, public List filterHasWarningOrErrorTextFlow( List textFlows, List validationIds, LocaleId localeId, int startIndex, int maxSize) { - log.debug("Start filter {0} textFlows", textFlows.size()); + log.debug("Start filter {} textFlows", textFlows.size()); Stopwatch stopwatch = new Stopwatch().start(); List result = new ArrayList(); diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java index 3d3bce9400..4a5f26d888 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java @@ -1,17 +1,16 @@ package org.zanata.service.impl; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.log.Log; @Name("versionManager") // Singleton with no state @Scope(ScopeType.APPLICATION) +@Slf4j public class VersionManager { - @Logger - static Log log; public boolean checkVersion(String client, String server) { log.debug("start version check client version:" + client diff --git a/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java b/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java index 7dd5de5f93..b11e2a3e88 100644 --- a/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java +++ b/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java @@ -6,16 +6,16 @@ import javax.persistence.EntityManager; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Events; -import org.jboss.seam.log.Log; import org.zanata.ApplicationConfiguration; import org.zanata.common.LocaleId; import org.zanata.dao.AccountDAO; @@ -33,6 +33,7 @@ */ @Name("essentialDataCreator") @Scope(ScopeType.STATELESS) +@Slf4j @Install(false) public class EssentialDataCreator { @@ -40,9 +41,6 @@ public class EssentialDataCreator { public static final String ESSENTIAL_DATA_CREATED_EVENT = "EssentialDataCreator.complete"; - @Logger - private static Log log; - @In private EntityManager entityManager; diff --git a/zanata-war/src/main/java/org/zanata/util/UrlUtil.java b/zanata-war/src/main/java/org/zanata/util/UrlUtil.java index d27317019b..9f1d3375e5 100644 --- a/zanata-war/src/main/java/org/zanata/util/UrlUtil.java +++ b/zanata-war/src/main/java/org/zanata/util/UrlUtil.java @@ -26,13 +26,13 @@ import javax.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.log.Log; import org.zanata.common.LocaleId; /** @@ -41,17 +41,11 @@ * * @author David Mason, damason@redhat.com */ +@AutoCreate @Name("urlUtil") @Scope(ScopeType.SESSION) -@AutoCreate +@Slf4j public class UrlUtil implements Serializable { - - @Logger - private Log log; - - /** - * - */ private static final long serialVersionUID = 1L; private final static String ENCODING = "UTF-8"; private final static String contextPath = ServletLifecycle @@ -82,7 +76,7 @@ public String getEncodedLocalUrl(HttpServletRequest request) { } else { url = request.getRequestURI(); queryString = request.getQueryString(); - log.warn("encountered non-rewritten url {0} with query string {1}", + log.warn("encountered non-rewritten url {} with query string {}", url, queryString); } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java b/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java index f81a415dd5..f23beb8e0a 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentMap; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; +import lombok.extern.slf4j.Slf4j; + import org.zanata.webtrans.shared.auth.EditorClientId; import org.zanata.webtrans.shared.model.Person; import org.zanata.webtrans.shared.model.PersonId; @@ -33,9 +33,8 @@ import de.novanic.eventservice.service.registry.user.UserManager; import de.novanic.eventservice.service.registry.user.UserManagerFactory; +@Slf4j public class TranslationWorkspaceImpl implements TranslationWorkspace { - private static final Log log = Logging - .getLog(TranslationWorkspaceImpl.class); private final WorkspaceContext workspaceContext; private final Domain domain; private final ConcurrentMap sessions = @@ -79,7 +78,7 @@ public void onTimeout(UserInfo userInfo) { .remove(connectionId); if (editorClientId != null) { log.info( - "Timeout for GWTEventService connectionId {0}; removing EditorClientId {1} from workspace {2}", + "Timeout for GWTEventService connectionId {}; removing EditorClientId {} from workspace {}", connectionId, editorClientId, workspaceId); removeEditorClient(editorClientId); } @@ -105,7 +104,7 @@ public void addEditorClient(String httpSessionId, sessions.putIfAbsent(editorClientId, new PersonSessionDetails( new Person(personId, "", ""), null)); if (prev == null) { - log.info("Added user {0} with editorClientId {1} to workspace {2}", + log.info("Added user {} with editorClientId {} to workspace {}", personId.getId(), editorClientId, workspaceContext); httpSessionToEditorClientId.put(httpSessionId, editorClientId); } @@ -114,7 +113,7 @@ public void addEditorClient(String httpSessionId, @Override public void onEventServiceConnected(EditorClientId editorClientId, String connectionId) { - log.info("EditorClientId {0} has connectionId {1}", editorClientId, + log.info("EditorClientId {} has connectionId {}", editorClientId, connectionId); connectionIdToEditorClientId.put(connectionId, editorClientId); } @@ -145,18 +144,18 @@ public boolean removeEditorClient(EditorClientId editorClientId) { publish(event); log.info( - "Removed user {0} with editorClientId {1} from workspace {2}", + "Removed user {} with editorClientId {} from workspace {}", details.getPerson().getId(), editorClientId, workspaceContext); return true; } else { log.warn( - "Unable to remove user {0} with editorClientId {1} from workspace {2}", + "Unable to remove user {} with editorClientId {} from workspace {}", details.getPerson().getId(), editorClientId, workspaceContext); } } else { - log.debug("EditorClientId {0} not found in workspace {1}", + log.debug("EditorClientId {} not found in workspace {}", editorClientId, workspaceContext); return false; } diff --git a/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy b/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy index d68c3a1ccc..fe7eca48fe 100644 --- a/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy +++ b/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy @@ -1,8 +1,8 @@ package org.zanata import org.hibernate.Session -import org.jboss.seam.log.Log -import org.jboss.seam.log.Logging +import org.slf4j.Logger +import org.slf4j.LoggerFactory import org.testng.annotations.AfterMethod import org.testng.annotations.AfterSuite import org.testng.annotations.BeforeMethod @@ -27,14 +27,13 @@ import javax.persistence.Persistence */ @Listeners(TestMethodListener.class) abstract class ZanataGroovyJpaTest { + private static final Logger log = LoggerFactory.getLogger(ZanataJpaTest.class); private static final String PERSIST_NAME = "zanataTestDatasourcePU"; private static EntityManagerFactory emf; protected EntityManager em; - Log log = Logging.getLog(ZanataJpaTest.class); - /** * @return A list of Hibernate Entities to create */ diff --git a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java index 6d80bb3979..831f52c966 100644 --- a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java +++ b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java @@ -8,12 +8,12 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeMethod; @@ -25,15 +25,13 @@ @Listeners(TestMethodListener.class) @Test(groups = { "jpa-tests" }) public abstract class ZanataJpaTest { - + private static final Logger log = LoggerFactory.getLogger(ZanataJpaTest.class); private static final String PERSIST_NAME = "zanataTestDatasourcePU"; private static EntityManagerFactory emf; protected EntityManager em; - private static final Log log = Logging.getLog(ZanataJpaTest.class); - @BeforeMethod @Before public void setupEM() { diff --git a/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java b/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java index bc92b2de4a..e0ffef22be 100644 --- a/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java +++ b/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java @@ -5,9 +5,9 @@ import org.dbunit.operation.DatabaseOperation; import org.hibernate.Session; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; import org.jboss.seam.security.Identity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -17,9 +17,9 @@ @Test(groups = { "jpa-tests" }) public class LocaleDAOTest extends ZanataDbunitJpaTest { + private static final Logger log = LoggerFactory.getLogger(LocaleDAOTest.class); private LocaleDAO dao; - private Log log = Logging.getLog(LocaleDAOTest.class); @Override protected void prepareDBUnitOperations() { diff --git a/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java b/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java index 6269f506ed..66c8c663ea 100644 --- a/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java +++ b/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java @@ -25,8 +25,8 @@ import javax.persistence.Persistence; import org.hibernate.Session; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides JPA facilities. @@ -35,14 +35,13 @@ * href="mailto:camunoz@redhat.com">camunoz@redhat.com */ public class JPAProvider { + private static final Logger log = LoggerFactory.getLogger(JPAProvider.class); private static final String PERSIST_NAME = "zanataTestDatasourcePU"; private static EntityManagerFactory emf; protected EntityManager em; - Log log = Logging.getLog(JPAProvider.class); - public void setupEM() { log.debug("Setting up EM"); em = emf.createEntityManager(); diff --git a/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java b/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java index 95b5713f2e..fcce721c91 100644 --- a/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java +++ b/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java @@ -20,17 +20,6 @@ */ package org.zanata.seam; -import javassist.CannotCompileException; -import javassist.ClassPool; -import javassist.CtClass; -import javassist.CtMethod; -import javassist.NotFoundException; -import org.apache.commons.lang.ArrayUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.log.Logging; -import org.slf4j.LoggerFactory; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -42,6 +31,17 @@ import java.util.Map; import java.util.Set; +import javassist.CannotCompileException; +import javassist.ClassPool; +import javassist.CtClass; +import javassist.CtMethod; +import javassist.NotFoundException; +import lombok.extern.slf4j.Slf4j; + +import org.apache.commons.lang.ArrayUtils; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; + /** * Helps with Auto-wiring of Seam components for integrated tests without the * need for a full Seam environment. It's a singleton class that upon first use @@ -55,9 +55,8 @@ * @author Carlos Munoz camunoz@redhat.com */ +@Slf4j public class SeamAutowire { - private static final org.slf4j.Logger log = LoggerFactory - .getLogger(SeamAutowire.class); private static final Object PLACEHOLDER = new Object(); @@ -312,8 +311,7 @@ public T autowire(T component) { } // Logs else if (accessor.getAnnotation(Logger.class) != null) { - accessor.setValue(component, - Logging.getLog(accessor.getComponentType())); + throw new RuntimeException("Please use Slf4j, not Seam Logger"); } }