Repository: syncope Updated Branches: refs/heads/2_0_X dd8cda6fe -> 2540facc1
Remove some unneeded variable declarations (= null etc) Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2540facc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2540facc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2540facc Branch: refs/heads/2_0_X Commit: 2540facc1b08a78574fe2a625c1384cf7f1b2713 Parents: dd8cda6 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Feb 14 09:55:57 2017 +0000 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Feb 14 12:22:00 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/syncope/client/cli/util/JasyptUtils.java | 2 +- .../apache/syncope/client/console/commons/status/StatusBean.java | 2 +- .../syncope/client/console/panels/ConnObjectListViewPanel.java | 2 +- .../apache/syncope/client/console/panels/StartAtTogglePanel.java | 2 +- .../syncope/client/console/tasks/SchedTaskWizardBuilder.java | 2 +- .../client/console/wicket/markup/html/form/FieldPanel.java | 4 ++-- .../syncope/client/console/widgets/reconciliation/Anys.java | 2 +- .../client/console/wizards/AbstractModalPanelBuilder.java | 2 +- .../org/apache/syncope/client/console/wizards/AjaxWizard.java | 4 ++-- .../main/java/org/apache/syncope/core/logic/ResourceLogic.java | 2 +- .../syncope/core/persistence/jpa/content/MultiParentNode.java | 2 +- .../apache/syncope/core/persistence/jpa/entity/user/JPAUser.java | 2 +- .../provisioning/java/pushpull/AbstractPullResultHandler.java | 2 +- .../provisioning/java/pushpull/RealmPullResultHandlerImpl.java | 2 +- .../syncope/core/provisioning/camel/SyncopeCamelContext.java | 2 +- .../org/apache/syncope/fit/core/reference/TestPullActions.java | 2 +- .../src/test/java/org/apache/syncope/fit/console/LogsITCase.java | 2 +- .../java/org/apache/syncope/installer/utilities/InstallLog.java | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java index 0ddd9bf..0f31de0 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java @@ -26,7 +26,7 @@ public final class JasyptUtils { private final BasicTextEncryptor textEncryptor; - private static JasyptUtils JASYPT_UTILS = null; + private static JasyptUtils JASYPT_UTILS; public static JasyptUtils get() { if (JASYPT_UTILS == null) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/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 3f1afd1..a34425a 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 @@ -37,7 +37,7 @@ public class StatusBean implements Serializable { private final String resourceName; - private String connObjectLink = null; + private String connObjectLink; private Status status = Status.OBJECT_NOT_FOUND; http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java index 45ddb35..327c007 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java @@ -49,7 +49,7 @@ public abstract class ConnObjectListViewPanel extends Panel { private static final int SIZE = 10; - private String nextPageCookie = null; + private String nextPageCookie; protected ConnObjectListViewPanel( final String id, http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java index c0efd5a..5fabc64 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java @@ -41,7 +41,7 @@ public abstract class StartAtTogglePanel extends TogglePanel<Serializable> { private static final long serialVersionUID = -3195479265440591519L; - protected String key = null; + protected String key; protected final Form<?> form; http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java index 183d8cd..fb08a87 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java @@ -59,7 +59,7 @@ public class SchedTaskWizardBuilder<T extends SchedTaskTO> extends AjaxWizardBui private final TaskRestClient taskRestClient = new TaskRestClient(); - private PushTaskWrapper wrapper = null; + private PushTaskWrapper wrapper; private CrontabPanel crontabPanel; http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/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 c12437a..0f31060 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 @@ -36,9 +36,9 @@ public abstract class FieldPanel<T extends Serializable> extends AbstractFieldPa private static final long serialVersionUID = -198988924922541273L; - protected FormComponent<T> field = null; + protected FormComponent<T> field; - protected String title = null; + protected String title; private final Model<Integer> index = Model.of(0); http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/widgets/reconciliation/Anys.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/reconciliation/Anys.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/reconciliation/Anys.java index fecdfee..3c58515 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/reconciliation/Anys.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/reconciliation/Anys.java @@ -26,7 +26,7 @@ public class Anys extends AbstractBaseBean { private static final long serialVersionUID = -2482591351364634179L; - private int total = 0; + private int total; private String anyType; http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java index f16bd12..3989e8c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java @@ -33,7 +33,7 @@ public abstract class AbstractModalPanelBuilder<T extends Serializable> implemen private T item; - protected IEventSink eventSink = null; + protected IEventSink eventSink; /** * Construct. http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java index 5669599..04449e2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java @@ -67,7 +67,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard private final Mode mode; - private IEventSink eventSink = null; + private IEventSink eventSink; private final PageReference pageRef; @@ -257,7 +257,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard private static final String EVENT_DESCRIPTION = "new"; - private int index = 0; + private int index; public NewItemActionEvent(final T item, final AjaxRequestTarget target) { super(item, target); http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java index 361c4e9..4520775 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java @@ -337,7 +337,7 @@ public class ResourceLogic extends AbstractTransactionalLogic<ResourceTO> { connector.search(init.getRight().getObjectClass(), null, new SearchResultsHandler() { - private int count = 0; + private int count; @Override public void handleResult(final SearchResult result) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/MultiParentNode.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/MultiParentNode.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/MultiParentNode.java index 88a14e1..57f83d1 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/MultiParentNode.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/MultiParentNode.java @@ -29,7 +29,7 @@ class MultiParentNode<T> { private Set<MultiParentNode<T>> children; - private int level = 0; + private int level; private boolean exploited = false; http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java index 472afa3..ba1544d 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java @@ -120,7 +120,7 @@ public class JPAUser * Subsequent failed logins. */ @Column(nullable = true) - private Integer failedLogins = 0; + private Integer failedLogins; /** * Username/Login. http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java index 2883a6a..6478f64 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java @@ -72,7 +72,7 @@ public abstract class AbstractPullResultHandler extends AbstractSyncopeResultHan protected SyncopePullExecutor executor; - protected Result latestResult = null; + protected Result latestResult; protected abstract String getName(AnyTO anyTO); http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java index db285a8..7053ef6 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java @@ -71,7 +71,7 @@ public class RealmPullResultHandlerImpl private SyncopePullExecutor executor; - private Result latestResult = null; + private Result latestResult; @Override public void setPullExecutor(final SyncopePullExecutor executor) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java index 581d4d9..99871cb 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java @@ -56,7 +56,7 @@ public class SyncopeCamelContext { @Autowired private CamelRouteDAO routeDAO; - private SpringCamelContext camelContext = null; + private SpringCamelContext camelContext; public SpringCamelContext getContext() { synchronized (this) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestPullActions.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestPullActions.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestPullActions.java index 438b46e..c316741 100644 --- a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestPullActions.java +++ b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestPullActions.java @@ -37,7 +37,7 @@ import org.quartz.JobExecutionException; */ public class TestPullActions extends DefaultPullActions { - private int counter = 0; + private int counter; @Override public SyncDelta beforeProvision( http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java index fb3b071..e076c8c 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java @@ -36,7 +36,7 @@ import org.junit.Test; public class LogsITCase extends AbstractConsoleITCase { - private final static String CONTAINER_PATH = "body:content:tabbedPanel:panel:loggerContainer"; + private static final String CONTAINER_PATH = "body:content:tabbedPanel:panel:loggerContainer"; @Before public void login() { http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/installer/src/main/java/org/apache/syncope/installer/utilities/InstallLog.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/utilities/InstallLog.java b/installer/src/main/java/org/apache/syncope/installer/utilities/InstallLog.java index 2893e82..04bfd2e 100644 --- a/installer/src/main/java/org/apache/syncope/installer/utilities/InstallLog.java +++ b/installer/src/main/java/org/apache/syncope/installer/utilities/InstallLog.java @@ -24,7 +24,7 @@ import java.util.Date; public final class InstallLog { - private static InstallLog INSTANCE = null; + private static InstallLog INSTANCE; private final File log;