http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java index a9e2276..a356ad8 100644 --- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java +++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java @@ -69,7 +69,6 @@ import org.apache.syncope.common.lib.types.PropagationByResource; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.common.lib.types.WorkflowFormPropertyType; import org.apache.syncope.core.misc.security.AuthContextUtils; -import org.apache.syncope.core.misc.security.UnauthorizedException; import org.apache.syncope.core.misc.spring.BeanUtils; import org.apache.syncope.core.persistence.api.attrvalue.validation.InvalidEntityException; import org.apache.syncope.core.persistence.api.attrvalue.validation.ParsingValidationException; @@ -85,7 +84,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; /** - * Activiti (http://www.activiti.org/) based implementation. + * Activiti { + * + * @see http://www.activiti.org/} based implementation. */ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @@ -243,21 +244,19 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @Override public WorkflowResult<Pair<Long, Boolean>> create(final UserTO userTO, final boolean disablePwdPolicyCheck, - final boolean storePassword) throws WorkflowException { + final boolean storePassword) { return create(userTO, disablePwdPolicyCheck, null, storePassword); } @Override - public WorkflowResult<Pair<Long, Boolean>> create(UserTO userTO, boolean storePassword) throws - UnauthorizedException, WorkflowException { - + public WorkflowResult<Pair<Long, Boolean>> create(final UserTO userTO, final boolean storePassword) { return create(userTO, false, storePassword); } @Override public WorkflowResult<Pair<Long, Boolean>> create(final UserTO userTO, final boolean disablePwdPolicyCheck, - final Boolean enabled, final boolean storePassword) throws WorkflowException { + final Boolean enabled, final boolean storePassword) { final Map<String, Object> variables = new HashMap<>(); variables.put(WF_EXECUTOR, AuthContextUtils.getAuthenticatedUsername()); @@ -304,9 +303,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { new ImmutablePair<>(user.getKey(), propagateEnable), propByRes, getPerformedTasks(user)); } - private Set<String> doExecuteTask(final User user, final String task, - final Map<String, Object> moreVariables) throws WorkflowException { - + private Set<String> doExecuteTask(final User user, final String task, final Map<String, Object> moreVariables) { Set<String> preTasks = getPerformedTasks(user); final Map<String, Object> variables = new HashMap<>(); @@ -344,9 +341,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Long> doActivate(final User user, final String token) - throws WorkflowException { - + protected WorkflowResult<Long> doActivate(final User user, final String token) { Set<String> tasks = doExecuteTask(user, "activate", Collections.singletonMap(TOKEN, (Object) token)); updateStatus(user); @@ -356,9 +351,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Pair<UserMod, Boolean>> doUpdate(final User user, final UserMod userMod) - throws WorkflowException { - + protected WorkflowResult<Pair<UserMod, Boolean>> doUpdate(final User user, final UserMod userMod) { Set<String> tasks = doExecuteTask(user, "update", Collections.singletonMap(USER_MOD, (Object) userMod)); updateStatus(user); @@ -377,7 +370,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @Override @Transactional(rollbackFor = { Throwable.class }) - protected WorkflowResult<Long> doSuspend(final User user) throws WorkflowException { + protected WorkflowResult<Long> doSuspend(final User user) { Set<String> performedTasks = doExecuteTask(user, "suspend", null); updateStatus(user); User updated = userDAO.save(user); @@ -386,7 +379,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Long> doReactivate(final User user) throws WorkflowException { + protected WorkflowResult<Long> doReactivate(final User user) { Set<String> performedTasks = doExecuteTask(user, "reactivate", null); updateStatus(user); @@ -396,7 +389,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected void doRequestPasswordReset(final User user) throws WorkflowException { + protected void doRequestPasswordReset(final User user) { Map<String, Object> variables = new HashMap<>(2); variables.put(USER_TO, userDataBinder.getUserTO(user)); variables.put(EVENT, "requestPasswordReset"); @@ -406,9 +399,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected void doConfirmPasswordReset(final User user, final String token, final String password) - throws WorkflowException { - + protected void doConfirmPasswordReset(final User user, final String token, final String password) { Map<String, Object> variables = new HashMap<>(4); variables.put(TOKEN, token); variables.put(PASSWORD, password); @@ -420,7 +411,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected void doDelete(final User user) throws WorkflowException { + protected void doDelete(final User user) { doExecuteTask(user, "delete", null); PropagationByResource propByRes = new PropagationByResource(); @@ -445,9 +436,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - public WorkflowResult<Long> execute(final UserTO userTO, final String taskId) - throws UnauthorizedException, WorkflowException { - + public WorkflowResult<Long> execute(final UserTO userTO, final String taskId) { User user = userDAO.authFetch(userTO.getKey()); final Map<String, Object> variables = new HashMap<>(); @@ -512,9 +501,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - public void exportDefinition(final WorkflowDefinitionFormat format, final OutputStream os) - throws WorkflowException { - + public void exportDefinition(final WorkflowDefinitionFormat format, final OutputStream os) { switch (format) { case JSON: exportProcessModel(os); @@ -527,14 +514,12 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - public void exportDiagram(final OutputStream os) throws WorkflowException { + public void exportDiagram(final OutputStream os) { exportProcessResource(WF_DGRM_RESOURCE, os); } @Override - public void importDefinition(final WorkflowDefinitionFormat format, final String definition) - throws WorkflowException { - + public void importDefinition(final WorkflowDefinitionFormat format, final String definition) { Model model = getModel(getProcessDefinition()); switch (format) { case JSON: @@ -757,9 +742,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - public WorkflowFormTO getForm(final String workflowId) - throws NotFoundException, WorkflowException { - + public WorkflowFormTO getForm(final String workflowId) { Task task; try { task = taskService.createTaskQuery().processInstanceId(workflowId).singleResult(); @@ -810,9 +793,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @Transactional @Override - public WorkflowFormTO claimForm(final String taskId) - throws WorkflowException { - + public WorkflowFormTO claimForm(final String taskId) { final String authUser = AuthContextUtils.getAuthenticatedUsername(); Pair<Task, TaskFormData> checked = checkTask(taskId, authUser); @@ -837,9 +818,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @Transactional @Override - public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form) - throws WorkflowException { - + public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form) { final String authUser = AuthContextUtils.getAuthenticatedUsername(); Pair<Task, TaskFormData> checked = checkTask(form.getTaskId(), authUser);
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java ---------------------------------------------------------------------- diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java index b78575c..20059ce 100644 --- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java +++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java @@ -48,6 +48,7 @@ public class SyncopeGroupQueryImpl implements GroupQuery { try { this.groupId = Long.valueOf(groupId); } catch (NumberFormatException e) { + // ignore } return this; http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java ---------------------------------------------------------------------- diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java index 2f46cbd..55d8d5d 100644 --- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java +++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java @@ -96,6 +96,7 @@ public class SyncopeUserQueryImpl implements UserQuery { try { memberOf = Long.valueOf(groupId); } catch (NumberFormatException e) { + // ignore } return this; } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-api/pom.xml ---------------------------------------------------------------------- diff --git a/core/workflow-api/pom.xml b/core/workflow-api/pom.xml index e1003cb..3692c44 100644 --- a/core/workflow-api/pom.xml +++ b/core/workflow-api/pom.xml @@ -51,10 +51,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/core/workflow-java/pom.xml b/core/workflow-java/pom.xml index 3d82fdd..42ae77c 100644 --- a/core/workflow-java/pom.xml +++ b/core/workflow-java/pom.xml @@ -60,10 +60,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractGroupWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractGroupWorkflowAdapter.java b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractGroupWorkflowAdapter.java index 27a8c74..30bfae6 100644 --- a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractGroupWorkflowAdapter.java +++ b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractGroupWorkflowAdapter.java @@ -19,14 +19,12 @@ package org.apache.syncope.core.workflow.java; import org.apache.syncope.common.lib.mod.GroupMod; -import org.apache.syncope.core.persistence.api.dao.NotFoundException; import org.apache.syncope.core.persistence.api.dao.GroupDAO; import org.apache.syncope.core.persistence.api.entity.EntityFactory; import org.apache.syncope.core.persistence.api.entity.group.Group; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.provisioning.api.data.GroupDataBinder; import org.apache.syncope.core.workflow.api.GroupWorkflowAdapter; -import org.apache.syncope.core.workflow.api.WorkflowException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -47,20 +45,17 @@ public abstract class AbstractGroupWorkflowAdapter implements GroupWorkflowAdapt return null; } - protected abstract WorkflowResult<Long> doUpdate(Group group, GroupMod groupMod) - throws WorkflowException; + protected abstract WorkflowResult<Long> doUpdate(Group group, GroupMod groupMod); @Override - public WorkflowResult<Long> update(final GroupMod groupMod) - throws NotFoundException, WorkflowException { - + public WorkflowResult<Long> update(final GroupMod groupMod) { return doUpdate(groupDAO.authFetch(groupMod.getKey()), groupMod); } - protected abstract void doDelete(Group group) throws WorkflowException; + protected abstract void doDelete(Group group); @Override - public void delete(final Long groupKey) throws NotFoundException, WorkflowException { + public void delete(final Long groupKey) { doDelete(groupDAO.authFetch(groupKey)); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractUserWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractUserWorkflowAdapter.java b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractUserWorkflowAdapter.java index cc27a4b..b1c3b4a 100644 --- a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractUserWorkflowAdapter.java +++ b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/AbstractUserWorkflowAdapter.java @@ -26,7 +26,6 @@ import org.apache.syncope.core.persistence.api.entity.user.User; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.provisioning.api.data.UserDataBinder; import org.apache.syncope.core.workflow.api.UserWorkflowAdapter; -import org.apache.syncope.core.workflow.api.WorkflowException; import org.identityconnectors.common.Base64; import org.identityconnectors.common.security.EncryptorFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -59,46 +58,39 @@ public abstract class AbstractUserWorkflowAdapter implements UserWorkflowAdapter return null; } - protected abstract WorkflowResult<Long> doActivate(User user, String token) throws WorkflowException; + protected abstract WorkflowResult<Long> doActivate(User user, String token); @Override - public WorkflowResult<Long> activate(final Long userKey, final String token) - throws WorkflowException { - + public WorkflowResult<Long> activate(final Long userKey, final String token) { return doActivate(userDAO.authFetch(userKey), token); } - protected abstract WorkflowResult<Pair<UserMod, Boolean>> doUpdate(User user, UserMod userMod) - throws WorkflowException; + protected abstract WorkflowResult<Pair<UserMod, Boolean>> doUpdate(User user, UserMod userMod); @Override - public WorkflowResult<Pair<UserMod, Boolean>> update(final UserMod userMod) - throws WorkflowException { - + public WorkflowResult<Pair<UserMod, Boolean>> update(final UserMod userMod) { return doUpdate(userDAO.authFetch(userMod.getKey()), userMod); } - protected abstract WorkflowResult<Long> doSuspend(User user) throws WorkflowException; + protected abstract WorkflowResult<Long> doSuspend(User user); @Override - public WorkflowResult<Long> suspend(final Long userKey) - throws WorkflowException { - + public WorkflowResult<Long> suspend(final Long userKey) { return suspend(userDAO.authFetch(userKey)); } @Override - public WorkflowResult<Long> suspend(final User user) throws WorkflowException { + public WorkflowResult<Long> suspend(final User user) { // set suspended flag user.setSuspended(Boolean.TRUE); return doSuspend(user); } - protected abstract WorkflowResult<Long> doReactivate(User user) throws WorkflowException; + protected abstract WorkflowResult<Long> doReactivate(User user); @Override - public WorkflowResult<Long> reactivate(final Long userKey) throws WorkflowException { + public WorkflowResult<Long> reactivate(final Long userKey) { final User user = userDAO.authFetch(userKey); // reset failed logins @@ -110,27 +102,24 @@ public abstract class AbstractUserWorkflowAdapter implements UserWorkflowAdapter return doReactivate(user); } - protected abstract void doRequestPasswordReset(User user) throws WorkflowException; + protected abstract void doRequestPasswordReset(User user); @Override - public void requestPasswordReset(final Long userKey) throws WorkflowException { + public void requestPasswordReset(final Long userKey) { doRequestPasswordReset(userDAO.authFetch(userKey)); } - protected abstract void doConfirmPasswordReset(User user, String token, String password) - throws WorkflowException; + protected abstract void doConfirmPasswordReset(User user, String token, String password); @Override - public void confirmPasswordReset(final Long userKey, final String token, final String password) - throws WorkflowException { - + public void confirmPasswordReset(final Long userKey, final String token, final String password) { doConfirmPasswordReset(userDAO.authFetch(userKey), token, password); } - protected abstract void doDelete(User user) throws WorkflowException; + protected abstract void doDelete(User user); @Override - public void delete(final Long userKey) throws WorkflowException { + public void delete(final Long userKey) { doDelete(userDAO.authFetch(userKey)); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultGroupWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultGroupWorkflowAdapter.java b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultGroupWorkflowAdapter.java index 5fc683a..041234f 100644 --- a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultGroupWorkflowAdapter.java +++ b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultGroupWorkflowAdapter.java @@ -26,7 +26,6 @@ import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.WorkflowFormTO; import org.apache.syncope.common.lib.types.PropagationByResource; import org.apache.syncope.common.lib.types.ResourceOperation; -import org.apache.syncope.core.persistence.api.dao.NotFoundException; import org.apache.syncope.core.persistence.api.entity.group.Group; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.workflow.api.WorkflowDefinitionFormat; @@ -40,7 +39,7 @@ import org.springframework.transaction.annotation.Transactional; public class DefaultGroupWorkflowAdapter extends AbstractGroupWorkflowAdapter { @Override - public WorkflowResult<Long> create(final GroupTO groupTO) throws WorkflowException { + public WorkflowResult<Long> create(final GroupTO groupTO) { Group group = entityFactory.newEntity(Group.class); dataBinder.create(group, groupTO); group = groupDAO.save(group); @@ -52,9 +51,7 @@ public class DefaultGroupWorkflowAdapter extends AbstractGroupWorkflowAdapter { } @Override - protected WorkflowResult<Long> doUpdate(final Group group, final GroupMod groupMod) - throws WorkflowException { - + protected WorkflowResult<Long> doUpdate(final Group group, final GroupMod groupMod) { PropagationByResource propByRes = dataBinder.update(group, groupMod); Group updated = groupDAO.save(group); @@ -63,35 +60,27 @@ public class DefaultGroupWorkflowAdapter extends AbstractGroupWorkflowAdapter { } @Override - protected void doDelete(final Group group) - throws WorkflowException { - + protected void doDelete(final Group group) { groupDAO.delete(group); } @Override - public WorkflowResult<Long> execute(final GroupTO group, final String taskId) - throws NotFoundException, WorkflowException { - + public WorkflowResult<Long> execute(final GroupTO group, final String taskId) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public void exportDefinition(final WorkflowDefinitionFormat format, final OutputStream os) - throws WorkflowException { - + public void exportDefinition(final WorkflowDefinitionFormat format, final OutputStream os) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public void exportDiagram(final OutputStream os) throws WorkflowException { + public void exportDiagram(final OutputStream os) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public void importDefinition(final WorkflowDefinitionFormat format, final String definition) - throws NotFoundException, WorkflowException { - + public void importDefinition(final WorkflowDefinitionFormat format, final String definition) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @@ -106,23 +95,17 @@ public class DefaultGroupWorkflowAdapter extends AbstractGroupWorkflowAdapter { } @Override - public WorkflowFormTO getForm(final String workflowId) - throws NotFoundException, WorkflowException { - + public WorkflowFormTO getForm(final String workflowId) { return null; } @Override - public WorkflowFormTO claimForm(final String taskId) - throws NotFoundException, WorkflowException { - + public WorkflowFormTO claimForm(final String taskId) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public WorkflowResult<GroupMod> submitForm(final WorkflowFormTO form) - throws NotFoundException, WorkflowException { - + public WorkflowResult<GroupMod> submitForm(final WorkflowFormTO form) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java index 7b92490..6691541 100644 --- a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java +++ b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java @@ -30,7 +30,6 @@ import org.apache.syncope.common.lib.to.WorkflowFormTO; import org.apache.syncope.common.lib.types.PropagationByResource; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.core.persistence.api.dao.ConfDAO; -import org.apache.syncope.core.persistence.api.dao.NotFoundException; import org.apache.syncope.core.persistence.api.entity.user.User; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.workflow.api.WorkflowDefinitionFormat; @@ -48,22 +47,20 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { private ConfDAO confDAO; @Override - public WorkflowResult<Pair<Long, Boolean>> create(UserTO userTO, boolean storePassword) - throws WorkflowException { - + public WorkflowResult<Pair<Long, Boolean>> create(final UserTO userTO, final boolean storePassword) { return create(userTO, false, true); } @Override public WorkflowResult<Pair<Long, Boolean>> create(final UserTO userTO, final boolean disablePwdPolicyCheck, - final boolean storePassword) throws WorkflowException { + final boolean storePassword) { return create(userTO, disablePwdPolicyCheck, null, storePassword); } @Override public WorkflowResult<Pair<Long, Boolean>> create(final UserTO userTO, final boolean disablePwdPolicyCheck, - final Boolean enabled, final boolean storePassword) throws WorkflowException { + final Boolean enabled, final boolean storePassword) { User user = entityFactory.newEntity(User.class); dataBinder.create(user, userTO, storePassword); @@ -97,9 +94,7 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Long> doActivate(final User user, final String token) - throws WorkflowException { - + protected WorkflowResult<Long> doActivate(final User user, final String token) { if (!user.checkToken(token)) { throw new WorkflowException(new IllegalArgumentException("Wrong token: " + token + " for " + user)); } @@ -112,9 +107,7 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Pair<UserMod, Boolean>> doUpdate(final User user, final UserMod userMod) - throws WorkflowException { - + protected WorkflowResult<Pair<UserMod, Boolean>> doUpdate(final User user, final UserMod userMod) { // update password internally only if required UserMod actualMod = SerializationUtils.clone(userMod); if (actualMod.getPwdPropRequest() != null && !actualMod.getPwdPropRequest().isOnSyncope()) { @@ -131,7 +124,7 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Long> doSuspend(final User user) throws WorkflowException { + protected WorkflowResult<Long> doSuspend(final User user) { user.setStatus("suspended"); User updated = userDAO.save(user); @@ -139,7 +132,7 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected WorkflowResult<Long> doReactivate(final User user) throws WorkflowException { + protected WorkflowResult<Long> doReactivate(final User user) { user.setStatus("active"); User updated = userDAO.save(user); @@ -147,7 +140,7 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected void doRequestPasswordReset(final User user) throws WorkflowException { + protected void doRequestPasswordReset(final User user) { user.generateToken( confDAO.find("token.length", "256").getValues().get(0).getLongValue().intValue(), confDAO.find("token.expireTime", "60").getValues().get(0).getLongValue().intValue()); @@ -155,9 +148,7 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected void doConfirmPasswordReset(final User user, final String token, final String password) - throws WorkflowException { - + protected void doConfirmPasswordReset(final User user, final String token, final String password) { if (!user.checkToken(token)) { throw new WorkflowException(new IllegalArgumentException("Wrong token: " + token + " for " + user)); } @@ -168,33 +159,27 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - protected void doDelete(final User user) throws WorkflowException { + protected void doDelete(final User user) { userDAO.delete(user); } @Override - public WorkflowResult<Long> execute(final UserTO userTO, final String taskId) - throws NotFoundException, WorkflowException { - + public WorkflowResult<Long> execute(final UserTO userTO, final String taskId) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public void exportDefinition(final WorkflowDefinitionFormat format, final OutputStream os) - throws WorkflowException { - + public void exportDefinition(final WorkflowDefinitionFormat format, final OutputStream os) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public void exportDiagram(final OutputStream os) throws WorkflowException { + public void exportDiagram(final OutputStream os) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public void importDefinition(final WorkflowDefinitionFormat format, final String definition) - throws NotFoundException, WorkflowException { - + public void importDefinition(final WorkflowDefinitionFormat format, final String definition) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @@ -209,23 +194,17 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter { } @Override - public WorkflowFormTO getForm(final String workflowId) - throws NotFoundException, WorkflowException { - + public WorkflowFormTO getForm(final String workflowId) { return null; } @Override - public WorkflowFormTO claimForm(final String taskId) - throws NotFoundException, WorkflowException { - + public WorkflowFormTO claimForm(final String taskId) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } @Override - public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form) - throws NotFoundException, WorkflowException { - + public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form) { throw new WorkflowException(new UnsupportedOperationException("Not supported.")); } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/deb/console/pom.xml ---------------------------------------------------------------------- diff --git a/deb/console/pom.xml b/deb/console/pom.xml index aba9210..c000457 100644 --- a/deb/console/pom.xml +++ b/deb/console/pom.xml @@ -33,6 +33,10 @@ under the License. <artifactId>syncope-deb-console</artifactId> <packaging>war</packaging> + <properties> + <rootpom.basedir>${basedir}/../..</rootpom.basedir> + </properties> + <dependencies> <dependency> <groupId>org.apache.syncope.ext.camel</groupId> @@ -239,6 +243,17 @@ under the License. </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <id>checkstyle-check</id> + <phase>none</phase> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/deb/core/pom.xml ---------------------------------------------------------------------- diff --git a/deb/core/pom.xml b/deb/core/pom.xml index af667d7..767b6b5 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -33,6 +33,10 @@ under the License. <artifactId>syncope-deb-core</artifactId> <packaging>war</packaging> + <properties> + <rootpom.basedir>${basedir}/../..</rootpom.basedir> + </properties> + <dependencies> <dependency> <groupId>org.apache.syncope.core</groupId> @@ -349,7 +353,18 @@ under the License. </configuration> </execution> </executions> - </plugin> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <id>checkstyle-check</id> + <phase>none</phase> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/deb/pom.xml ---------------------------------------------------------------------- diff --git a/deb/pom.xml b/deb/pom.xml index 9ebf12b..7e2cd11 100644 --- a/deb/pom.xml +++ b/deb/pom.xml @@ -34,6 +34,8 @@ under the License. <packaging>pom</packaging> <properties> + <rootpom.basedir>${basedir}/..</rootpom.basedir> + <debian.dependencies>tomcat8</debian.dependencies> <conf.directory>/etc/apache-syncope</conf.directory> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/client-console/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/client-console/pom.xml b/ext/camel/client-console/pom.xml index 8ee8173..c163e37 100644 --- a/ext/camel/client-console/pom.xml +++ b/ext/camel/client-console/pom.xml @@ -61,10 +61,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> <resources> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRouteModalPage.java ---------------------------------------------------------------------- diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRouteModalPage.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRouteModalPage.java index 07c4021..301c310 100644 --- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRouteModalPage.java +++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRouteModalPage.java @@ -64,7 +64,7 @@ public class CamelRouteModalPage extends BaseModalPage { restClient.update(routeTO.getKey(), ((CamelRouteTO) form.getModelObject()).getContent()); info(getString(Constants.OPERATION_SUCCEEDED)); - // TODO: SYNCOPE-120 + // Uncomment with something similar once SYNCOPE-156 is completed // Configuration callerPage = (Configuration) pageRef.getPage(); // callerPage.setModalResult(true); window.close(target); http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutePanel.java ---------------------------------------------------------------------- diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutePanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutePanel.java index 570ae40..eb3effe 100644 --- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutePanel.java +++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutePanel.java @@ -84,7 +84,7 @@ public class CamelRoutePanel extends AbstractExtensionPanel { public void populateItem(final Item<ICellPopulator<CamelRouteTO>> cellItem, final String componentId, final IModel<CamelRouteTO> model) { - // TODO: SYNCOPE-120 + // Uncomment with something similar once SYNCOPE-156 is completed /*final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageref); panel.add(new ActionLink() { http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/common-lib/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/common-lib/pom.xml b/ext/camel/common-lib/pom.xml index db81565..dea04c7 100644 --- a/ext/camel/common-lib/pom.xml +++ b/ext/camel/common-lib/pom.xml @@ -51,10 +51,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/logic/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/logic/pom.xml b/ext/camel/logic/pom.xml index 025ba02..bc8182a 100644 --- a/ext/camel/logic/pom.xml +++ b/ext/camel/logic/pom.xml @@ -56,10 +56,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/CamelRouteLogic.java ---------------------------------------------------------------------- diff --git a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/CamelRouteLogic.java b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/CamelRouteLogic.java index c96c3f0..19437ab 100644 --- a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/CamelRouteLogic.java +++ b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/CamelRouteLogic.java @@ -21,6 +21,7 @@ package org.apache.syncope.core.logic; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.ArrayUtils; import org.apache.syncope.common.lib.to.CamelRouteTO; import org.apache.syncope.common.lib.types.Entitlement; import org.apache.syncope.common.lib.types.SubjectType; @@ -87,7 +88,30 @@ public class CamelRouteLogic extends AbstractTransactionalLogic<CamelRouteTO> { } @Override - protected CamelRouteTO resolveReference(Method method, Object... args) throws UnresolvedReferenceException { + protected CamelRouteTO resolveReference(final Method method, final Object... args) + throws UnresolvedReferenceException { + + String key = null; + + if (ArrayUtils.isNotEmpty(args)) { + for (int i = 0; key == null && i < args.length; i++) { + if (args[i] instanceof String) { + key = (String) args[i]; + } else if (args[i] instanceof CamelRouteTO) { + key = ((CamelRouteTO) args[i]).getKey(); + } + } + } + + if (key != null) { + try { + return binder.getRouteTO(routeDAO.find(key)); + } catch (Throwable ignore) { + LOG.debug("Unresolved reference", ignore); + throw new UnresolvedReferenceException(ignore); + } + } + throw new UnresolvedReferenceException(); } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/persistence-api/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/persistence-api/pom.xml b/ext/camel/persistence-api/pom.xml index ab3acfb..6220f08 100644 --- a/ext/camel/persistence-api/pom.xml +++ b/ext/camel/persistence-api/pom.xml @@ -51,10 +51,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/CamelRouteDAO.java ---------------------------------------------------------------------- diff --git a/ext/camel/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/CamelRouteDAO.java b/ext/camel/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/CamelRouteDAO.java index dbec544..cbafcb4 100644 --- a/ext/camel/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/CamelRouteDAO.java +++ b/ext/camel/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/CamelRouteDAO.java @@ -20,7 +20,6 @@ package org.apache.syncope.core.persistence.api.dao; import java.util.List; import org.apache.syncope.common.lib.types.SubjectType; -import org.apache.syncope.core.persistence.api.attrvalue.validation.InvalidEntityException; import org.apache.syncope.core.persistence.api.entity.CamelRoute; public interface CamelRouteDAO extends DAO<CamelRoute, String> { @@ -31,7 +30,7 @@ public interface CamelRouteDAO extends DAO<CamelRoute, String> { List<CamelRoute> findAll(); - CamelRoute save(CamelRoute route) throws InvalidEntityException; + CamelRoute save(CamelRoute route); void delete(String key); } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/persistence-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/persistence-jpa/pom.xml b/ext/camel/persistence-jpa/pom.xml index f738c70..4dfece3 100644 --- a/ext/camel/persistence-jpa/pom.xml +++ b/ext/camel/persistence-jpa/pom.xml @@ -89,10 +89,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> <testResources> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPACamelRouteDAO.java ---------------------------------------------------------------------- diff --git a/ext/camel/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPACamelRouteDAO.java b/ext/camel/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPACamelRouteDAO.java index 5f17b1e..6137015 100644 --- a/ext/camel/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPACamelRouteDAO.java +++ b/ext/camel/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPACamelRouteDAO.java @@ -21,7 +21,6 @@ package org.apache.syncope.core.persistence.jpa.dao; import java.util.List; import javax.persistence.TypedQuery; import org.apache.syncope.common.lib.types.SubjectType; -import org.apache.syncope.core.persistence.api.attrvalue.validation.InvalidEntityException; import org.apache.syncope.core.persistence.api.dao.CamelRouteDAO; import org.apache.syncope.core.persistence.api.entity.CamelRoute; import org.apache.syncope.core.persistence.jpa.entity.JPACamelRoute; @@ -56,7 +55,7 @@ public class JPACamelRouteDAO extends AbstractDAO<CamelRoute, String> implements } @Override - public CamelRoute save(final CamelRoute route) throws InvalidEntityException { + public CamelRoute save(final CamelRoute route) { return entityManager.merge(route); } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/pom.xml b/ext/camel/pom.xml index 3cee0b9..638a19d 100644 --- a/ext/camel/pom.xml +++ b/ext/camel/pom.xml @@ -33,6 +33,10 @@ under the License. <artifactId>syncope-ext-camel</artifactId> <packaging>pom</packaging> + <properties> + <rootpom.basedir>${basedir}/../..</rootpom.basedir> + </properties> + <modules> <module>persistence-api</module> <module>persistence-jpa</module> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/provisioning-api/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-api/pom.xml b/ext/camel/provisioning-api/pom.xml index 3d108b4..308ed4e 100644 --- a/ext/camel/provisioning-api/pom.xml +++ b/ext/camel/provisioning-api/pom.xml @@ -62,10 +62,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/provisioning-camel/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/pom.xml b/ext/camel/provisioning-camel/pom.xml index 9ffa877..3e7f41d 100644 --- a/ext/camel/provisioning-camel/pom.xml +++ b/ext/camel/provisioning-camel/pom.xml @@ -69,10 +69,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java index e3b798a..516e798 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java @@ -83,7 +83,7 @@ abstract class AbstractCamelProvisioningManager { template.send(uri, exchange); } - protected PollingConsumer getConsumer(String uri) { + protected PollingConsumer getConsumer(final String uri) { if (!knownURIs.contains(uri)) { knownURIs.add(uri); Endpoint endpoint = getContext().getEndpoint(uri); http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java index 13a69a1..7c132a1 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java @@ -31,7 +31,6 @@ import org.apache.syncope.common.lib.mod.GroupMod; import org.apache.syncope.common.lib.to.PropagationStatus; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.core.provisioning.api.GroupProvisioningManager; -import org.apache.syncope.core.provisioning.api.propagation.PropagationException; public class CamelGroupProvisioningManager extends AbstractCamelProvisioningManager implements GroupProvisioningManager { @@ -63,7 +62,7 @@ public class CamelGroupProvisioningManager @Override @SuppressWarnings("unchecked") public Pair<Long, List<PropagationStatus>> create(final GroupTO groupTO, final Map<Long, String> groupOwnerMap, - final Set<String> excludedResources) throws PropagationException { + final Set<String> excludedResources) { PollingConsumer pollingConsumer = getConsumer("direct:createGroupInSyncPort"); @@ -156,7 +155,7 @@ public class CamelGroupProvisioningManager @Override @SuppressWarnings("unchecked") - public List<PropagationStatus> deprovision(final Long groupKey, Collection<String> resources) { + public List<PropagationStatus> deprovision(final Long groupKey, final Collection<String> resources) { PollingConsumer pollingConsumer = getConsumer("direct:deprovisionGroupPort"); Map<String, Object> props = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java index f8b076a..4c04147 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java @@ -51,14 +51,14 @@ public class CamelUserProvisioningManager extends AbstractCamelProvisioningManag } @Override - public Pair<Long, List<PropagationStatus>> create(final UserTO userTO, boolean storePassword) { + public Pair<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword) { return create(userTO, storePassword, false, null, Collections.<String>emptySet()); } @Override @SuppressWarnings("unchecked") public Pair<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword, - boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources) { + final boolean disablePwdPolicyCheck, final Boolean enabled, final Set<String> excludedResources) { PollingConsumer pollingConsumer = getConsumer("direct:createPort"); @@ -86,7 +86,7 @@ public class CamelUserProvisioningManager extends AbstractCamelProvisioningManag @Override @SuppressWarnings("unchecked") - public Pair<Long, List<PropagationStatus>> update(UserMod userMod, boolean removeMemberships) { + public Pair<Long, List<PropagationStatus>> update(final UserMod userMod, final boolean removeMemberships) { PollingConsumer pollingConsumer = getConsumer("direct:updatePort"); Map<String, Object> props = new HashMap<>(); @@ -275,12 +275,12 @@ public class CamelUserProvisioningManager extends AbstractCamelProvisioningManag Exchange exchange = pollingConsumer.receive(); - Exception e; - if ((e = (Exception) exchange.getProperty(Exchange.EXCEPTION_CAUGHT)) != null) { - LOG.error("Update of user {} failed, trying to sync its status anyway (if configured)", key, e); + Exception ex = (Exception) exchange.getProperty(Exchange.EXCEPTION_CAUGHT); + if (ex != null) { + LOG.error("Update of user {} failed, trying to sync its status anyway (if configured)", key, ex); result.setStatus(ProvisioningResult.Status.FAILURE); - result.setMessage("Update failed, trying to sync status anyway (if configured)\n" + e.getMessage()); + result.setMessage("Update failed, trying to sync status anyway (if configured)\n" + ex.getMessage()); WorkflowResult<Pair<UserMod, Boolean>> updated = new WorkflowResult<Pair<UserMod, Boolean>>( new ImmutablePair<>(userMod, false), new PropagationByResource(), http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/rest-api/pom.xml b/ext/camel/rest-api/pom.xml index a2b2397..d1d72fb 100644 --- a/ext/camel/rest-api/pom.xml +++ b/ext/camel/rest-api/pom.xml @@ -56,10 +56,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/camel/rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/rest-cxf/pom.xml b/ext/camel/rest-cxf/pom.xml index ad12443..bf17bb6 100644 --- a/ext/camel/rest-cxf/pom.xml +++ b/ext/camel/rest-cxf/pom.xml @@ -61,10 +61,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/ext/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pom.xml b/ext/pom.xml index cecf9a4..7579cc8 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -33,6 +33,10 @@ under the License. <artifactId>syncope-ext</artifactId> <packaging>pom</packaging> + <properties> + <rootpom.basedir>${basedir}/..</rootpom.basedir> + </properties> + <modules> <module>camel</module> </modules> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/fit/build-tools/pom.xml ---------------------------------------------------------------------- diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml index 39b78cd..bfae2f4 100644 --- a/fit/build-tools/pom.xml +++ b/fit/build-tools/pom.xml @@ -122,10 +122,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ConnIdStartStopListener.java ---------------------------------------------------------------------- diff --git a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ConnIdStartStopListener.java b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ConnIdStartStopListener.java index dece02f..37adbd3 100644 --- a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ConnIdStartStopListener.java +++ b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ConnIdStartStopListener.java @@ -35,9 +35,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils; public class ConnIdStartStopListener implements ServletContextListener { - /** - * Logger. - */ private static final Logger LOG = LoggerFactory.getLogger(ConnIdStartStopListener.class); private static final String SERVER = "ConnIdConnectorServer"; @@ -75,30 +72,30 @@ public class ConnIdStartStopListener implements ServletContextListener { @Override public void contextInitialized(final ServletContextEvent sce) { - ConnectorServer _server = ConnectorServer.newInstance(); + ConnectorServer server = ConnectorServer.newInstance(); WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(sce.getServletContext()); try { - _server.setPort(Integer.parseInt(ctx.getBean("testconnectorserver.port", String.class))); + server.setPort(Integer.parseInt(ctx.getBean("testconnectorserver.port", String.class))); - _server.setBundleURLs(getBundleURLs(sce.getServletContext())); + server.setBundleURLs(getBundleURLs(sce.getServletContext())); - _server.setKeyHash(SecurityUtil.computeBase64SHA1Hash( + server.setKeyHash(SecurityUtil.computeBase64SHA1Hash( ctx.getBean("testconnectorserver.key", String.class).toCharArray())); - _server.start(); - LOG.info("ConnId connector server listening on port " + _server.getPort()); + server.start(); + LOG.info("ConnId connector server listening on port " + server.getPort()); } catch (Exception e) { LOG.error("Could not start ConnId connector server", e); } - sce.getServletContext().setAttribute(SERVER, _server); + sce.getServletContext().setAttribute(SERVER, server); } @Override public void contextDestroyed(final ServletContextEvent sce) { - final ConnectorServer _server = (ConnectorServer) sce.getServletContext().getAttribute(SERVER); - if (_server != null && _server.isStarted()) { - _server.stop(); + final ConnectorServer server = (ConnectorServer) sce.getServletContext().getAttribute(SERVER); + if (server != null && server.isStarted()) { + server.stop(); } ThreadClassLoaderManager.clearInstance(); } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/fit/console-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index df4403b..c2785ac 100644 --- a/fit/console-reference/pom.xml +++ b/fit/console-reference/pom.xml @@ -277,10 +277,9 @@ ORYX.Editor.createByUrl = function(modelUrl){"/> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <resourceIncludes>src/main/resources/**/*.properties</resourceIncludes> + </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 0d867f2..d9716ec 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -290,11 +290,10 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <resourceIncludes>src/main/resources/**/*.properties</resourceIncludes> + </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java index 89a8447..bc4d407 100644 --- a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java +++ b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java @@ -44,9 +44,9 @@ public class TestSyncActions extends DefaultSyncActions { AttrTO attrTO = null; for (int i = 0; i < subject.getPlainAttrs().size(); i++) { - AttrTO _attrTO = CollectionUtils.get(subject.getPlainAttrs(), i); - if ("fullname".equals(_attrTO.getSchema())) { - attrTO = _attrTO; + AttrTO plainAttr = CollectionUtils.get(subject.getPlainAttrs(), i); + if ("fullname".equals(plainAttr.getSchema())) { + attrTO = plainAttr; } } if (attrTO == null) { http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index 959ef03..f070c29 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -33,6 +33,10 @@ under the License. <artifactId>syncope-fit</artifactId> <packaging>pom</packaging> + <properties> + <rootpom.basedir>${basedir}/..</rootpom.basedir> + </properties> + <modules> <module>build-tools</module> <module>core-reference</module> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/pom.xml ---------------------------------------------------------------------- diff --git a/installer/pom.xml b/installer/pom.xml index 5dabca4..0012bc5 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -35,6 +35,8 @@ under the License. <packaging>jar</packaging> <properties> + <rootpom.basedir>${basedir}/..</rootpom.basedir> + <staging.dir>${project.build.directory}/staging</staging.dir> </properties> @@ -165,10 +167,9 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <includeResources>false</includeResources> + </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java b/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java index 56b68ed..af8af5f 100644 --- a/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java +++ b/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java @@ -74,7 +74,9 @@ public class Tomcat extends AbstractContainer { try { path = URLEncoder.encode(what, "UTF-8"); } catch (UnsupportedEncodingException uee) { + // ignore } + return path; } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java b/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java index c0e6722..24b193e 100644 --- a/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java +++ b/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java @@ -44,12 +44,14 @@ public class JBoss extends AbstractContainer { public JBoss(final boolean jbossSsl, final String jbossHost, final String jbossManagementPort, final String jbossAdminUsername, final String jbossAdminPassword, final String installPath, final String artifactId, final AbstractUIProcessHandler handler) { + this.jbossSsl = jbossSsl; this.jbossHost = jbossHost; this.jbossManagementPort = jbossManagementPort; this.installPath = installPath; this.artifactId = artifactId; - httpUtils = new HttpUtils(jbossSsl, jbossHost, jbossManagementPort, jbossAdminUsername, jbossAdminPassword, handler); + this.httpUtils = new HttpUtils( + jbossSsl, jbossHost, jbossManagementPort, jbossAdminUsername, jbossAdminPassword, handler); } @@ -69,7 +71,7 @@ public class JBoss extends AbstractContainer { final JBossAddResponse jBossAddResponse = JsonUtils.jBossAddResponse(responseBodyAsString); final JBossDeployRequestContent jBossDeployRequestContent = new JBossDeployRequestContent( - jBossAddResponse.getResult().getBYTES_VALUE(), warName); + jBossAddResponse.getResult().getBytesValue(), warName); int status = httpUtils. postWithStringEntity(String.format(enableUrl, jbossHost, jbossManagementPort), http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossAddResponse.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossAddResponse.java b/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossAddResponse.java index 48ee621..fd1056d 100644 --- a/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossAddResponse.java +++ b/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossAddResponse.java @@ -22,42 +22,44 @@ public class JBossAddResponse { public class JBossBytesValue { - public String BYTES_VALUE; + private String bytesValue; public JBossBytesValue() { + // default } - public JBossBytesValue(String BYTES_VALUE) { - this.BYTES_VALUE = BYTES_VALUE; + public JBossBytesValue(final String bytesValue) { + this.bytesValue = bytesValue; } - public String getBYTES_VALUE() { - return BYTES_VALUE; + public String getBytesValue() { + return bytesValue; } - public void setBYTES_VALUE(String BYTES_VALUE) { - this.BYTES_VALUE = BYTES_VALUE; + public void setBytesValue(final String bytesValue) { + this.bytesValue = bytesValue; } } - public String outcome; + private String outcome; - public JBossBytesValue result; + private JBossBytesValue result; public JBossAddResponse() { + // default } - public JBossAddResponse(String outcome, JBossBytesValue result) { + public JBossAddResponse(final String outcome, final JBossBytesValue result) { this.outcome = outcome; this.result = result; } - public void setOutcome(String outcome) { + public void setOutcome(final String outcome) { this.outcome = outcome; } - public void setResult(JBossBytesValue result) { + public void setResult(final JBossBytesValue result) { this.result = result; } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossDeployRequestContent.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossDeployRequestContent.java b/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossDeployRequestContent.java index 4775cfa..89d15e0 100644 --- a/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossDeployRequestContent.java +++ b/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBossDeployRequestContent.java @@ -20,13 +20,13 @@ package org.apache.syncope.installer.containers.jboss; public class JBossDeployRequestContent { - public final JBossDeployRequest[] content = new JBossDeployRequest[1]; + private final JBossDeployRequest[] content = new JBossDeployRequest[1]; - public final JBossDeployment[] address = new JBossDeployment[1]; + private final JBossDeployment[] address = new JBossDeployment[1]; - public final String operation = "add"; + private final String operation = "add"; - public final String enabled = "true"; + private final String enabled = "true"; public JBossDeployRequestContent(final String hash, final String address) { this.content[0] = new JBossDeployRequest(hash); @@ -35,7 +35,7 @@ public class JBossDeployRequestContent { public class JBossDeployRequest { - public JBossBytesValue hash; + private JBossBytesValue hash; public JBossBytesValue getHash() { return hash; @@ -48,18 +48,18 @@ public class JBossDeployRequestContent { public class JBossBytesValue { - public String BYTES_VALUE; + private String bytesValue; - public JBossBytesValue(final String BYTES_VALUE) { - this.BYTES_VALUE = BYTES_VALUE; + public JBossBytesValue(final String bytesValue) { + this.bytesValue = bytesValue; } } public class JBossDeployment { - public String deployment; + private String deployment; - public JBossDeployment(String deployment) { + public JBossDeployment(final String deployment) { this.deployment = deployment; } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/files/ConsoleProperties.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/ConsoleProperties.java b/installer/src/main/java/org/apache/syncope/installer/files/ConsoleProperties.java index d6d2deb..5298908 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/ConsoleProperties.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/ConsoleProperties.java @@ -18,7 +18,7 @@ */ package org.apache.syncope.installer.files; -public class ConsoleProperties { +public final class ConsoleProperties { public static final String PLACEHOLDER = "scheme=http\n" + "host=localhost\n" @@ -28,4 +28,7 @@ public class ConsoleProperties { + "host=%s\n" + "port=%s"; + private ConsoleProperties() { + // private constructor for static utility class + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/files/GlassfishCoreWebXml.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/GlassfishCoreWebXml.java b/installer/src/main/java/org/apache/syncope/installer/files/GlassfishCoreWebXml.java index 9eadedd..f9a99df 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/GlassfishCoreWebXml.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/GlassfishCoreWebXml.java @@ -18,7 +18,7 @@ */ package org.apache.syncope.installer.files; -public class GlassfishCoreWebXml { +public final class GlassfishCoreWebXml { public static final String PLACEHOLDER = " <!--<resource-ref>\n" + " <res-ref-name>jdbc/syncopeDataSource</res-ref-name>\n" @@ -27,7 +27,10 @@ public class GlassfishCoreWebXml { public static final String DATA_SOURCE = " <resource-ref>\n" + " <res-ref-name>jdbc/syncopeDataSource</res-ref-name>\n" - + " <jndi-name>jdbc/syncopeDataSource</jndi-name>\n" + + " <jndi-name>jdbc/syncopeDataSource</jndi-name>\n" + " </resource-ref>"; + private GlassfishCoreWebXml() { + // private constructor for static utility class + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/files/JBossDeploymentStructureXml.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/JBossDeploymentStructureXml.java b/installer/src/main/java/org/apache/syncope/installer/files/JBossDeploymentStructureXml.java index 1d70e36..9e3da5f 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/JBossDeploymentStructureXml.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/JBossDeploymentStructureXml.java @@ -18,11 +18,14 @@ */ package org.apache.syncope.installer.files; -public class JBossDeploymentStructureXml { - +public final class JBossDeploymentStructureXml { + public static final String PLACEHOLDER = "<module name=\"org.apache.xalan\"/>"; public static final String JBOSSMODULE = "<module name=\"org.apache.xalan\"/>\n" + "<module name=\"%s\"/>"; + private JBossDeploymentStructureXml() { + // private constructor for static utility class + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java b/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java index 49c05f3..4653224 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java @@ -18,8 +18,8 @@ */ package org.apache.syncope.installer.files; -public class ParentPom { - +public final class ParentPom { + public static final String PLACEHOLDER = "</project>"; public static final String REPOSITORY = @@ -34,4 +34,7 @@ public class ParentPom { + "</repositories>\n" + "</project>\n"; + private ParentPom() { + // private constructor for static utility class + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java index a64ea36..876f0db 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java @@ -18,7 +18,7 @@ */ package org.apache.syncope.installer.files; -public class PersistenceContextEMFactoryXml { +public final class PersistenceContextEMFactoryXml { public static final String PLACEHOLDER = "<entry key=\"openjpa.MetaDataFactory\"\n" + " value=\"jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly8x/" @@ -28,4 +28,7 @@ public class PersistenceContextEMFactoryXml { "<entry key=\"openjpa.MetaDataFactory\" value=\"jpa(URLs=vfs:/content/${project.build.finalName}.war/" + "WEB-INF/classes/, Resources=META-INF/orm.xml)\"/>"; + private PersistenceContextEMFactoryXml() { + // private constructor for static utility class + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java index 00d7a41..769722f 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java @@ -18,7 +18,7 @@ */ package org.apache.syncope.installer.files; -public class PersistenceProperties { +public final class PersistenceProperties { public static final String HEADER = "# Licensed to the Apache Software Foundation (ASF) under one\n" + "# or more contributor license agreements. See the NOTICE file\n" @@ -70,7 +70,7 @@ public class PersistenceProperties { + "quartz.sql=tables_mariadb.sql\n" + "audit.sql=audit.sql\n" + "database.schema=\n"; - + public static final String ORACLE = "" + "jpa.driverClassName=oracle.jdbc.OracleDriver\n" + "jpa.url=%s\n" @@ -90,18 +90,21 @@ public class PersistenceProperties { + "jpa.url=%s\n" + "jpa.username=%s\n" + "jpa.password=%s\n" - + "jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary\n" + + "jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary\n" + "jpa.pool.validationQuery=SELECT 1\n" + "jpa.orm=META-INF/spring-orm-sqlserver.xml\n" + "#note: other connection pool settings can also be configured here, see persistenceContext.xml\n" - + "quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate\n" + + "quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate\n" + "quartz.scheduler.idleWaitTime=5000\n" - + "quartz.sql=tables_sqlServer.sql\n" - + "audit.sql=audit_sqlserver.sql\n" + + "quartz.sql=tables_sqlServer.sql\n" + + "audit.sql=audit_sqlserver.sql\n" + "database.schema="; public static final String MYSQL_QUARTZ_INNO_DB = "quartz.sql=tables_mysql_innodb.sql"; public static final String MYSQL_QUARTZ = "quartz.sql=tables_mysql.sql"; + private PersistenceProperties() { + // private constructor for static utility class + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java index f772c8b..7176dd6 100644 --- a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java +++ b/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java @@ -101,7 +101,7 @@ public class ArchetypeProcess extends BaseProcess { if (syncopeVersion.contains("SNAPSHOT")) { final File pomFile = - new File(syncopeInstallDir + properties.getProperty("pomFile")); + new File(syncopeInstallDir + PROPERTIES.getProperty("pomFile")); String contentPomFile = fileSystemUtils.readFile(pomFile); fileSystemUtils.writeToFile(pomFile, contentPomFile.replace(ParentPom.PLACEHOLDER, ParentPom.REPOSITORY)); } @@ -111,19 +111,19 @@ public class ArchetypeProcess extends BaseProcess { fileSystemUtils.createDirectory(bundlesDirectory); fileSystemUtils.createDirectory(modelerDirectory); - fileSystemUtils.copyFileFromResources("/" + properties.getProperty("modelerPomFile"), - modelerDirectory + "/" + properties.getProperty("pomFile"), handler); + fileSystemUtils.copyFileFromResources("/" + PROPERTIES.getProperty("modelerPomFile"), + modelerDirectory + "/" + PROPERTIES.getProperty("pomFile"), handler); fileSystemUtils.copyFile( syncopeInstallDir - + properties.getProperty("consoleResDirectory") - + "/" + properties.getProperty("urlConfig"), - modelerDirectory + "/" + properties.getProperty("urlConfig")); + + PROPERTIES.getProperty("consoleResDirectory") + + "/" + PROPERTIES.getProperty("urlConfig"), + modelerDirectory + "/" + PROPERTIES.getProperty("urlConfig")); fileSystemUtils.copyFile( syncopeInstallDir - + properties.getProperty("consoleResDirectory") - + "/" + properties.getProperty("saveModel"), - modelerDirectory + "/" + properties.getProperty("saveModel")); + + PROPERTIES.getProperty("consoleResDirectory") + + "/" + PROPERTIES.getProperty("saveModel"), + modelerDirectory + "/" + PROPERTIES.getProperty("saveModel")); final Properties modelerProperties = new Properties(); modelerProperties.setProperty("modeler.directory", modelerDirectory); http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java index e11ef54..01dd3c7 100644 --- a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java +++ b/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java @@ -18,7 +18,7 @@ */ package org.apache.syncope.installer.processes; -import static org.apache.syncope.installer.processes.ArchetypeProcess.properties; +import static org.apache.syncope.installer.processes.ArchetypeProcess.PROPERTIES; import java.io.IOException; import java.io.InputStream; @@ -27,28 +27,31 @@ import org.apache.commons.io.IOUtils; public class BaseProcess { - protected final static Properties properties = new Properties(); + protected static final Properties PROPERTIES = new Properties(); protected String syncopeInstallDir; - private static InputStream is = null; - static { + InputStream input = null; try { - is = BaseProcess.class.getResourceAsStream("/installer.properties"); - properties.load(is); - } catch (final IOException e) { + input = BaseProcess.class.getResourceAsStream("/installer.properties"); + PROPERTIES.load(input); + } catch (IOException e) { + // ignore } finally { - IOUtils.closeQuietly(is); + IOUtils.closeQuietly(input); } } protected void setSyncopeInstallDir(final String installPath, final String artifactId) { - final StringBuilder path = new StringBuilder(); - path.append(installPath); - path.append("/"); - path.append(artifactId); - path.append("/"); - syncopeInstallDir = path.toString(); + syncopeInstallDir = new StringBuilder(). + append(installPath). + append("/"). + append(artifactId). + append("/").toString(); + } + + protected BaseProcess() { + // protected constructor for static utility class } }
