You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/05/06 10:37:57 UTC
[4/4] syncope git commit: [SYNCOPE-657] Checkstyle enabled in all
profiles but skipTests
[SYNCOPE-657] Checkstyle enabled in all profiles but skipTests
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/62193429
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/62193429
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/62193429
Branch: refs/heads/master
Commit: 62193429f899535bbd55490f1d38a41e4ffbb7ac
Parents: 3fc2f96
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed May 6 10:37:42 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed May 6 10:37:42 2015 +0200
----------------------------------------------------------------------
archetype/pom.xml | 11 ++-
client/cli/pom.xml | 11 ++-
.../apache/syncope/client/cli/SyncopeAdm.java | 58 +++++++-------
.../syncope/client/cli/SyncopeServices.java | 2 +-
.../cli/commands/ConfigurationCommand.java | 18 ++---
.../client/cli/commands/LoggerCommand.java | 6 +-
.../cli/commands/NotificationCommand.java | 4 +-
.../client/cli/commands/PolicyCommand.java | 8 +-
.../client/cli/commands/ReportCommand.java | 18 ++---
.../syncope/client/cli/util/XMLUtils.java | 49 ++++++++++++
.../syncope/client/cli/util/XmlUtils.java | 47 ------------
.../cli/validators/DebugLevelValidator.java | 3 +-
client/console/pom.xml | 4 -
.../console/annotations/BinaryPreview.java | 2 +-
.../console/annotations/ExtensionPanel.java | 2 +-
.../SortableAttributableProviderComparator.java | 2 +-
.../console/commons/status/StatusBean.java | 2 +-
.../client/console/init/ConsoleInitializer.java | 3 +-
.../client/console/panels/ImagePanel.java | 2 +-
.../html/form/AjaxDropDownChoicePanel.java | 8 +-
.../wicket/markup/html/form/FieldPanel.java | 6 +-
.../markup/html/form/MultiFieldPanel.java | 18 ++---
.../console/pages/BaseModalPage.properties | 2 +-
.../console/pages/BaseModalPage_it.properties | 2 +-
.../pages/BaseModalPage_pt_BR.properties | 2 +-
.../pages/XMLEditorPopupPage_pt_BR.properties | 2 +-
client/lib/pom.xml | 6 +-
.../client/lib/RestClientExceptionMapper.java | 14 ++--
client/old_console/pom.xml | 4 -
.../client/console/commons/JexlHelpUtils.java | 2 -
client/pom.xml | 4 +
common/lib/pom.xml | 4 -
.../syncope/common/lib/to/AbstractPolicyTO.java | 2 +
.../syncope/common/lib/types/Entitlement.java | 9 ++-
common/rest-api/pom.xml | 4 -
.../rest/api/service/UserSelfService.java | 4 +-
core/logic/pom.xml | 4 -
.../syncope/core/logic/ConnectorLogic.java | 2 +-
.../apache/syncope/core/logic/GroupLogic.java | 2 +-
.../apache/syncope/core/logic/LoggerLogic.java | 7 +-
.../apache/syncope/core/logic/ReportLogic.java | 2 +-
.../syncope/core/logic/WorkflowLogic.java | 24 ++----
.../logic/audit/AuditConnectionFactory.java | 16 ++--
.../init/ImplementationClassNamesLoader.java | 4 +-
.../core/logic/init/LogicInitializer.java | 3 +-
.../core/logic/report/AbstractReportlet.java | 8 +-
.../core/logic/report/GroupReportlet.java | 6 +-
.../syncope/core/logic/report/Reportlet.java | 3 +-
.../core/logic/report/StaticReportlet.java | 3 +-
.../core/logic/report/TextSerializer.java | 18 -----
.../core/logic/report/UserReportlet.java | 6 +-
core/misc/pom.xml | 4 -
.../apache/syncope/core/misc/AuditManager.java | 5 +-
.../syncope/core/misc/ConnObjectUtils.java | 1 -
.../core/misc/security/PasswordGenerator.java | 7 +-
.../spring/DefaultRolesPrefixPostProcessor.java | 5 +-
core/persistence-api/pom.xml | 4 -
core/persistence-jpa/pom.xml | 4 -
.../attrvalue/validation/AbstractValidator.java | 11 +--
.../validation/AlwaysTrueValidator.java | 2 +-
.../attrvalue/validation/BasicValidator.java | 2 +-
.../validation/EmailAddressValidator.java | 2 +-
.../jpa/content/ContentLoaderHandler.java | 4 +-
.../jpa/content/MultiParentNodeOp.java | 2 +-
.../jpa/content/XMLContentExporter.java | 6 +-
.../persistence/jpa/dao/AbstractSubjectDAO.java | 5 +-
.../persistence/jpa/dao/JPANotificationDAO.java | 3 +-
.../core/persistence/jpa/dao/JPAReportDAO.java | 3 +-
.../persistence/jpa/dao/JPAReportExecDAO.java | 4 +-
.../jpa/dao/JPASecurityQuestionDAO.java | 3 +-
.../persistence/jpa/dao/JPATaskExecDAO.java | 6 +-
.../core/persistence/jpa/dao/SearchSupport.java | 12 +--
.../persistence/jpa/entity/AbstractExec.java | 12 +--
.../jpa/entity/AbstractPlainAttr.java | 6 +-
.../jpa/entity/AbstractPlainAttrValue.java | 2 +-
.../jpa/entity/JPAExternalResource.java | 2 +-
.../entity/task/AbstractProvisioningTask.java | 2 +-
.../persistence/jpa/entity/user/JPAUser.java | 2 -
.../jpa/validation/entity/PlainAttrCheck.java | 2 +-
.../jpa/validation/entity/UserCheck.java | 3 +-
.../src/test/resources/simplelogger.properties | 3 +-
core/provisioning-api/pom.xml | 4 -
core/provisioning-java/pom.xml | 4 -
.../data/AbstractAttributableDataBinder.java | 7 +-
.../java/data/PolicyDataBinderImpl.java | 33 ++++----
.../java/data/UserDataBinderImpl.java | 3 +-
.../provisioning/java/job/AbstractTaskJob.java | 2 -
.../notification/NotificationManagerImpl.java | 2 +-
.../SpringVelocityResourceLoader.java | 4 +-
.../notification/VelocityEngineFactoryBean.java | 5 +-
.../LDAPPasswordPropagationActions.java | 2 +-
.../propagation/PropagationManagerImpl.java | 47 ++++--------
.../java/sync/AbstractProvisioningJob.java | 6 +-
.../java/sync/AbstractPushResultHandler.java | 1 -
.../java/sync/AbstractSyncResultHandler.java | 55 +++++++-------
.../java/sync/GroupSyncResultHandlerImpl.java | 6 +-
.../provisioning/java/sync/PushJobImpl.java | 4 +-
.../provisioning/java/sync/SyncJobImpl.java | 6 +-
core/rest-cxf/pom.xml | 4 -
.../rest/cxf/RestServiceExceptionMapper.java | 3 +-
.../rest/cxf/service/AbstractServiceImpl.java | 1 -
core/workflow-activiti/pom.xml | 4 -
.../activiti/ActivitiUserWorkflowAdapter.java | 63 +++++----------
.../activiti/SyncopeGroupQueryImpl.java | 1 +
.../workflow/activiti/SyncopeUserQueryImpl.java | 1 +
core/workflow-api/pom.xml | 4 -
core/workflow-java/pom.xml | 4 -
.../java/AbstractGroupWorkflowAdapter.java | 13 +---
.../java/AbstractUserWorkflowAdapter.java | 41 ++++------
.../java/DefaultGroupWorkflowAdapter.java | 37 +++------
.../java/DefaultUserWorkflowAdapter.java | 55 +++++---------
deb/console/pom.xml | 15 ++++
deb/core/pom.xml | 17 ++++-
deb/pom.xml | 2 +
ext/camel/client-console/pom.xml | 4 -
.../console/pages/CamelRouteModalPage.java | 2 +-
.../client/console/panels/CamelRoutePanel.java | 2 +-
ext/camel/common-lib/pom.xml | 4 -
ext/camel/logic/pom.xml | 4 -
.../syncope/core/logic/CamelRouteLogic.java | 26 ++++++-
ext/camel/persistence-api/pom.xml | 4 -
.../core/persistence/api/dao/CamelRouteDAO.java | 3 +-
ext/camel/persistence-jpa/pom.xml | 4 -
.../persistence/jpa/dao/JPACamelRouteDAO.java | 3 +-
ext/camel/pom.xml | 4 +
ext/camel/provisioning-api/pom.xml | 4 -
ext/camel/provisioning-camel/pom.xml | 4 -
.../camel/AbstractCamelProvisioningManager.java | 2 +-
.../camel/CamelGroupProvisioningManager.java | 5 +-
.../camel/CamelUserProvisioningManager.java | 14 ++--
ext/camel/rest-api/pom.xml | 4 -
ext/camel/rest-cxf/pom.xml | 4 -
ext/pom.xml | 4 +
fit/build-tools/pom.xml | 4 -
.../fit/buildtools/ConnIdStartStopListener.java | 23 +++---
fit/console-reference/pom.xml | 7 +-
fit/core-reference/pom.xml | 7 +-
.../fit/core/reference/TestSyncActions.java | 6 +-
fit/pom.xml | 4 +
installer/pom.xml | 9 ++-
.../syncope/installer/containers/Tomcat.java | 2 +
.../installer/containers/jboss/JBoss.java | 6 +-
.../containers/jboss/JBossAddResponse.java | 26 ++++---
.../jboss/JBossDeployRequestContent.java | 20 ++---
.../installer/files/ConsoleProperties.java | 5 +-
.../installer/files/GlassfishCoreWebXml.java | 7 +-
.../files/JBossDeploymentStructureXml.java | 7 +-
.../syncope/installer/files/ParentPom.java | 7 +-
.../files/PersistenceContextEMFactoryXml.java | 5 +-
.../installer/files/PersistenceProperties.java | 15 ++--
.../installer/processes/ArchetypeProcess.java | 18 ++---
.../installer/processes/BaseProcess.java | 31 ++++----
.../installer/processes/ContainerProcess.java | 29 ++++---
.../installer/processes/PersistenceProcess.java | 8 +-
.../installer/utilities/DriverLoader.java | 21 +++--
.../syncope/installer/utilities/HttpUtils.java | 10 +--
.../syncope/installer/utilities/InstallLog.java | 12 +--
.../syncope/installer/utilities/JsonUtils.java | 16 +++-
.../syncope/installer/utilities/MavenUtils.java | 7 +-
.../installer/utilities/PasswordGenerator.java | 5 +-
.../validators/ArchetypeValidator.java | 3 +-
.../src/main/resources/installer.properties | 3 +-
pom.xml | 67 +++++++++-------
.../resources/org/apache/syncope/checkstyle.xml | 1 +
src/main/resources/org/apache/syncope/pmd.xml | 80 --------------------
standalone/pom.xml | 10 +++
166 files changed, 704 insertions(+), 916 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 0d33034..451ae8f 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -33,6 +33,10 @@ under the License.
<artifactId>syncope-archetype</artifactId>
<packaging>maven-archetype</packaging>
+ <properties>
+ <rootpom.basedir>${basedir}/..</rootpom.basedir>
+ </properties>
+
<build>
<extensions>
<extension>
@@ -102,10 +106,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>
+ <resourceIncludes>src/main/resources/**/*.properties</resourceIncludes>
+ </configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/pom.xml
----------------------------------------------------------------------
diff --git a/client/cli/pom.xml b/client/cli/pom.xml
index 2bb050d..36ee452 100644
--- a/client/cli/pom.xml
+++ b/client/cli/pom.xml
@@ -35,6 +35,10 @@ under the License.
<artifactId>syncope-client-cli</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <rootpom.basedir>${basedir}/../..</rootpom.basedir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.beust</groupId>
@@ -145,10 +149,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>
+ <resourceIncludes>src/main/resources/**/*.properties</resourceIncludes>
+ </configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
index 9774a30..c7e94ff 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
@@ -28,11 +28,11 @@ import org.apache.syncope.client.cli.commands.ReportCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SyncopeAdm {
+public final class SyncopeAdm {
private static final Logger LOG = LoggerFactory.getLogger(SyncopeAdm.class);
- private static final String helpMessage = "Usage: Main [options]\n"
+ private static final String HELP_MESSAGE = "Usage: Main [options]\n"
+ " Options:\n"
+ " logger --help \n"
+ " config --help \n"
@@ -41,17 +41,17 @@ public class SyncopeAdm {
+ " policy --help \n"
+ " entitlement --help \n";
- private static final JCommander jcommander = new JCommander();
+ private static final JCommander JCOMMANDER = new JCommander();
- private static LoggerCommand loggerCommand;
+ private static LoggerCommand LOGGER_COMMAND;
- private static ConfigurationCommand configurationCommand;
+ private static ConfigurationCommand CONFIGURATION_COMMAND;
- private static NotificationCommand notificationCommand;
+ private static NotificationCommand NOTIFICATION_COMMAND;
- private static ReportCommand reportCommand;
+ private static ReportCommand REPORT_COMMAND;
- private static PolicyCommand policyCommand;
+ private static PolicyCommand POLICY_COMMAND;
public static void main(final String[] args) {
LOG.debug("Starting with args \n");
@@ -63,12 +63,12 @@ public class SyncopeAdm {
instantiateCommands();
if (args.length == 0) {
- System.out.println(helpMessage);
+ System.out.println(HELP_MESSAGE);
} else {
try {
- jcommander.parse(args);
+ JCOMMANDER.parse(args);
} catch (final ParameterException ioe) {
- System.out.println(helpMessage);
+ System.out.println(HELP_MESSAGE);
LOG.error("Parameter exception", ioe);
}
executeCommand();
@@ -78,38 +78,42 @@ public class SyncopeAdm {
private static void instantiateCommands() {
LOG.debug("Init JCommander");
- loggerCommand = new LoggerCommand();
- jcommander.addCommand(loggerCommand);
+ LOGGER_COMMAND = new LoggerCommand();
+ JCOMMANDER.addCommand(LOGGER_COMMAND);
LOG.debug("Added LoggerCommand");
- configurationCommand = new ConfigurationCommand();
- jcommander.addCommand(configurationCommand);
+ CONFIGURATION_COMMAND = new ConfigurationCommand();
+ JCOMMANDER.addCommand(CONFIGURATION_COMMAND);
LOG.debug("Added ConfigurationCommand");
- notificationCommand = new NotificationCommand();
- jcommander.addCommand(notificationCommand);
+ NOTIFICATION_COMMAND = new NotificationCommand();
+ JCOMMANDER.addCommand(NOTIFICATION_COMMAND);
LOG.debug("Added NotificationCommand");
- reportCommand = new ReportCommand();
- jcommander.addCommand(reportCommand);
+ REPORT_COMMAND = new ReportCommand();
+ JCOMMANDER.addCommand(REPORT_COMMAND);
LOG.debug("Added ReportCommand");
- policyCommand = new PolicyCommand();
- jcommander.addCommand(policyCommand);
+ POLICY_COMMAND = new PolicyCommand();
+ JCOMMANDER.addCommand(POLICY_COMMAND);
LOG.debug("Added PolicyCommand");
}
private static void executeCommand() {
- final String command = jcommander.getParsedCommand();
+ final String command = JCOMMANDER.getParsedCommand();
LOG.debug("Called command {}", command);
if ("logger".equalsIgnoreCase(command)) {
- loggerCommand.execute();
+ LOGGER_COMMAND.execute();
} else if ("config".equalsIgnoreCase(command)) {
- configurationCommand.execute();
+ CONFIGURATION_COMMAND.execute();
} else if ("notification".equalsIgnoreCase(command)) {
- notificationCommand.execute();
+ NOTIFICATION_COMMAND.execute();
} else if ("report".equalsIgnoreCase(command)) {
- reportCommand.execute();
+ REPORT_COMMAND.execute();
} else if ("policy".equalsIgnoreCase(command)) {
- policyCommand.execute();
+ POLICY_COMMAND.execute();
}
}
+
+ private SyncopeAdm() {
+ // private constructor for static utility class
+ }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
index 26ce276..cde37b8 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
@@ -28,7 +28,7 @@ public final class SyncopeServices {
private static final Logger LOG = LoggerFactory.getLogger(SyncopeServices.class);
- private final static ResourceBundle SYNCOPE_PROPS = ResourceBundle.getBundle("syncope");
+ private static final ResourceBundle SYNCOPE_PROPS = ResourceBundle.getBundle("syncope");
private static final SyncopeClient CLIENT = new SyncopeClientFactoryBean()
.setAddress(SYNCOPE_PROPS.getString("syncope.rest.services"))
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ConfigurationCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ConfigurationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ConfigurationCommand.java
index 4ca94d0..54eea17 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ConfigurationCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ConfigurationCommand.java
@@ -30,7 +30,7 @@ import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.cli.SyncopeServices;
-import org.apache.syncope.client.cli.util.XmlUtils;
+import org.apache.syncope.client.cli.util.XMLUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.ConfTO;
@@ -69,25 +69,25 @@ public class ConfigurationCommand extends AbstractCommand {
+ " Syntax: -e={WHERE-DIR} \n";
@Parameter(names = { "-r", "--read" })
- public String confNameToRead;
+ private String confNameToRead;
@DynamicParameter(names = { "-u", "--update" })
- private final Map<String, String> updateConf = new HashMap<String, String>();
+ private final Map<String, String> updateConf = new HashMap<>();
@DynamicParameter(names = { "-c", "--create" })
- private final Map<String, String> createConf = new HashMap<String, String>();
+ private final Map<String, String> createConf = new HashMap<>();
@Parameter(names = { "-d", "--delete" })
- public String confNameToDelete;
+ private String confNameToDelete;
@Parameter(names = { "-v", "--validators" })
- public boolean validators = false;
+ private boolean validators = false;
@Parameter(names = { "-mt", "--mail-templates" })
- public boolean mailTemplates = false;
+ private boolean mailTemplates = false;
@Parameter(names = { "-e", "--export" })
- public String export;
+ private String export;
@Override
public void execute() {
@@ -179,7 +179,7 @@ public class ConfigurationCommand extends AbstractCommand {
LOG.debug("- configuration export command, directory where xml will be export: {}", export);
try {
- XmlUtils.createXMLFile((SequenceInputStream) configurationService.export().getEntity(), export
+ XMLUtils.createXMLFile((SequenceInputStream) configurationService.export().getEntity(), export
+ EXPORT_FILE_NAME);
System.out.println(" - " + export + EXPORT_FILE_NAME + " successfully created");
} catch (final IOException ex) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/commands/LoggerCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/LoggerCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/LoggerCommand.java
index e5115d9..bbb826a 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/LoggerCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/LoggerCommand.java
@@ -58,19 +58,19 @@ public class LoggerCommand extends AbstractCommand {
+ " Syntax: -d={LOG-NAME}";
@Parameter(names = { "-r", "--read" })
- public String logNameToRead;
+ private String logNameToRead;
@DynamicParameter(names = { "-u", "--update" })
private final Map<String, String> updateLogs = new HashMap<String, String>();
@Parameter(names = { "-ua", "--update-all" })
- public String logLevel;
+ private String logLevel;
@DynamicParameter(names = { "-c", "--create" })
private final Map<String, String> createLogs = new HashMap<String, String>();
@Parameter(names = { "-d", "--delete" })
- public String logNameToDelete;
+ private String logNameToDelete;
@Override
public void execute() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/commands/NotificationCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/NotificationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/NotificationCommand.java
index 4e18996..473ebdc 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/NotificationCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/NotificationCommand.java
@@ -46,10 +46,10 @@ public class NotificationCommand extends AbstractCommand {
+ " Syntax: -d={NOTIFICATION-ID}";
@Parameter(names = { "-r", "--read" })
- public Long notificationIdToRead = -1L;
+ private Long notificationIdToRead = -1L;
@Parameter(names = { "-d", "--delete" })
- public Long notificationIdToDelete = -1L;
+ private Long notificationIdToDelete = -1L;
@Override
public void execute() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/commands/PolicyCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/PolicyCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/PolicyCommand.java
index 086ab25..6ea0d33 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/PolicyCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/PolicyCommand.java
@@ -50,13 +50,13 @@ public class PolicyCommand extends AbstractCommand {
+ " Syntax: -d={POLICY-ID}";
@Parameter(names = { "-ll", "--list-policy" })
- public String policyType;
+ private String policyType;
@Parameter(names = { "-r", "--read" })
- public Long policyIdToRead = -1L;
+ private Long policyIdToRead = -1L;
@Parameter(names = { "-d", "--delete" })
- public Long policyIdToDelete = -1L;
+ private Long policyIdToDelete = -1L;
@Override
public void execute() {
@@ -67,7 +67,7 @@ public class PolicyCommand extends AbstractCommand {
LOG.debug("- policy help command");
System.out.println(helpMessage);
} else if (list) {
-
+ // do nothing for the moment...
} else if (StringUtils.isNotBlank(policyType)) {
LOG.debug("- policy list command for type {}", policyType);
try {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ReportCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ReportCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ReportCommand.java
index c2ed1fa..2c4dba0 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ReportCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/ReportCommand.java
@@ -27,7 +27,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import org.apache.syncope.client.cli.SyncopeServices;
-import org.apache.syncope.client.cli.util.XmlUtils;
+import org.apache.syncope.client.cli.util.XMLUtils;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.ReportExecTO;
@@ -67,25 +67,25 @@ public class ReportCommand extends AbstractCommand {
+ " -rc, --reportlet-class";
@Parameter(names = { "-r", "--read" })
- public Long reportIdToRead = -1L;
+ private Long reportIdToRead = -1L;
@Parameter(names = { "-d", "--delete" })
- public Long reportIdToDelete = -1L;
+ private Long reportIdToDelete = -1L;
@Parameter(names = { "-e", "--execute" })
- public Long reportIdToExecute = -1L;
+ private Long reportIdToExecute = -1L;
@Parameter(names = { "-re", "--read-execution" })
- public Long executionIdToRead = -1L;
+ private Long executionIdToRead = -1L;
@Parameter(names = { "-de", "--delete-execution" })
- public Long executionIdToDelete = -1L;
+ private Long executionIdToDelete = -1L;
@Parameter(names = { "-eer", "--export-execution-result" })
- public Long exportId = -1L;
+ private Long exportId = -1L;
@Parameter(names = { "-rc", "--reportlet-class" })
- public boolean reportletClass = false;
+ private boolean reportletClass = false;
@Override
public void execute() {
@@ -154,7 +154,7 @@ public class ReportCommand extends AbstractCommand {
LOG.debug("- report export command for report: {}", exportId);
try {
- XmlUtils.createXMLFile((SequenceInputStream) reportService.exportExecutionResult(exportId,
+ XMLUtils.createXMLFile((SequenceInputStream) reportService.exportExecutionResult(exportId,
ReportExecExportFormat.XML).getEntity(), "export_" + exportId + ".xml");
System.out.println(" - " + "export_" + exportId + " successfully created");
} catch (final IOException ex) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/util/XMLUtils.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/XMLUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/XMLUtils.java
new file mode 100644
index 0000000..eb4f67a
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/util/XMLUtils.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.cli.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.SequenceInputStream;
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.apache.cxf.helpers.IOUtils;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public final class XMLUtils {
+
+ public static void createXMLFile(final SequenceInputStream sis, final String filePath)
+ throws TransformerException, SAXException, IOException, ParserConfigurationException {
+
+ TransformerFactory.newInstance().newTransformer()
+ .transform(new DOMSource(DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
+ new InputSource(new StringReader(IOUtils.toString(sis))))),
+ new StreamResult(new File(filePath)));
+ }
+
+ private XMLUtils() {
+ // private constructor for static utility class
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/util/XmlUtils.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/XmlUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/XmlUtils.java
deleted file mode 100644
index fa228d5..0000000
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/util/XmlUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.cli.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.SequenceInputStream;
-import java.io.StringReader;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.apache.cxf.helpers.IOUtils;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class XmlUtils {
-
- public static void createXMLFile(final SequenceInputStream sis, final String filePath)
- throws TransformerConfigurationException, TransformerException, SAXException, IOException,
- ParserConfigurationException {
-
- TransformerFactory.newInstance().newTransformer()
- .transform(new DOMSource(DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
- new InputSource(new StringReader(IOUtils.toString(sis))))),
- new StreamResult(new File(filePath)));
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/cli/src/main/java/org/apache/syncope/client/cli/validators/DebugLevelValidator.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/validators/DebugLevelValidator.java b/client/cli/src/main/java/org/apache/syncope/client/cli/validators/DebugLevelValidator.java
index 58c12f3..1ce85f8 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/validators/DebugLevelValidator.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/validators/DebugLevelValidator.java
@@ -19,12 +19,11 @@
package org.apache.syncope.client.cli.validators;
import com.beust.jcommander.IParameterValidator;
-import com.beust.jcommander.ParameterException;
public class DebugLevelValidator implements IParameterValidator {
@Override
- public void validate(final String name, final String value) throws ParameterException {
+ public void validate(final String name, final String value) {
if (!Levels.contains(value)) {
final StringBuilder exceptionMessage = new StringBuilder();
exceptionMessage.append("Parameter ")
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/pom.xml
----------------------------------------------------------------------
diff --git a/client/console/pom.xml b/client/console/pom.xml
index e95a728..a558d30 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -118,10 +118,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/client/console/src/main/java/org/apache/syncope/client/console/annotations/BinaryPreview.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/annotations/BinaryPreview.java b/client/console/src/main/java/org/apache/syncope/client/console/annotations/BinaryPreview.java
index 51e22bc..d629969 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/annotations/BinaryPreview.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/annotations/BinaryPreview.java
@@ -29,6 +29,6 @@ import java.lang.annotation.Target;
@Documented
public @interface BinaryPreview {
- public String[] mimeTypes() default {};
+ String[] mimeTypes() default {};
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtensionPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtensionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtensionPanel.java
index 26b359f..5546d65 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtensionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtensionPanel.java
@@ -29,6 +29,6 @@ import java.lang.annotation.Target;
@Documented
public @interface ExtensionPanel {
- public String value();
+ String value();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAttributableProviderComparator.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAttributableProviderComparator.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAttributableProviderComparator.java
index e82b9bb..77fb552 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAttributableProviderComparator.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAttributableProviderComparator.java
@@ -41,7 +41,7 @@ public class SortableAttributableProviderComparator extends SortableDataProvider
}
@Override
- public int compare(final AbstractAttributableTO attributable1, AbstractAttributableTO attributable2) {
+ public int compare(final AbstractAttributableTO attributable1, final AbstractAttributableTO attributable2) {
if (INLINE_PROPS.contains(provider.getSort().getProperty())) {
return super.compare(attributable1, attributable2);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
index 1e92898..33bac29 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
@@ -82,7 +82,7 @@ public class StatusBean implements Serializable {
return linked;
}
- public void setLinked(boolean linked) {
+ public void setLinked(final boolean linked) {
this.linked = linked;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/init/ConsoleInitializer.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/init/ConsoleInitializer.java b/client/console/src/main/java/org/apache/syncope/client/console/init/ConsoleInitializer.java
index ec51d3e..87fa6ad 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/init/ConsoleInitializer.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/init/ConsoleInitializer.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.InitializingBean;
@@ -44,7 +43,7 @@ public class ConsoleInitializer implements InitializingBean, BeanFactoryAware {
private DefaultListableBeanFactory beanFactory;
@Override
- public void setBeanFactory(final BeanFactory beanFactory) throws BeansException {
+ public void setBeanFactory(final BeanFactory beanFactory) {
this.beanFactory = (DefaultListableBeanFactory) beanFactory;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
index 7969c63..b805a54 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
@@ -28,7 +28,7 @@ public class ImagePanel extends Panel {
private static final long serialVersionUID = 5564818820574092960L;
- final Image img;
+ private final Image img;
public ImagePanel(final String id, final ContextRelativeResource img) {
super(id);
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
index 19e0e1d..f628a84 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
@@ -38,12 +38,14 @@ public class AjaxDropDownChoicePanel<T extends Serializable> extends FieldPanel<
this(id, name, model, true);
}
- public AjaxDropDownChoicePanel(final String id, final String name, final IModel<T> model, boolean enableOnBlur) {
+ public AjaxDropDownChoicePanel(
+ final String id, final String name, final IModel<T> model, final boolean enableOnBlur) {
+
super(id, model);
- field = new DropDownChoice<T>(
+ field = new DropDownChoice<>(
"dropDownChoiceField", model, Collections.<T>emptyList(), new ChoiceRenderer<T>());
- add(field.setLabel(new Model<String>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
if (enableOnBlur) {
field.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
index 8dbc434..ebbff5d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
@@ -69,15 +69,13 @@ public abstract class FieldPanel<T> extends AbstractFieldPanel<T> implements Clo
return this;
}
- public FieldPanel<T> setRequired(boolean required) {
+ public FieldPanel<T> setRequired(final boolean required) {
field.setRequired(required);
-
return this;
}
- public FieldPanel<T> setReadOnly(boolean readOnly) {
+ public FieldPanel<T> setReadOnly(final boolean readOnly) {
field.setEnabled(!readOnly);
-
return this;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
index cd4ab2a..f35321f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
@@ -76,14 +76,14 @@ public class MultiFieldPanel<E> extends AbstractFieldPanel<List<E>> {
});
}
- fieldPanel.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) {
-
+ fieldPanel.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) {
+
private static final long serialVersionUID = -1107858522700306810L;
-
- @Override
- protected void onUpdate(final AjaxRequestTarget target) {
- }
- });
+
+ @Override
+ protected void onUpdate(final AjaxRequestTarget target) {
+ }
+ });
fieldPanel.setNewModel(item);
item.add(fieldPanel);
@@ -98,7 +98,7 @@ public class MultiFieldPanel<E> extends AbstractFieldPanel<List<E>> {
model.getObject().remove(item.getModelObject());
fieldPanel.getField().clearInput();
target.add(container);
-
+
if (eventTemplate) {
send(getPage(), Broadcast.BREADTH, new MultiValueSelectorEvent(target));
}
@@ -159,7 +159,7 @@ public class MultiFieldPanel<E> extends AbstractFieldPanel<List<E>> {
public static class MultiValueSelectorEvent {
- final AjaxRequestTarget target;
+ private final AjaxRequestTarget target;
public MultiValueSelectorEvent(final AjaxRequestTarget target) {
this.target = target;
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.properties
index bf07514..e696256 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.properties
@@ -17,4 +17,4 @@
submit=Save
add=Add
remove=Delete
-cancel=Cancel
\ No newline at end of file
+cancel=Cancel
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_it.properties
index 9973e99..58e0aa0 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_it.properties
@@ -17,4 +17,4 @@
submit=Salva
add=Aggiungi
remove=Elimina
-cancel=Annulla
\ No newline at end of file
+cancel=Annulla
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_pt_BR.properties
index bf17b75..490fe30 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage_pt_BR.properties
@@ -17,4 +17,4 @@
submit=Salvar
add=Adicionar
remove=Remover
-cancel=Cancelar
\ No newline at end of file
+cancel=Cancelar
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/console/src/main/resources/org/apache/syncope/client/console/pages/XMLEditorPopupPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/XMLEditorPopupPage_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/XMLEditorPopupPage_pt_BR.properties
index 4152188..e9cd1ec 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/XMLEditorPopupPage_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/XMLEditorPopupPage_pt_BR.properties
@@ -16,4 +16,4 @@
# under the License.
submit=Salvar
cancel=Fechar
-title=Workflow XML Editor
\ No newline at end of file
+title=Workflow XML Editor
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/lib/pom.xml
----------------------------------------------------------------------
diff --git a/client/lib/pom.xml b/client/lib/pom.xml
index a834ca8..3de5d20 100644
--- a/client/lib/pom.xml
+++ b/client/lib/pom.xml
@@ -82,10 +82,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>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
----------------------------------------------------------------------
diff --git a/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java b/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
index d334c30..6233f6c 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
@@ -52,22 +52,22 @@ public class RestClientExceptionMapper implements ExceptionMapper<Exception>, Re
final int statusCode = response.getStatus();
Exception ex;
- // 1. Check for client (possibly composite) exception in HTTP header
SyncopeClientCompositeException scce = checkSyncopeClientCompositeException(response);
if (scce != null) {
+ // 1. Check for client (possibly composite) exception in HTTP header
if (scce.getExceptions().size() == 1) {
ex = scce.getExceptions().iterator().next();
} else {
ex = scce;
}
- } // 2. Map SC_UNAUTHORIZED
- else if (statusCode == Response.Status.UNAUTHORIZED.getStatusCode()) {
+ } else if (statusCode == Response.Status.UNAUTHORIZED.getStatusCode()) {
+ // 2. Map SC_UNAUTHORIZED
ex = new AccessControlException("Remote unauthorized exception");
- } // 3. Map SC_BAD_REQUEST
- else if (statusCode == Response.Status.BAD_REQUEST.getStatusCode()) {
+ } else if (statusCode == Response.Status.BAD_REQUEST.getStatusCode()) {
+ // 3. Map SC_BAD_REQUEST
ex = new BadRequestException();
- } // 4. All other codes are mapped to runtime exception with HTTP code information
- else {
+ } else {
+ // 4. All other codes are mapped to runtime exception with HTTP code information
ex = new WebServiceException(String.format("Remote exception with status code: %s",
Response.Status.fromStatusCode(statusCode).name()));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/old_console/pom.xml
----------------------------------------------------------------------
diff --git a/client/old_console/pom.xml b/client/old_console/pom.xml
index 4b5824b..ac9f17b 100644
--- a/client/old_console/pom.xml
+++ b/client/old_console/pom.xml
@@ -96,10 +96,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/client/old_console/src/main/java/org/apache/syncope/client/console/commons/JexlHelpUtils.java
----------------------------------------------------------------------
diff --git a/client/old_console/src/main/java/org/apache/syncope/client/console/commons/JexlHelpUtils.java b/client/old_console/src/main/java/org/apache/syncope/client/console/commons/JexlHelpUtils.java
index b29d180..ab8dcfb 100644
--- a/client/old_console/src/main/java/org/apache/syncope/client/console/commons/JexlHelpUtils.java
+++ b/client/old_console/src/main/java/org/apache/syncope/client/console/commons/JexlHelpUtils.java
@@ -49,8 +49,6 @@ public final class JexlHelpUtils {
@Override
public void onClick(final AjaxRequestTarget target) {
- // using bitwise inversion as suggested by
- // http://pmd.sourceforge.net/pmd-4.2.5/rules/controversial.html#BooleanInversion
toogle ^= true;
wmc.setVisible(toogle);
target.add(wmc);
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 78bfcbd..a708ad6 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -33,6 +33,10 @@ under the License.
<artifactId>syncope-client</artifactId>
<packaging>pom</packaging>
+ <properties>
+ <rootpom.basedir>${basedir}/..</rootpom.basedir>
+ </properties>
+
<modules>
<module>lib</module>
<module>console</module>
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/common/lib/pom.xml
----------------------------------------------------------------------
diff --git a/common/lib/pom.xml b/common/lib/pom.xml
index 14f8208..eda26a4 100644
--- a/common/lib/pom.xml
+++ b/common/lib/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>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractPolicyTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractPolicyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractPolicyTO.java
index aadb0d0..9202fba 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractPolicyTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractPolicyTO.java
@@ -49,10 +49,12 @@ public abstract class AbstractPolicyTO extends AbstractBaseBean {
private final List<String> usedByRealms = new ArrayList<>();
private AbstractPolicyTO() {
+ super();
throw new UnsupportedOperationException("No-arg constructor is just to keep JAXB from complaining");
}
protected AbstractPolicyTO(final PolicyType type) {
+ super();
this.type = type;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/common/lib/src/main/java/org/apache/syncope/common/lib/types/Entitlement.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/Entitlement.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/Entitlement.java
index e5329a7..a149d6c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/Entitlement.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/Entitlement.java
@@ -194,19 +194,20 @@ public final class Entitlement {
public static final String ROUTE_UPDATE = "ROUTE_UPDATE";
- private static Set<String> VALUES = new HashSet<>();
+ private static final Set<String> ENTITLEMENTS;
static {
+ Set<String> values = new HashSet<>();
for (Field field : Entitlement.class.getDeclaredFields()) {
if (Modifier.isStatic(field.getModifiers()) && String.class.equals(field.getType())) {
- VALUES.add(field.getName());
+ values.add(field.getName());
}
}
- VALUES = Collections.unmodifiableSet(VALUES);
+ ENTITLEMENTS = Collections.unmodifiableSet(values);
}
public static Set<String> values() {
- return VALUES;
+ return ENTITLEMENTS;
}
private Entitlement() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index f4409c5..16f93e3 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -88,10 +88,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/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
index f40801e..f57f2cf 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
@@ -35,7 +35,6 @@ import org.apache.cxf.jaxrs.model.wadl.Descriptions;
import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.mod.UserMod;
import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.common.rest.api.RESTHeaders;
/**
* REST operations for user self-management.
@@ -46,7 +45,8 @@ public interface UserSelfService extends JAXRSService {
/**
* Returns the user making the service call.
*
- * @return calling user data, including owned entitlements as header value {@link RESTHeaders#OWNED_ENTITLEMENTS}
+ * @return calling user data, including owned entitlements as header value
+ * {@link org.apache.syncope.common.rest.api.RESTHeaders#OWNED_ENTITLEMENTS}
*/
@GET
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/pom.xml
----------------------------------------------------------------------
diff --git a/core/logic/pom.xml b/core/logic/pom.xml
index b6e48de..60ba05f 100644
--- a/core/logic/pom.xml
+++ b/core/logic/pom.xml
@@ -163,10 +163,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/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
index b1d1ddf..eac9fde 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java
@@ -306,7 +306,7 @@ public class ConnectorLogic extends AbstractTransactionalLogic<ConnInstanceTO> {
}
}
- if ((id != null) && !id.equals(0l)) {
+ if ((id != null) && !id.equals(0L)) {
try {
return binder.getConnInstanceTO(connInstanceDAO.find(id));
} catch (Throwable ignore) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
index 2f7840c..ec020ba 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
@@ -342,7 +342,7 @@ public class GroupLogic extends AbstractSubjectLogic<GroupTO, GroupMod> {
}
}
- if ((key != null) && !key.equals(0l)) {
+ if ((key != null) && !key.equals(0L)) {
try {
return binder.getGroupTO(key);
} catch (Throwable ignore) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/LoggerLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/LoggerLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/LoggerLogic.java
index ab5389b..f3c9e5d 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/LoggerLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/LoggerLogic.java
@@ -179,11 +179,12 @@ public class LoggerLogic extends AbstractTransactionalLogic<LoggerTO> {
}
}
- private LoggerTO delete(final String name, final LoggerType expectedType) throws NotFoundException {
+ private LoggerTO delete(final String name, final LoggerType expectedType) {
Logger syncopeLogger = loggerDAO.find(name);
if (syncopeLogger == null) {
throw new NotFoundException("Logger " + name);
- } else if (expectedType != syncopeLogger.getType()) {
+ }
+ if (expectedType != syncopeLogger.getType()) {
throwInvalidLogger(expectedType);
}
@@ -204,7 +205,7 @@ public class LoggerLogic extends AbstractTransactionalLogic<LoggerTO> {
}
@PreAuthorize("hasRole('" + Entitlement.LOG_DELETE + "')")
- public LoggerTO deleteLog(final String name) throws NotFoundException {
+ public LoggerTO deleteLog(final String name) {
return delete(name, LoggerType.LOG);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
index fb92b3e..2c09d37 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
@@ -390,7 +390,7 @@ public class ReportLogic extends AbstractTransactionalLogic<ReportTO> {
}
}
- if ((key != null) && !key.equals(0l)) {
+ if ((key != null) && !key.equals(0L)) {
try {
return binder.getReportTO(reportDAO.find(key));
} catch (Throwable ignore) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/WorkflowLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/WorkflowLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/WorkflowLogic.java
index d31500c..28ef901 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/WorkflowLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/WorkflowLogic.java
@@ -27,7 +27,6 @@ import org.apache.syncope.core.workflow.api.GroupWorkflowAdapter;
import org.apache.syncope.core.workflow.api.UserWorkflowAdapter;
import org.apache.syncope.core.workflow.api.WorkflowAdapter;
import org.apache.syncope.core.workflow.api.WorkflowDefinitionFormat;
-import org.apache.syncope.core.workflow.api.WorkflowException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -43,8 +42,7 @@ public class WorkflowLogic extends AbstractTransactionalLogic<AbstractBaseBean>
private GroupWorkflowAdapter gwfAdapter;
private void exportDefinition(
- final WorkflowAdapter adapter, final WorkflowDefinitionFormat format, final OutputStream os)
- throws WorkflowException {
+ final WorkflowAdapter adapter, final WorkflowDefinitionFormat format, final OutputStream os) {
adapter.exportDefinition(format, os);
}
@@ -57,39 +55,29 @@ public class WorkflowLogic extends AbstractTransactionalLogic<AbstractBaseBean>
@PreAuthorize("hasRole('" + Entitlement.WORKFLOW_DEF_READ + "')")
@Transactional(readOnly = true)
- public void exportUserDefinition(final MediaType format, final OutputStream os)
- throws WorkflowException {
-
+ public void exportUserDefinition(final MediaType format, final OutputStream os) {
exportDefinition(uwfAdapter, getFormat(format), os);
}
@PreAuthorize("hasRole('" + Entitlement.WORKFLOW_DEF_READ + "')")
@Transactional(readOnly = true)
- public void exportGroupDefinition(final MediaType format, final OutputStream os)
- throws WorkflowException {
-
+ public void exportGroupDefinition(final MediaType format, final OutputStream os) {
exportDefinition(gwfAdapter, getFormat(format), os);
}
- private void exportDiagram(final WorkflowAdapter adapter, final OutputStream os)
- throws WorkflowException {
-
+ private void exportDiagram(final WorkflowAdapter adapter, final OutputStream os) {
adapter.exportDiagram(os);
}
@PreAuthorize("hasRole('" + Entitlement.WORKFLOW_DEF_READ + "')")
@Transactional(readOnly = true)
- public void exportUserDiagram(final OutputStream os)
- throws WorkflowException {
-
+ public void exportUserDiagram(final OutputStream os) {
exportDiagram(uwfAdapter, os);
}
@PreAuthorize("hasRole('" + Entitlement.WORKFLOW_DEF_READ + "')")
@Transactional(readOnly = true)
- public void exportGroupDiagram(final OutputStream os)
- throws WorkflowException {
-
+ public void exportGroupDiagram(final OutputStream os) {
exportDiagram(gwfAdapter, os);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/audit/AuditConnectionFactory.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/audit/AuditConnectionFactory.java b/core/logic/src/main/java/org/apache/syncope/core/logic/audit/AuditConnectionFactory.java
index 727d0d5..b35c42d 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/audit/AuditConnectionFactory.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/audit/AuditConnectionFactory.java
@@ -51,7 +51,7 @@ import org.w3c.dom.ls.LSParser;
*/
public final class AuditConnectionFactory {
- private static DataSource datasource;
+ private static DataSource DATASOURCE;
private static final String PERSISTENCE_CONTEXT = "/persistenceContext.xml";
@@ -84,7 +84,7 @@ public final class AuditConnectionFactory {
Context ctx = new InitialContext();
Object obj = ctx.lookup(jndiName);
- datasource = (DataSource) PortableRemoteObject.narrow(obj, DataSource.class);
+ DATASOURCE = (DataSource) PortableRemoteObject.narrow(obj, DataSource.class);
} catch (Exception e) {
// ignore
} finally {
@@ -115,7 +115,7 @@ public final class AuditConnectionFactory {
initSQLScript = persistence.getProperty("audit.sql");
- if (datasource == null) {
+ if (DATASOURCE == null) {
BasicDataSource bds = new BasicDataSource();
bds.setDriverClassName(persistence.getProperty("jpa.driverClassName"));
bds.setUrl(persistence.getProperty("jpa.url"));
@@ -126,7 +126,7 @@ public final class AuditConnectionFactory {
bds.setRemoveAbandonedOnBorrow(true);
bds.setRemoveAbandonedOnMaintenance(true);
- datasource = bds;
+ DATASOURCE = bds;
}
} catch (Exception e) {
throw new IllegalStateException("Audit datasource configuration failed", e);
@@ -137,17 +137,17 @@ public final class AuditConnectionFactory {
populator.setScripts(new Resource[] { new ClassPathResource("/audit/" + initSQLScript) });
// forces no statement separation
populator.setSeparator(ScriptUtils.EOF_STATEMENT_SEPARATOR);
- Connection conn = DataSourceUtils.getConnection(datasource);
+ Connection conn = DataSourceUtils.getConnection(DATASOURCE);
try {
populator.populate(conn);
} finally {
- DataSourceUtils.releaseConnection(conn, datasource);
+ DataSourceUtils.releaseConnection(conn, DATASOURCE);
}
}
public static Connection getConnection() {
- if (datasource != null) {
- return DataSourceUtils.getConnection(datasource);
+ if (DATASOURCE != null) {
+ return DataSourceUtils.getConnection(DATASOURCE);
}
throw new IllegalStateException("Audit dataSource init failed: check logs");
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/init/ImplementationClassNamesLoader.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/ImplementationClassNamesLoader.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/ImplementationClassNamesLoader.java
index ff11801..b22a54d 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/ImplementationClassNamesLoader.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/ImplementationClassNamesLoader.java
@@ -87,7 +87,7 @@ public class ImplementationClassNamesLoader implements SyncopeLoader {
scanner.addIncludeFilter(new AssignableTypeFilter(SyncActions.class));
scanner.addIncludeFilter(new AssignableTypeFilter(PushActions.class));
scanner.addIncludeFilter(new AssignableTypeFilter(SyncCorrelationRule.class));
- // TODO: SYNCOPE-631
+ // Remove once SYNCOPE-631 is done
//scanner.addIncludeFilter(new AssignableTypeFilter(PushCorrelationRule.class));
scanner.addIncludeFilter(new AssignableTypeFilter(PropagationActions.class));
scanner.addIncludeFilter(new AssignableTypeFilter(Validator.class));
@@ -121,7 +121,7 @@ public class ImplementationClassNamesLoader implements SyncopeLoader {
classNames.get(Type.SYNC_CORRELATION_RULE).add(bd.getBeanClassName());
}
- // TODO: SYNCOPE-631
+ // Uncomment when SYNCOPE-631 is done
/* if (PushCorrelationRule.class.isAssignableFrom(clazz) && !isAbsractClazz) {
* classNames.get(Type.PUSH_CORRELATION_RULES).add(metadata.getClassName());
* } */
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/init/LogicInitializer.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LogicInitializer.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LogicInitializer.java
index c784262..9ae6aa9 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LogicInitializer.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LogicInitializer.java
@@ -27,7 +27,6 @@ import org.apache.syncope.core.persistence.api.SyncopeLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.InitializingBean;
@@ -45,7 +44,7 @@ public class LogicInitializer implements InitializingBean, BeanFactoryAware {
private DefaultListableBeanFactory beanFactory;
@Override
- public void setBeanFactory(final BeanFactory beanFactory) throws BeansException {
+ public void setBeanFactory(final BeanFactory beanFactory) {
this.beanFactory = (DefaultListableBeanFactory) beanFactory;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/report/AbstractReportlet.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/AbstractReportlet.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/AbstractReportlet.java
index df32041..8c1e272 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/AbstractReportlet.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/AbstractReportlet.java
@@ -28,9 +28,6 @@ import org.xml.sax.helpers.AttributesImpl;
public abstract class AbstractReportlet<T extends AbstractReportletConf> implements Reportlet<T> {
- /**
- * Logger.
- */
protected static final Logger LOG = LoggerFactory.getLogger(AbstractReportlet.class);
protected T conf;
@@ -44,12 +41,11 @@ public abstract class AbstractReportlet<T extends AbstractReportletConf> impleme
this.conf = conf;
}
- protected abstract void doExtract(ContentHandler handler) throws SAXException, ReportException;
+ protected abstract void doExtract(ContentHandler handler) throws SAXException;
@Override
@Transactional(readOnly = true)
- public void extract(final ContentHandler handler) throws SAXException, ReportException {
-
+ public void extract(final ContentHandler handler) throws SAXException {
if (conf == null) {
throw new ReportException(new IllegalArgumentException("No configuration provided"));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/report/GroupReportlet.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/GroupReportlet.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/GroupReportlet.java
index d564335..4dfe2e9 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/GroupReportlet.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/GroupReportlet.java
@@ -183,9 +183,7 @@ public class GroupReportlet extends AbstractReportlet<GroupReportletConf> {
}
}
- private void doExtract(final ContentHandler handler, final List<Group> groups)
- throws SAXException, ReportException {
-
+ private void doExtract(final ContentHandler handler, final List<Group> groups) throws SAXException {
AttributesImpl atts = new AttributesImpl();
for (Group group : groups) {
atts.clear();
@@ -299,7 +297,7 @@ public class GroupReportlet extends AbstractReportlet<GroupReportletConf> {
}
@Override
- protected void doExtract(final ContentHandler handler) throws SAXException, ReportException {
+ protected void doExtract(final ContentHandler handler) throws SAXException {
doExtractConf(handler);
for (int i = 1; i <= (count() / PAGE_SIZE) + 1; i++) {
doExtract(handler, getPagedGroups(i));
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/report/Reportlet.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/Reportlet.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/Reportlet.java
index cd6dd25..65fab56 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/Reportlet.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/Reportlet.java
@@ -41,7 +41,6 @@ public interface Reportlet<T extends ReportletConf> {
*
* @param handler SAX content handler for streaming result
* @throws SAXException if there is any problem in SAX handling
- * @throws ReportException if anything goes wrong
*/
- void extract(ContentHandler handler) throws SAXException, ReportException;
+ void extract(ContentHandler handler) throws SAXException;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/report/StaticReportlet.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/StaticReportlet.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/StaticReportlet.java
index 196f3e9..3e768e7 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/StaticReportlet.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/StaticReportlet.java
@@ -67,8 +67,7 @@ public class StaticReportlet extends AbstractReportlet<StaticReportletConf> {
}
@Override
- public void doExtract(final ContentHandler handler) throws SAXException, ReportException {
-
+ public void doExtract(final ContentHandler handler) throws SAXException {
doExtractConf(handler);
if (StringUtils.hasText(conf.getStringField())) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/report/TextSerializer.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/TextSerializer.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/TextSerializer.java
index 3805963..f1f3a9e 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/TextSerializer.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/TextSerializer.java
@@ -73,24 +73,6 @@ public class TextSerializer extends XMLSerializer {
// nothing
}
- @Override
- public void endDocument() throws SAXException {
- super.endDocument();
- }
-
- /**
- * @throws SAXException if text is encountered before root element.
- */
- @Override
- public void characters(final char buffer[], final int start, final int len) throws SAXException {
- super.characters(buffer, start, len);
- }
-
- @Override
- public void recycle() {
- super.recycle();
- }
-
public static TextSerializer createPlainSerializer() {
final TextSerializer serializer = new TextSerializer();
serializer.setContentType("text/plain; charset=" + UTF_8);
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/logic/src/main/java/org/apache/syncope/core/logic/report/UserReportlet.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/UserReportlet.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/UserReportlet.java
index 02976f6..575947d 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/UserReportlet.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/UserReportlet.java
@@ -189,9 +189,7 @@ public class UserReportlet extends AbstractReportlet<UserReportletConf> {
}
}
- private void doExtract(final ContentHandler handler, final List<User> users)
- throws SAXException, ReportException {
-
+ private void doExtract(final ContentHandler handler, final List<User> users) throws SAXException {
AttributesImpl atts = new AttributesImpl();
for (User user : users) {
atts.clear();
@@ -345,7 +343,7 @@ public class UserReportlet extends AbstractReportlet<UserReportletConf> {
}
@Override
- protected void doExtract(final ContentHandler handler) throws SAXException, ReportException {
+ protected void doExtract(final ContentHandler handler) throws SAXException {
doExtractConf(handler);
for (int i = 1; i <= (count() / PAGE_SIZE) + 1; i++) {
doExtract(handler, getPagedUsers(i));
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/misc/pom.xml
----------------------------------------------------------------------
diff --git a/core/misc/pom.xml b/core/misc/pom.xml
index 449927e..d330ad6 100644
--- a/core/misc/pom.xml
+++ b/core/misc/pom.xml
@@ -127,10 +127,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/misc/src/main/java/org/apache/syncope/core/misc/AuditManager.java
----------------------------------------------------------------------
diff --git a/core/misc/src/main/java/org/apache/syncope/core/misc/AuditManager.java b/core/misc/src/main/java/org/apache/syncope/core/misc/AuditManager.java
index 8590aee..a8d8aac 100644
--- a/core/misc/src/main/java/org/apache/syncope/core/misc/AuditManager.java
+++ b/core/misc/src/main/java/org/apache/syncope/core/misc/AuditManager.java
@@ -34,9 +34,6 @@ import org.springframework.stereotype.Component;
@Component
public class AuditManager {
- /**
- * Logger.
- */
private static final Logger LOG = LoggerFactory.getLogger(AuditManager.class);
@Autowired
@@ -52,7 +49,7 @@ public class AuditManager {
final Object output,
final Object... input) {
- final StringBuilder message = new StringBuilder(32);
+ StringBuilder message = new StringBuilder(32);
message.append("BEFORE:\n").
append('\t').append(before == null ? "unknown" : before).append('\n');
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/misc/src/main/java/org/apache/syncope/core/misc/ConnObjectUtils.java
----------------------------------------------------------------------
diff --git a/core/misc/src/main/java/org/apache/syncope/core/misc/ConnObjectUtils.java b/core/misc/src/main/java/org/apache/syncope/core/misc/ConnObjectUtils.java
index 74c0b41..8553a0a 100644
--- a/core/misc/src/main/java/org/apache/syncope/core/misc/ConnObjectUtils.java
+++ b/core/misc/src/main/java/org/apache/syncope/core/misc/ConnObjectUtils.java
@@ -47,7 +47,6 @@ import org.apache.syncope.common.lib.types.PasswordPolicySpec;
import org.apache.syncope.core.persistence.api.attrvalue.validation.ParsingValidationException;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
import org.apache.syncope.core.persistence.api.dao.PlainSchemaDAO;
-import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.Attributable;
http://git-wip-us.apache.org/repos/asf/syncope/blob/62193429/core/misc/src/main/java/org/apache/syncope/core/misc/security/PasswordGenerator.java
----------------------------------------------------------------------
diff --git a/core/misc/src/main/java/org/apache/syncope/core/misc/security/PasswordGenerator.java b/core/misc/src/main/java/org/apache/syncope/core/misc/security/PasswordGenerator.java
index 8ad1967..52b260e 100644
--- a/core/misc/src/main/java/org/apache/syncope/core/misc/security/PasswordGenerator.java
+++ b/core/misc/src/main/java/org/apache/syncope/core/misc/security/PasswordGenerator.java
@@ -23,9 +23,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.types.PasswordPolicySpec;
-import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
import org.apache.syncope.core.persistence.api.entity.ExternalResource;
-import org.apache.syncope.core.persistence.api.entity.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.misc.policy.InvalidPasswordPolicySpecException;
import org.apache.syncope.core.misc.policy.PolicyPattern;
@@ -37,7 +35,7 @@ import org.springframework.stereotype.Component;
/**
* Generate random passwords according to given policies.
*
- * @see PasswordPolicy
+ * @see org.apache.syncope.core.persistence.api.entity.PasswordPolicy
*/
@Component
public class PasswordGenerator {
@@ -45,9 +43,6 @@ public class PasswordGenerator {
private static final char[] SPECIAL_CHARS = { '!', '£', '%', '&', '(', ')', '?', '#', '$' };
@Autowired
- private PolicyDAO policyDAO;
-
- @Autowired
private RealmDAO realmDAO;
public String generate(final List<PasswordPolicySpec> ppSpecs)