Repository: syncope Updated Branches: refs/heads/master 40b417883 -> ad4546ee2
Final FindBugs improvements Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ad4546ee Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ad4546ee Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ad4546ee Branch: refs/heads/master Commit: ad4546ee23db9f224aca15e765d0414174bf2d7c Parents: 40b4178 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Dec 14 10:25:25 2016 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Dec 14 10:25:25 2016 +0000 ---------------------------------------------------------------------- .../syncope/core/logic/MailTemplateLogic.java | 4 +- .../syncope/core/logic/ReportTemplateLogic.java | 4 +- .../apache/syncope/core/logic/UserLogic.java | 4 +- .../syncope/core/logic/init/JobManagerImpl.java | 6 ++- .../core/logic/report/GroupReportlet.java | 48 ++++++++++---------- .../core/rest/cxf/service/TaskServiceImpl.java | 4 +- 6 files changed, 37 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/ad4546ee/core/logic/src/main/java/org/apache/syncope/core/logic/MailTemplateLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/MailTemplateLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/MailTemplateLogic.java index 978b2bd..5abf4ae 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/MailTemplateLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/MailTemplateLogic.java @@ -169,14 +169,14 @@ public class MailTemplateLogic extends AbstractTransactionalLogic<MailTemplateTO if (ArrayUtils.isNotEmpty(args)) { for (int i = 0; key == null && i < args.length; i++) { if (args[i] instanceof Long) { - key = (String) args[i]; + key = ((Long) args[i]).toString(); } else if (args[i] instanceof MailTemplateTO) { key = ((MailTemplateTO) args[i]).getKey(); } } } - if ((key != null) && !key.equals(0L)) { + if ((key != null) && !key.equals("0")) { try { return getMailTemplateTO(key); } catch (Throwable ignore) { http://git-wip-us.apache.org/repos/asf/syncope/blob/ad4546ee/core/logic/src/main/java/org/apache/syncope/core/logic/ReportTemplateLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportTemplateLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportTemplateLogic.java index 11a7f38..a1d8bfe 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportTemplateLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportTemplateLogic.java @@ -182,14 +182,14 @@ public class ReportTemplateLogic extends AbstractTransactionalLogic<ReportTempla if (ArrayUtils.isNotEmpty(args)) { for (int i = 0; key == null && i < args.length; i++) { if (args[i] instanceof Long) { - key = (String) args[i]; + key = ((Long) args[i]).toString(); } else if (args[i] instanceof ReportTemplateTO) { key = ((ReportTemplateTO) args[i]).getKey(); } } } - if ((key != null) && !key.equals(0L)) { + if ((key != null) && !key.equals("0")) { try { return getReportTemplateTO(key); } catch (Throwable ignore) { http://git-wip-us.apache.org/repos/asf/syncope/blob/ad4546ee/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java index 3273759..b5a41da 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java @@ -520,7 +520,7 @@ public class UserLogic extends AbstractAnyLogic<UserTO, UserPatch> { @Override protected UserTO resolveReference(final Method method, final Object... args) throws UnresolvedReferenceException { - Object key = null; + String key = null; if (!"confirmPasswordReset".equals(method.getName()) && ArrayUtils.isNotEmpty(args)) { for (int i = 0; key == null && i < args.length; i++) { @@ -534,7 +534,7 @@ public class UserLogic extends AbstractAnyLogic<UserTO, UserPatch> { } } - if (key instanceof String) { + if (key != null) { try { return binder.getUserTO((String) key); } catch (Throwable ignore) { http://git-wip-us.apache.org/repos/asf/syncope/blob/ad4546ee/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java index 25d232d..d8b08f1 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java @@ -20,6 +20,7 @@ package org.apache.syncope.core.logic.init; import java.sql.Connection; import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.SQLException; import java.util.Date; import java.util.HashMap; @@ -115,6 +116,7 @@ public class JobManagerImpl implements JobManager, SyncopeLoader { Connection conn = DataSourceUtils.getConnection(domainsHolder.getDomains().get(SyncopeConstants.MASTER_DOMAIN)); PreparedStatement stmt = null; + ResultSet resultSet = null; try { stmt = conn.prepareStatement( "SELECT 1 FROM " + Constants.DEFAULT_TABLE_PREFIX + "FIRED_TRIGGERS " @@ -122,10 +124,12 @@ public class JobManagerImpl implements JobManager, SyncopeLoader { stmt.setString(1, jobKey.getName()); stmt.setString(2, jobKey.getGroup()); - return stmt.executeQuery().next(); + resultSet = stmt.executeQuery(); + return resultSet.next(); } catch (SQLException e) { throw new SchedulerException(e); } finally { + IOUtil.quietClose(resultSet); IOUtil.quietClose(stmt); IOUtil.quietClose(conn); } http://git-wip-us.apache.org/repos/asf/syncope/blob/ad4546ee/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 726b865..4bc4a37 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 @@ -246,32 +246,34 @@ public class GroupReportlet extends AbstractReportlet { handler.startElement("", "", "configurations", null); handler.startElement("", "", "groupAttributes", atts); - for (Feature feature : conf.getFeatures()) { - atts.clear(); - handler.startElement("", "", "feature", atts); - handler.characters(feature.name().toCharArray(), 0, feature.name().length()); - handler.endElement("", "", "feature"); - } + if (conf != null) { + for (Feature feature : conf.getFeatures()) { + atts.clear(); + handler.startElement("", "", "feature", atts); + handler.characters(feature.name().toCharArray(), 0, feature.name().length()); + handler.endElement("", "", "feature"); + } - for (String attr : conf.getPlainAttrs()) { - atts.clear(); - handler.startElement("", "", "attribute", atts); - handler.characters(attr.toCharArray(), 0, attr.length()); - handler.endElement("", "", "attribute"); - } + for (String attr : conf.getPlainAttrs()) { + atts.clear(); + handler.startElement("", "", "attribute", atts); + handler.characters(attr.toCharArray(), 0, attr.length()); + handler.endElement("", "", "attribute"); + } - for (String derAttr : conf.getDerAttrs()) { - atts.clear(); - handler.startElement("", "", "derAttribute", atts); - handler.characters(derAttr.toCharArray(), 0, derAttr.length()); - handler.endElement("", "", "derAttribute"); - } + for (String derAttr : conf.getDerAttrs()) { + atts.clear(); + handler.startElement("", "", "derAttribute", atts); + handler.characters(derAttr.toCharArray(), 0, derAttr.length()); + handler.endElement("", "", "derAttribute"); + } - for (String virAttr : conf.getVirAttrs()) { - atts.clear(); - handler.startElement("", "", "virAttribute", atts); - handler.characters(virAttr.toCharArray(), 0, virAttr.length()); - handler.endElement("", "", "virAttribute"); + for (String virAttr : conf.getVirAttrs()) { + atts.clear(); + handler.startElement("", "", "virAttribute", atts); + handler.characters(virAttr.toCharArray(), 0, virAttr.length()); + handler.endElement("", "", "virAttribute"); + } } handler.endElement("", "", "groupAttributes"); http://git-wip-us.apache.org/repos/asf/syncope/blob/ad4546ee/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java index 2dd64dd..f19aa87 100644 --- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java +++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java @@ -25,9 +25,7 @@ import org.apache.syncope.common.lib.to.AbstractTaskTO; import org.apache.syncope.common.lib.to.BulkAction; import org.apache.syncope.common.lib.to.BulkActionResult; import org.apache.syncope.common.lib.to.PagedResult; -import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; -import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.rest.api.RESTHeaders; import org.apache.syncope.common.rest.api.beans.TaskQuery; import org.apache.syncope.common.rest.api.service.TaskService; @@ -50,7 +48,7 @@ public class TaskServiceImpl extends AbstractExecutableService implements TaskSe @Override public Response create(final SchedTaskTO taskTO) { SchedTaskTO createdTask; - if (taskTO instanceof PullTaskTO || taskTO instanceof PushTaskTO || taskTO instanceof SchedTaskTO) { + if (taskTO != null) { createdTask = logic.createSchedTask(taskTO); } else { throw new BadRequestException();