This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 93b8d3e NOJIRA: Fix checkstyle issues related to line length (#110)
93b8d3e is described below
commit 93b8d3e62c777dea95c52cb4a560fa4f8ef8c840
Author: Misagh Moayyed <[email protected]>
AuthorDate: Wed Sep 4 16:40:25 2019 +0430
NOJIRA: Fix checkstyle issues related to line length (#110)
---
.../wizards/resources/ResourceProvision.java | 33 +--
.../wizards/resources/ResourceProvisionPanel.java | 4 +-
.../markup/html/form/AjaxCheckBoxPanel.java | 3 +-
.../client/ui/commons/status/StatusUtils.java | 3 +-
.../client/console/commons/AnyDataProvider.java | 6 +-
.../commons/IdRepoImplementationInfoProvider.java | 3 +-
.../notifications/NotificationWizardBuilder.java | 3 +-
.../client/console/panels/DirectoryPanel.java | 3 +-
.../client/console/panels/ListViewPanel.java | 7 +-
.../syncope/client/console/panels/TogglePanel.java | 3 +-
.../client/console/rest/PolicyRestClient.java | 3 +-
.../wizards/any/AnyObjectWizardBuilder.java | 3 +-
.../console/wizards/any/ConnObjectPanel.java | 6 +-
.../console/wizards/any/GroupWizardBuilder.java | 3 +-
.../console/wizards/any/UserWizardBuilder.java | 3 +-
.../enduser/wizards/any/UserWizardBuilder.java | 3 +-
.../apache/syncope/common/lib/to/MappingTO.java | 6 +-
.../apache/syncope/common/lib/to/OrgUnitTO.java | 6 +-
.../lib/SyncopeClientCompositeException.java | 3 +-
.../org/apache/syncope/core/logic/ReportLogic.java | 3 +-
.../core/rest/cxf/RestServiceExceptionMapper.java | 3 +-
.../jpa/dao/DefaultPullCorrelationRule.java | 3 +-
.../core/persistence/jpa/dao/JPAAnyMatchDAO.java | 3 +-
.../jpa/entity/AbstractAnnotatedEntity.java | 3 +-
.../jpa/entity/resource/JPAOrgUnit.java | 3 +-
.../jpa/entity/resource/JPAProvision.java | 3 +-
.../core/persistence/jpa/entity/user/JPAUser.java | 9 +-
.../jpa/openjpa/BooleanValueHandler.java | 3 +-
.../jpa/openjpa/LocaleValueHandler.java | 3 +-
.../core/provisioning/java/MappingManagerImpl.java | 6 +-
.../java/data/ResourceDataBinderImpl.java | 3 +-
.../PriorityPropagationTaskExecutor.java | 3 +-
.../java/propagation/PropagationManagerImpl.java | 228 +++++++++++----------
.../java/pushpull/DBPasswordPullActions.java | 3 +-
.../core/provisioning/java/pushpull/PushUtils.java | 4 +-
.../provisioning/java/utils/ConnObjectUtils.java | 3 +-
.../core/spring/ApplicationContextProvider.java | 3 +-
.../flowable/impl/FlowableUserRequestHandler.java | 4 +-
.../syncope/common/lib/to/OIDCProviderTO.java | 6 +-
.../apache/syncope/core/logic/OIDCClientLogic.java | 4 +-
.../apache/syncope/common/lib/to/SAML2IdPTO.java | 6 +-
.../apache/syncope/core/logic/SAML2IdPLogic.java | 3 +-
.../syncope/core/logic/scim/SearchCondVisitor.java | 5 +-
.../fit/buildtools/cxf/ProvisioningImpl.java | 3 +-
.../view/ResourceExplorerTopComponent.java | 3 +-
45 files changed, 247 insertions(+), 180 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvision.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvision.java
index 81971ba..2d0fb6d 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvision.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvision.java
@@ -18,17 +18,17 @@
*/
package org.apache.syncope.client.console.wizards.resources;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
+import org.apache.syncope.client.console.panels.ToggleableTarget;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ItemTO;
import org.apache.syncope.common.lib.to.MappingTO;
import org.apache.syncope.common.lib.to.OrgUnitTO;
import org.apache.syncope.common.lib.to.ProvisionTO;
-import org.apache.syncope.client.console.panels.ToggleableTarget;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
public class ResourceProvision implements ToggleableTarget {
@@ -89,16 +89,16 @@ public class ResourceProvision implements ToggleableTarget {
@Override
public String getKey() {
return provisionTO == null
- ?
Optional.ofNullable(orgUnitTO).map(OrgUnitTO::getKey).orElse(null)
- : provisionTO.getKey();
+ ?
Optional.ofNullable(orgUnitTO).map(OrgUnitTO::getKey).orElse(null)
+ : provisionTO.getKey();
}
@Override
public String getAnyType() {
return provisionTO == null
- ? orgUnitTO == null
- ? null
- : SyncopeConstants.REALM_ANYTYPE :
provisionTO.getAnyType();
+ ? orgUnitTO == null
+ ? null
+ : SyncopeConstants.REALM_ANYTYPE : provisionTO.getAnyType();
}
public void setAnyType(final String anyType) {
@@ -113,7 +113,9 @@ public class ResourceProvision implements ToggleableTarget {
public String getObjectClass() {
return provisionTO == null
- ?
Optional.ofNullable(orgUnitTO).map(OrgUnitTO::getObjectClass).orElse(null) :
provisionTO.getObjectClass();
+ ? Optional.ofNullable(orgUnitTO)
+ .map(OrgUnitTO::getObjectClass)
+ .orElse(null) : provisionTO.getObjectClass();
}
public void setObjectClass(final String objectClass) {
@@ -129,7 +131,8 @@ public class ResourceProvision implements ToggleableTarget {
}
public boolean isIgnoreCaseMatch() {
- return
Optional.ofNullable(provisionTO).map(ProvisionTO::isIgnoreCaseMatch).orElseGet(()
-> orgUnitTO.isIgnoreCaseMatch());
+ return Optional.ofNullable(provisionTO)
+ .map(ProvisionTO::isIgnoreCaseMatch).orElseGet(() ->
orgUnitTO.isIgnoreCaseMatch());
}
public void setIgnoreCaseMatch(final boolean ignoreCaseMatch) {
@@ -142,8 +145,8 @@ public class ResourceProvision implements ToggleableTarget {
public String getConnObjectLink() {
return provisionTO == null
- ?
Optional.ofNullable(orgUnitTO).map(OrgUnitTO::getConnObjectLink).orElse(null)
- : provisionTO.getMapping().getConnObjectLink();
+ ?
Optional.ofNullable(orgUnitTO).map(OrgUnitTO::getConnObjectLink).orElse(null)
+ : provisionTO.getMapping().getConnObjectLink();
}
public void setConnObjectLink(final String connObjectLink) {
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
index 7836652..122411a 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
@@ -96,7 +96,9 @@ public class ResourceProvisionPanel extends
AbstractModalPanel<Serializable> {
protected ResourceProvision getActualItem(
final ResourceProvision item, final
List<ResourceProvision> list) {
- return Optional.ofNullable(item).map(resourceProvision ->
list.stream().filter(in -> ((resourceProvision.getKey() == null && in.getKey()
== null)
+ return Optional.ofNullable(item)
+ .map(resourceProvision -> list.stream()
+ .filter(in -> ((resourceProvision.getKey() == null &&
in.getKey() == null)
|| (in.getKey() != null &&
in.getKey().equals(resourceProvision.getKey())))
&& ((resourceProvision.getAnyType() == null &&
in.getAnyType() == null)
|| (in.getAnyType() != null &&
in.getAnyType().equals(resourceProvision.getAnyType())))).
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
index d2967c1..bb52e5b 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
@@ -116,7 +116,8 @@ public class AjaxCheckBoxPanel extends FieldPanel<Boolean> {
@Override
@SuppressWarnings("unchecked")
public void setObject(final Boolean object) {
-
item.setModelObject(Optional.ofNullable(object).map(Object::toString).orElseGet(Boolean.FALSE::toString));
+ item.setModelObject(Optional.ofNullable(object)
+ .map(Object::toString).orElseGet(Boolean.FALSE::toString));
}
};
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/status/StatusUtils.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/status/StatusUtils.java
index dd0f335..d964136 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/status/StatusUtils.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/status/StatusUtils.java
@@ -68,7 +68,8 @@ public final class StatusUtils implements Serializable {
if (connObjectTO != null) {
Boolean enabled = isEnabled(connObjectTO);
- statusBean.setStatus(Optional.ofNullable(enabled).filter(aBoolean
-> !aBoolean).map(aBoolean -> Status.SUSPENDED).orElse(Status.ACTIVE));
+ statusBean.setStatus(Optional.ofNullable(enabled)
+ .filter(aBoolean -> !aBoolean).map(aBoolean ->
Status.SUSPENDED).orElse(Status.ACTIVE));
statusBean.setConnObjectLink(getConnObjectLink(connObjectTO));
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
index b4b72bc..6df9e1c 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
@@ -110,7 +110,8 @@ public class AnyDataProvider<A extends AnyTO> extends
DirectoryDataProvider<A> {
SyncopeConsoleSession.get().error(e.getMessage());
Optional<AjaxRequestTarget> target =
RequestCycle.get().find(AjaxRequestTarget.class);
- target.ifPresent(ajaxRequestTarget -> ((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(ajaxRequestTarget));
+ target.ifPresent(ajaxRequestTarget ->
+ ((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(ajaxRequestTarget));
}
Collections.sort(result, comparator);
@@ -132,7 +133,8 @@ public class AnyDataProvider<A extends AnyTO> extends
DirectoryDataProvider<A> {
SyncopeConsoleSession.get().error(e.getMessage());
Optional<AjaxRequestTarget> target =
RequestCycle.get().find(AjaxRequestTarget.class);
- target.ifPresent(ajaxRequestTarget -> ((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(ajaxRequestTarget));
+ target.ifPresent(ajaxRequestTarget ->
+ ((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(ajaxRequestTarget));
}
return result;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
index 3dc07ff..8dd4ee5 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
@@ -63,7 +63,8 @@ public class IdRepoImplementationInfoProvider implements
ImplementationInfoProvi
if (viewMode == ViewMode.JAVA_CLASS) {
Optional<JavaImplInfo> javaClasses =
SyncopeConsoleSession.get().getPlatformInfo().
getJavaImplInfo(implementation.getType());
- classes = javaClasses.map(javaImplInfo -> new
ArrayList<>(javaImplInfo.getClasses())).orElseGet(ArrayList::new);
+ classes = javaClasses.map(javaImplInfo -> new
ArrayList<>(javaImplInfo.getClasses()))
+ .orElseGet(ArrayList::new);
} else if (viewMode == ViewMode.JSON_BODY) {
switch (implementation.getType()) {
case IdRepoImplementationType.REPORTLET:
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
index b39ae9a..da114c3 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
@@ -400,7 +400,8 @@ public class NotificationWizardBuilder extends
BaseAjaxWizardBuilder<Notificatio
LOG.error("While reading all any types", e);
}
- String[] anyTypeClasses = Optional.ofNullable(type).map(anyTypeTO ->
anyTypeTO.getClasses().toArray(new String[]{})).orElseGet(() -> new String[0]);
+ String[] anyTypeClasses = Optional.ofNullable(type)
+ .map(anyTypeTO -> anyTypeTO.getClasses().toArray(new
String[]{})).orElseGet(() -> new String[0]);
List<String> result = new ArrayList<>();
result.add("username");
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
index 23f87cf..14b17c1 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
@@ -278,7 +278,8 @@ public abstract class DirectoryPanel<
private void updateResultTable(final boolean create, final int rows) {
dataProvider = dataProvider();
- final int currentPage = Optional.ofNullable(resultTable).map(table ->
(create ? (int) table.getPageCount() - 1 : (int)
table.getCurrentPage())).orElse(0);
+ final int currentPage = Optional.ofNullable(resultTable)
+ .map(table -> (create ? (int) table.getPageCount() - 1 : (int)
table.getCurrentPage())).orElse(0);
// take care of restClient handle: maybe not useful to keep into
AjaxDataTablePanel.Builder<T, String> resultTableBuilder = new
AjaxDataTablePanel.Builder<T, String>(
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java
index 58a4b95..d1d04e2 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java
@@ -384,11 +384,14 @@ public abstract class ListViewPanel<T extends
Serializable> extends WizardMgtPan
LOG.debug("Field value {}", value);
- return Optional.ofNullable(value).map(o -> new Label("field", new
ResourceModel(o.toString(), o.toString()))).orElseGet(() -> new Label("field",
StringUtils.EMPTY));
+ return Optional.ofNullable(value)
+ .map(o -> new Label("field", new ResourceModel(o.toString(),
o.toString())))
+ .orElseGet(() -> new Label("field", StringUtils.EMPTY));
}
protected T getActualItem(final T item, final List<T> list) {
- return Optional.ofNullable(item).map(t ->
list.stream().filter(t::equals).findAny().orElse(null)).orElse(null);
+ return Optional.ofNullable(item)
+ .map(t ->
list.stream().filter(t::equals).findAny().orElse(null)).orElse(null);
}
@Override
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
index 5408f65..1290702 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
@@ -153,7 +153,8 @@ public abstract class TogglePanel<T extends Serializable>
extends WizardMgtPanel
}
protected void setHeader(final AjaxRequestTarget target, final String
header) {
- this.header.setDefaultModelObject(Optional.ofNullable(header).map(s ->
s.length() >= 40 ? (s.substring(0, 30) + " ... ") :
s).orElse(StringUtils.EMPTY));
+ this.header.setDefaultModelObject(Optional.ofNullable(header).map(s ->
s.length() >= 40
+ ? (s.substring(0, 30) + " ... ") : s).orElse(StringUtils.EMPTY));
target.add(this.header);
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
index 39a25ac..8dfe3ec 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
@@ -77,7 +77,8 @@ public class PolicyRestClient extends BaseRestClient {
@Override
public int compare(final PolicyTO left, final PolicyTO right) {
- return Optional.ofNullable(left).map(to ->
Optional.ofNullable(right).map(policyTO ->
to.getDescription().compareTo(policyTO.getDescription())).orElse(1)).orElse(-1);
+ return Optional.ofNullable(left).map(to ->
Optional.ofNullable(right)
+ .map(policyTO ->
to.getDescription().compareTo(policyTO.getDescription())).orElse(1)).orElse(-1);
}
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
index 8d028ca..2882bff 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
@@ -47,7 +47,8 @@ public class AnyObjectWizardBuilder extends
AnyWizardBuilder<AnyObjectTO> implem
final AnyObjectFormLayoutInfo formLayoutInfo,
final PageReference pageRef) {
-
super(Optional.ofNullable(anyObjectTO).map(AnyObjectWrapper::new).orElse(null),
anyTypeClasses, formLayoutInfo, pageRef);
+ super(Optional.ofNullable(anyObjectTO).map(AnyObjectWrapper::new)
+ .orElse(null), anyTypeClasses, formLayoutInfo, pageRef);
}
/**
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
index 2cf449f..36c347e 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
@@ -96,8 +96,10 @@ public class ConnObjectPanel extends Panel {
final String prop = item.getModelObject();
final Fragment valueFragment;
- final Attr left =
Optional.ofNullable(leftProfile).map(stringAttrMap ->
stringAttrMap.get(prop)).orElse(null);
- final Attr right =
Optional.ofNullable(rightProfile).map(profile ->
profile.get(prop)).orElse(null);
+ final Attr left = Optional.ofNullable(leftProfile)
+ .map(stringAttrMap ->
stringAttrMap.get(prop)).orElse(null);
+ final Attr right = Optional.ofNullable(rightProfile)
+ .map(profile -> profile.get(prop)).orElse(null);
valueFragment = new Fragment("value", "doubleValue",
ConnObjectPanel.this);
valueFragment.add(getValuePanel("leftAttribute", prop, left).
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
index 9f70139..971af2e 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
@@ -50,7 +50,8 @@ public class GroupWizardBuilder extends
AnyWizardBuilder<GroupTO> implements Gro
final GroupFormLayoutInfo formLayoutInfo,
final PageReference pageRef) {
-
super(Optional.ofNullable(groupTO).map(GroupWrapper::new).orElse(null),
anyTypeClasses, formLayoutInfo, pageRef);
+ super(Optional.ofNullable(groupTO).map(GroupWrapper::new)
+ .orElse(null), anyTypeClasses, formLayoutInfo, pageRef);
}
/**
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
index 40f46f1..598bcbe 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
@@ -131,7 +131,8 @@ public class UserWizardBuilder extends
AnyWizardBuilder<UserTO> implements UserF
*/
@Override
public UserWizardBuilder setItem(final AnyWrapper<UserTO> item) {
- super.setItem(Optional.ofNullable(item).map(userTOAnyWrapper -> new
UserWrapper(userTOAnyWrapper.getInnerObject())).orElse(null));
+ super.setItem(Optional.ofNullable(item)
+ .map(userTOAnyWrapper -> new
UserWrapper(userTOAnyWrapper.getInnerObject())).orElse(null));
return this;
}
}
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserWizardBuilder.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserWizardBuilder.java
index bd14024..e2a82bb 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserWizardBuilder.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/wizards/any/UserWizardBuilder.java
@@ -125,7 +125,8 @@ public class UserWizardBuilder extends AnyWizardBuilder
implements UserForm {
*/
@Override
public UserWizardBuilder setItem(final AnyWrapper<UserTO> item) {
- super.setItem(Optional.ofNullable(item).map(userTOAnyWrapper -> new
UserWrapper(userTOAnyWrapper.getInnerObject())).orElse(null));
+ super.setItem(Optional.ofNullable(item)
+ .map(userTOAnyWrapper -> new
UserWrapper(userTOAnyWrapper.getInnerObject())).orElse(null));
return this;
}
diff --git
a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
index d5f7426..85b3c17 100644
---
a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
+++
b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
@@ -63,7 +63,8 @@ public class MappingTO implements ItemContainerTO,
Serializable {
@Override
public boolean setConnObjectKeyItem(final ItemTO connObjectKeyItem) {
- return
Optional.ofNullable(connObjectKeyItem).map(this::addConnObjectKeyItem).orElseGet(()
-> remove(getConnObjectKeyItem()));
+ return Optional.ofNullable(connObjectKeyItem)
+ .map(this::addConnObjectKeyItem).orElseGet(() ->
remove(getConnObjectKeyItem()));
}
@XmlElementWrapper(name = "items")
@@ -76,7 +77,8 @@ public class MappingTO implements ItemContainerTO,
Serializable {
@Override
public boolean add(final ItemTO item) {
- return Optional.ofNullable(item).filter(itemTO ->
this.items.contains(itemTO) || this.items.add(itemTO)).isPresent();
+ return Optional.ofNullable(item)
+ .filter(itemTO -> this.items.contains(itemTO) ||
this.items.add(itemTO)).isPresent();
}
public boolean remove(final ItemTO item) {
diff --git
a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
index 5e3e1f1..6897d53 100644
---
a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
+++
b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
@@ -102,7 +102,8 @@ public class OrgUnitTO implements EntityTO, ItemContainerTO
{
@Override
public boolean setConnObjectKeyItem(final ItemTO connObjectKeyItem) {
- return
Optional.ofNullable(connObjectKeyItem).map(this::addConnObjectKeyItem).orElseGet(()
-> remove(getConnObjectKeyItem()));
+ return Optional.ofNullable(connObjectKeyItem)
+ .map(this::addConnObjectKeyItem).orElseGet(() ->
remove(getConnObjectKeyItem()));
}
@XmlElementWrapper(name = "items")
@@ -115,7 +116,8 @@ public class OrgUnitTO implements EntityTO, ItemContainerTO
{
@Override
public boolean add(final ItemTO item) {
- return Optional.ofNullable(item).filter(itemTO ->
this.items.contains(itemTO) || this.items.add(itemTO)).isPresent();
+ return Optional.ofNullable(item)
+ .filter(itemTO -> this.items.contains(itemTO) ||
this.items.add(itemTO)).isPresent();
}
public boolean remove(final ItemTO item) {
diff --git
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
index 6a7a141..368b97c 100644
---
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
+++
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
@@ -70,7 +70,8 @@ public class SyncopeClientCompositeException extends
SyncopeClientException {
Optional<SyncopeClientException> alreadyAdded =
exceptions.stream().filter(ex -> ex.getType() ==
exception.getType()).findFirst();
- return alreadyAdded.map(e ->
e.getElements().addAll(exception.getElements())).orElseGet(() ->
exceptions.add(exception));
+ return alreadyAdded.map(e -> e.getElements()
+ .addAll(exception.getElements())).orElseGet(() ->
exceptions.add(exception));
}
@Override
diff --git
a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
index 86aea3d..d13b39a 100644
---
a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
+++
b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
@@ -373,7 +373,8 @@ public class ReportLogic extends
AbstractExecutableLogic<ReportTO> {
String key = JobNamer.getReportKeyFromJobName(jobKey.getName());
Report report = reportDAO.find(key);
- return Optional.ofNullable(report).map(report1 ->
Triple.of(JobType.REPORT, key, binder.buildRefDesc(report1))).orElse(null);
+ return Optional.ofNullable(report)
+ .map(report1 -> Triple.of(JobType.REPORT, key,
binder.buildRefDesc(report1))).orElse(null);
}
@PreAuthorize("hasRole('" + IdRepoEntitlement.REPORT_LIST + "')")
diff --git
a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
index 83f3f39..09c8aff 100644
---
a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
+++
b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
@@ -319,6 +319,7 @@ public class RestServiceExceptionMapper implements
ExceptionMapper<Exception> {
message = env.getProperty("errMessage." + UNIQUE_MSG_KEY);
}
- return Optional.ofNullable(message).orElseGet(() -> (ex.getCause() ==
null) ? ex.getMessage() : ex.getCause().getMessage());
+ return Optional.ofNullable(message)
+ .orElseGet(() -> (ex.getCause() == null) ? ex.getMessage() :
ex.getCause().getMessage());
}
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPullCorrelationRule.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPullCorrelationRule.java
index cb122c6..05f6338 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPullCorrelationRule.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPullCorrelationRule.java
@@ -61,7 +61,8 @@ public class DefaultPullCorrelationRule implements
PullCorrelationRule {
conf.getSchemas().forEach(schema -> {
Item item = mappingItems.get(schema);
- Attribute attr = Optional.ofNullable(item).map(item1 ->
syncDelta.getObject().getAttributeByName(item1.getExtAttrName())).orElse(null);
+ Attribute attr = Optional.ofNullable(item)
+ .map(item1 ->
syncDelta.getObject().getAttributeByName(item1.getExtAttrName())).orElse(null);
if (attr == null) {
throw new IllegalArgumentException(
"Connector object does not contains the attributes to
perform the search: " + schema);
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyMatchDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyMatchDAO.java
index c5b7baf..ab27218 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyMatchDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyMatchDAO.java
@@ -183,7 +183,8 @@ public class JPAAnyMatchDAO extends AbstractDAO<Any<?>>
implements AnyMatchDAO {
private boolean matches(final Any<?> any, final AssignableCond cond, final
boolean not) {
Realm realm = realmDAO.findByFullPath(cond.getRealmFullPath());
- boolean found = Optional.ofNullable(realm).filter(realm1 ->
(cond.isFromGroup() ? realmDAO.findDescendants(realm1) :
realmDAO.findAncestors(realm1)).
+ boolean found = Optional.ofNullable(realm)
+ .filter(realm1 -> (cond.isFromGroup() ?
realmDAO.findDescendants(realm1) : realmDAO.findAncestors(realm1)).
stream().anyMatch(item ->
item.equals(any.getRealm()))).isPresent();
return not ? !found : found;
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
index 7d3739e..9f9b14a 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractAnnotatedEntity.java
@@ -106,6 +106,7 @@ public abstract class AbstractAnnotatedEntity extends
AbstractGeneratedKeyEntity
@Override
public void setLastChangeDate(final Date lastChangeDate) {
- this.lastChangeDate =
Optional.ofNullable(lastChangeDate).map(changeDate -> new
Date(changeDate.getTime())).orElse(null);
+ this.lastChangeDate = Optional.ofNullable(lastChangeDate)
+ .map(changeDate -> new Date(changeDate.getTime())).orElse(null);
}
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAOrgUnit.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAOrgUnit.java
index 0efe38e..f4768c1 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAOrgUnit.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAOrgUnit.java
@@ -88,7 +88,8 @@ public class JPAOrgUnit extends AbstractGeneratedKeyEntity
implements OrgUnit {
@Override
public SyncToken getSyncToken() {
- return Optional.ofNullable(serializedSyncToken).map(syncToken ->
POJOHelper.deserialize(syncToken, SyncToken.class)).orElse(null);
+ return Optional.ofNullable(serializedSyncToken)
+ .map(syncToken -> POJOHelper.deserialize(syncToken,
SyncToken.class)).orElse(null);
}
@Override
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAProvision.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAProvision.java
index a1c27b2..6daf255 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAProvision.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAProvision.java
@@ -133,7 +133,8 @@ public class JPAProvision extends
AbstractGeneratedKeyEntity implements Provisio
@Override
public SyncToken getSyncToken() {
- return Optional.ofNullable(serializedSyncToken).map(syncToken ->
POJOHelper.deserialize(syncToken, SyncToken.class)).orElse(null);
+ return Optional.ofNullable(serializedSyncToken)
+ .map(syncToken -> POJOHelper.deserialize(syncToken,
SyncToken.class)).orElse(null);
}
@Override
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 99ffdf6..073a889 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
@@ -312,7 +312,8 @@ public class JPAUser
@Override
public boolean checkToken(final String token) {
- return Optional.ofNullable(this.token).map(s -> s.equals(token) &&
!hasTokenExpired()).orElseGet(() -> token == null);
+ return Optional.ofNullable(this.token)
+ .map(s -> s.equals(token) && !hasTokenExpired()).orElseGet(() ->
token == null);
}
@Override
@@ -332,7 +333,8 @@ public class JPAUser
@Override
public void setChangePwdDate(final Date changePwdDate) {
- this.changePwdDate = Optional.ofNullable(changePwdDate).map(pwdDate ->
new Date(pwdDate.getTime())).orElse(null);
+ this.changePwdDate = Optional.ofNullable(changePwdDate)
+ .map(pwdDate -> new Date(pwdDate.getTime())).orElse(null);
}
@Override
@@ -352,7 +354,8 @@ public class JPAUser
@Override
public void setLastLoginDate(final Date lastLoginDate) {
- this.lastLoginDate = Optional.ofNullable(lastLoginDate).map(loginDate
-> new Date(loginDate.getTime())).orElse(null);
+ this.lastLoginDate = Optional.ofNullable(lastLoginDate)
+ .map(loginDate -> new Date(loginDate.getTime())).orElse(null);
}
@Override
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
index c18fcef..f5ee2e7 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
@@ -48,7 +48,8 @@ public class BooleanValueHandler extends AbstractValueHandler
{
@Override
public Column[] map(final ValueMapping vm, final String name, final
ColumnIO io, final boolean adapt) {
DBDictionary dict = vm.getMappingRepository().getDBDictionary();
- DBIdentifier colName = DBIdentifier.newColumn(name,
Optional.ofNullable(dict).filter(DBDictionary::delimitAll).isPresent());
+ DBIdentifier colName = DBIdentifier.newColumn(name,
Optional.ofNullable(dict)
+ .filter(DBDictionary::delimitAll).isPresent());
return map(vm, colName, io, adapt);
}
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
index 791bd0e..6a7a00a 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
@@ -49,7 +49,8 @@ public class LocaleValueHandler extends AbstractValueHandler {
@Override
public Column[] map(final ValueMapping vm, final String name, final
ColumnIO io, final boolean adapt) {
DBDictionary dict = vm.getMappingRepository().getDBDictionary();
- DBIdentifier colName = DBIdentifier.newColumn(name,
Optional.ofNullable(dict).filter(DBDictionary::delimitAll).isPresent());
+ DBIdentifier colName = DBIdentifier.newColumn(name,
Optional.ofNullable(dict)
+ .filter(DBDictionary::delimitAll).isPresent());
return map(vm, colName, io, adapt);
}
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index f813f1e..9c727ce 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -636,7 +636,8 @@ public class MappingManagerImpl implements MappingManager {
preparedAttr = prepareAttr(provision, connObjectKeyItem.get(),
any, null);
}
- return Optional.ofNullable(preparedAttr).map(attr ->
MappingUtils.evaluateNAME(any, provision,
attr.getKey()).getNameValue()).orElse(null);
+ return Optional.ofNullable(preparedAttr)
+ .map(attr -> MappingUtils.evaluateNAME(any, provision,
attr.getKey()).getNameValue()).orElse(null);
}
@Transactional(readOnly = true)
@@ -665,7 +666,8 @@ public class MappingManagerImpl implements MappingManager {
public Optional<String> getConnObjectKeyValue(final Realm realm, final
OrgUnit orgUnit) {
OrgUnitItem orgUnitItem = orgUnit.getConnObjectKeyItem().get();
- return
Optional.ofNullable(Optional.ofNullable(orgUnitItem).map(unitItem ->
getIntValue(realm, unitItem)).orElse(null));
+ return Optional.ofNullable(Optional.ofNullable(orgUnitItem)
+ .map(unitItem -> getIntValue(realm, unitItem)).orElse(null));
}
@Transactional(readOnly = true)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
index e0119b8..1f000a5 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
@@ -625,7 +625,8 @@ public class ResourceDataBinderImpl implements
ResourceDataBinder {
ConnInstance connector = resource.getConnector();
resourceTO.setConnector(Optional.ofNullable(connector).map(Entity::getKey).orElse(null));
-
resourceTO.setConnectorDisplayName(Optional.ofNullable(connector).map(ConnInstance::getDisplayName).orElse(null));
+ resourceTO.setConnectorDisplayName(Optional.ofNullable(connector)
+ .map(ConnInstance::getDisplayName).orElse(null));
// set the provision information
resource.getProvisions().forEach(provision -> {
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
index c131b5b..ccdaf88 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
@@ -124,7 +124,8 @@ public class PriorityPropagationTaskExecutor extends
AbstractPropagationTaskExec
execStatus = ExecStatus.FAILURE;
}
if (execStatus != ExecStatus.SUCCESS) {
- throw new PropagationException(task.getResource(),
Optional.ofNullable(execution).map(Exec::getMessage).orElse(null));
+ throw new PropagationException(task.getResource(),
Optional.ofNullable(execution)
+ .map(Exec::getMessage).orElse(null));
}
});
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
index 3529b3d..1a5d3c7 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
@@ -18,37 +18,21 @@
*/
package org.apache.syncope.core.provisioning.java.propagation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.request.UserUR;
import org.apache.syncope.common.lib.Attr;
+import org.apache.syncope.common.lib.request.UserUR;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
+import org.apache.syncope.core.persistence.api.dao.AnyDAO;
+import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
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.EntityFactory;
-import org.apache.syncope.core.provisioning.api.WorkflowResult;
-import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
-import
org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
-import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
-import org.apache.syncope.core.provisioning.java.jexl.JexlUtils;
-import org.apache.syncope.core.persistence.api.dao.AnyDAO;
-import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.dao.VirSchemaDAO;
import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyUtilsFactory;
+import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.VirSchema;
import
org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
@@ -56,8 +40,14 @@ import
org.apache.syncope.core.persistence.api.entity.resource.Item;
import org.apache.syncope.core.persistence.api.entity.resource.OrgUnit;
import org.apache.syncope.core.persistence.api.entity.resource.Provision;
import org.apache.syncope.core.provisioning.api.MappingManager;
+import org.apache.syncope.core.provisioning.api.PropagationByResource;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
+import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
+import
org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
import
org.apache.syncope.core.provisioning.api.propagation.PropagationTaskInfo;
import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
+import org.apache.syncope.core.provisioning.java.jexl.JexlUtils;
+import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
@@ -67,10 +57,21 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
/**
* Manage the data propagation to external resources.
*/
-@Transactional(rollbackFor = { Throwable.class })
+@Transactional(rollbackFor = {Throwable.class})
public class PropagationManagerImpl implements PropagationManager {
protected static final Logger LOG =
LoggerFactory.getLogger(PropagationManager.class);
@@ -135,35 +136,35 @@ public class PropagationManagerImpl implements
PropagationManager {
@Override
public List<PropagationTaskInfo> getCreateTasks(
- final AnyTypeKind kind,
- final String key,
- final Boolean enable,
- final PropagationByResource propByRes,
- final Collection<Attr> vAttrs,
- final Collection<String> noPropResourceKeys) {
+ final AnyTypeKind kind,
+ final String key,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<Attr> vAttrs,
+ final Collection<String> noPropResourceKeys) {
return getCreateTasks(dao(kind).authFind(key), null, enable,
propByRes, vAttrs, noPropResourceKeys);
}
@Override
public List<PropagationTaskInfo> getUserCreateTasks(
- final String key,
- final String password,
- final Boolean enable,
- final PropagationByResource propByRes,
- final Collection<Attr> vAttrs,
- final Collection<String> noPropResourceKeys) {
+ final String key,
+ final String password,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<Attr> vAttrs,
+ final Collection<String> noPropResourceKeys) {
return getCreateTasks(userDAO.authFind(key), password, enable,
propByRes, vAttrs, noPropResourceKeys);
}
protected List<PropagationTaskInfo> getCreateTasks(
- final Any<?> any,
- final String password,
- final Boolean enable,
- final PropagationByResource propByRes,
- final Collection<Attr> vAttrs,
- final Collection<String> noPropResourceKeys) {
+ final Any<?> any,
+ final String password,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<Attr> vAttrs,
+ final Collection<String> noPropResourceKeys) {
if (propByRes == null || propByRes.isEmpty()) {
return Collections.<PropagationTaskInfo>emptyList();
@@ -178,33 +179,33 @@ public class PropagationManagerImpl implements
PropagationManager {
@Override
public List<PropagationTaskInfo> getUpdateTasks(
- final AnyTypeKind kind,
- final String key,
- final boolean changePwd,
- final Boolean enable,
- final PropagationByResource propByRes,
- final Collection<Attr> vAttrs,
- final Collection<String> noPropResourceKeys) {
+ final AnyTypeKind kind,
+ final String key,
+ final boolean changePwd,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<Attr> vAttrs,
+ final Collection<String> noPropResourceKeys) {
return getUpdateTasks(dao(kind).authFind(key), null, changePwd,
enable, propByRes, vAttrs, noPropResourceKeys);
}
@Override
public List<PropagationTaskInfo> getUserUpdateTasks(
- final WorkflowResult<Pair<UserUR, Boolean>> wfResult,
- final boolean changePwd,
- final Collection<String> noPropResourceKeys) {
+ final WorkflowResult<Pair<UserUR, Boolean>> wfResult,
+ final boolean changePwd,
+ final Collection<String> noPropResourceKeys) {
return getUpdateTasks(
- userDAO.authFind(wfResult.getResult().getLeft().getKey()),
- wfResult.getResult().getKey().getPassword() == null
+ userDAO.authFind(wfResult.getResult().getLeft().getKey()),
+ wfResult.getResult().getKey().getPassword() == null
? null
: wfResult.getResult().getKey().getPassword().getValue(),
- changePwd,
- wfResult.getResult().getValue(),
- wfResult.getPropByRes(),
- wfResult.getResult().getKey().getVirAttrs(),
- noPropResourceKeys);
+ changePwd,
+ wfResult.getResult().getValue(),
+ wfResult.getPropByRes(),
+ wfResult.getResult().getKey().getVirAttrs(),
+ noPropResourceKeys);
}
@Override
@@ -222,7 +223,7 @@ public class PropagationManagerImpl implements
PropagationManager {
// b. generate the propagation task list in two phases: first the
ones containing password,
// the the rest (with no password)
WorkflowResult<Pair<UserUR, Boolean>> pwdWFResult = new
WorkflowResult<>(
- wfResult.getResult(), new PropagationByResource(),
wfResult.getPerformedTasks());
+ wfResult.getResult(), new PropagationByResource(),
wfResult.getPerformedTasks());
Set<String> pwdResourceNames = new
HashSet<>(userUR.getPassword().getResources());
Collection<String> allResourceNames =
userDAO.findAllResourceKeys(userUR.getKey());
@@ -232,14 +233,14 @@ public class PropagationManagerImpl implements
PropagationManager {
if (!pwdWFResult.getPropByRes().isEmpty()) {
Set<String> toBeExcluded = new HashSet<>(allResourceNames);
toBeExcluded.addAll(userUR.getResources().stream().
- map(patchItem ->
patchItem.getValue()).collect(Collectors.toList()));
+ map(patchItem ->
patchItem.getValue()).collect(Collectors.toList()));
toBeExcluded.removeAll(pwdResourceNames);
tasks.addAll(getUserUpdateTasks(pwdWFResult, true,
toBeExcluded));
}
WorkflowResult<Pair<UserUR, Boolean>> noPwdWFResult = new
WorkflowResult<>(
- wfResult.getResult(), new PropagationByResource(),
wfResult.getPerformedTasks());
+ wfResult.getResult(), new PropagationByResource(),
wfResult.getPerformedTasks());
noPwdWFResult.getPropByRes().merge(wfResult.getPropByRes());
noPwdWFResult.getPropByRes().removeAll(pwdResourceNames);
@@ -255,34 +256,34 @@ public class PropagationManagerImpl implements
PropagationManager {
}
protected List<PropagationTaskInfo> getUpdateTasks(
- final Any<?> any,
- final String password,
- final boolean changePwd,
- final Boolean enable,
- final PropagationByResource propByRes,
- final Collection<Attr> vAttrs,
- final Collection<String> noPropResourceKeys) {
+ final Any<?> any,
+ final String password,
+ final boolean changePwd,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<Attr> vAttrs,
+ final Collection<String> noPropResourceKeys) {
if (noPropResourceKeys != null && propByRes != null) {
propByRes.removeAll(noPropResourceKeys);
}
return createTasks(
- any,
- password,
- changePwd,
- enable,
- false,
+ any,
+ password,
+ changePwd,
+ enable,
+ false,
Optional.ofNullable(propByRes).orElseGet(PropagationByResource::new),
- vAttrs);
+ vAttrs);
}
@Override
public List<PropagationTaskInfo> getDeleteTasks(
- final AnyTypeKind kind,
- final String key,
- final PropagationByResource propByRes,
- final Collection<String> noPropResourceKeys) {
+ final AnyTypeKind kind,
+ final String key,
+ final PropagationByResource propByRes,
+ final Collection<String> noPropResourceKeys) {
Any<?> any = dao(kind).authFind(key);
@@ -302,9 +303,9 @@ public class PropagationManagerImpl implements
PropagationManager {
}
protected List<PropagationTaskInfo> getDeleteTasks(
- final Any<?> any,
- final PropagationByResource propByRes,
- final Collection<String> noPropResourceKeys) {
+ final Any<?> any,
+ final PropagationByResource propByRes,
+ final Collection<String> noPropResourceKeys) {
return createTasks(any, null, false, false, true, propByRes, null);
}
@@ -312,19 +313,20 @@ public class PropagationManagerImpl implements
PropagationManager {
/**
* Create propagation tasks.
*
- * @param any to be provisioned
- * @param password clear text password to be provisioned
- * @param changePwd whether password should be included for propagation
attributes or not
- * @param enable whether user must be enabled or not
+ * @param any to be provisioned
+ * @param password clear text password to be provisioned
+ * @param changePwd whether password should be included for
propagation attributes or not
+ * @param enable whether user must be enabled or not
* @param deleteOnResource whether any must be deleted anyway from
external resource or not
- * @param propByRes operation to be performed per resource
- * @param vAttrs virtual attributes to be set
+ * @param propByRes operation to be performed per resource
+ * @param vAttrs virtual attributes to be set
* @return list of propagation tasks created
*/
protected List<PropagationTaskInfo> createTasks(final Any<?> any,
- final String password, final boolean changePwd,
- final Boolean enable, final boolean deleteOnResource, final
PropagationByResource propByRes,
- final Collection<Attr> vAttrs) {
+ final String password,
final boolean changePwd,
+ final Boolean enable,
final boolean deleteOnResource,
+ final
PropagationByResource propByRes,
+ final Collection<Attr>
vAttrs) {
LOG.debug("Provisioning {}:\n{}", any, propByRes);
@@ -347,8 +349,8 @@ public class PropagationManagerImpl implements
PropagationManager {
} else if (schema.isReadonly()) {
LOG.warn("Ignoring read-only {} {}",
VirSchema.class.getSimpleName(), vAttr.getSchema());
} else if (anyUtilsFactory.getInstance(any).dao().
- findAllowedSchemas(any,
VirSchema.class).contains(schema)
- &&
virtualResources.contains(schema.getProvision().getResource().getKey())) {
+ findAllowedSchemas(any, VirSchema.class).contains(schema)
+ &&
virtualResources.contains(schema.getProvision().getResource().getKey())) {
Set<Attribute> values =
vAttrMap.get(schema.getProvision().getResource().getKey());
if (values == null) {
@@ -362,7 +364,7 @@ public class PropagationManagerImpl implements
PropagationManager {
}
} else {
LOG.warn("{} not owned by or {} not allowed for {}",
- schema.getProvision().getResource(), schema, any);
+ schema.getProvision().getResource(), schema, any);
}
});
}
@@ -372,19 +374,21 @@ public class PropagationManagerImpl implements
PropagationManager {
propByRes.asMap().forEach((resourceKey, operation) -> {
ExternalResource resource = resourceDAO.find(resourceKey);
- Provision provision =
Optional.ofNullable(resource).map(externalResource ->
externalResource.getProvision(any.getType()).orElse(null)).orElse(null);
+ Provision provision = Optional.ofNullable(resource)
+ .map(externalResource ->
externalResource.getProvision(any.getType())
+ .orElse(null)).orElse(null);
List<? extends Item> mappingItems = provision == null
- ? Collections.<Item>emptyList()
- :
MappingUtils.getPropagationItems(provision.getMapping().getItems());
+ ? Collections.<Item>emptyList()
+ :
MappingUtils.getPropagationItems(provision.getMapping().getItems());
if (resource == null) {
LOG.error("Invalid resource name specified: {}, ignoring...",
resourceKey);
} else if (provision == null) {
LOG.error("No provision specified on resource {} for type {},
ignoring...",
- resource, any.getType());
+ resource, any.getType());
} else if (mappingItems.isEmpty()) {
LOG.warn("Requesting propagation for {} but no propagation
mapping provided for {}",
- any.getType(), resource);
+ any.getType(), resource);
} else {
PropagationTaskInfo task = new PropagationTaskInfo();
task.setResource(resource.getKey());
@@ -398,7 +402,7 @@ public class PropagationManagerImpl implements
PropagationManager {
task.setOldConnObjectKey(propByRes.getOldConnObjectKey(resource.getKey()));
Pair<String, Set<Attribute>> preparedAttrs =
- mappingManager.prepareAttrs(any, password, changePwd,
enable, provision);
+ mappingManager.prepareAttrs(any, password, changePwd,
enable, provision);
task.setConnObjectKey(preparedAttrs.getKey());
// Check if any of mandatory attributes (in the mapping) is
missing or not received any value:
@@ -406,22 +410,22 @@ public class PropagationManagerImpl implements
PropagationManager {
List<String> mandatoryMissing = new ArrayList<>();
List<String> mandatoryNullOrEmpty = new ArrayList<>();
mappingItems.stream().filter(item -> (!item.isConnObjectKey()
- &&
JexlUtils.evaluateMandatoryCondition(item.getMandatoryCondition(), any))).
- forEachOrdered(item -> {
- Attribute attr =
AttributeUtil.find(item.getExtAttrName(), preparedAttrs.getValue());
- if (attr == null) {
- mandatoryMissing.add(item.getExtAttrName());
- } else if (attr.getValue() == null ||
attr.getValue().isEmpty()) {
-
mandatoryNullOrEmpty.add(item.getExtAttrName());
- }
- });
+ &&
JexlUtils.evaluateMandatoryCondition(item.getMandatoryCondition(), any))).
+ forEachOrdered(item -> {
+ Attribute attr =
AttributeUtil.find(item.getExtAttrName(), preparedAttrs.getValue());
+ if (attr == null) {
+ mandatoryMissing.add(item.getExtAttrName());
+ } else if (attr.getValue() == null ||
attr.getValue().isEmpty()) {
+ mandatoryNullOrEmpty.add(item.getExtAttrName());
+ }
+ });
if (!mandatoryMissing.isEmpty()) {
preparedAttrs.getValue().add(AttributeBuilder.build(
-
PropagationTaskExecutor.MANDATORY_MISSING_ATTR_NAME, mandatoryMissing));
+ PropagationTaskExecutor.MANDATORY_MISSING_ATTR_NAME,
mandatoryMissing));
}
if (!mandatoryNullOrEmpty.isEmpty()) {
preparedAttrs.getValue().add(AttributeBuilder.build(
-
PropagationTaskExecutor.MANDATORY_NULL_OR_EMPTY_ATTR_NAME,
mandatoryNullOrEmpty));
+
PropagationTaskExecutor.MANDATORY_NULL_OR_EMPTY_ATTR_NAME,
mandatoryNullOrEmpty));
}
if (vAttrMap.containsKey(resource.getKey())) {
@@ -441,9 +445,9 @@ public class PropagationManagerImpl implements
PropagationManager {
@Override
public List<PropagationTaskInfo> createTasks(
- final Realm realm,
- final PropagationByResource propByRes,
- final Collection<String> noPropResourceKeys) {
+ final Realm realm,
+ final PropagationByResource propByRes,
+ final Collection<String> noPropResourceKeys) {
if (noPropResourceKeys != null) {
propByRes.removeAll(noPropResourceKeys);
@@ -467,7 +471,7 @@ public class PropagationManagerImpl implements
PropagationManager {
LOG.error("No orgUnit specified on resource {}, ignoring...",
resource);
} else if (StringUtils.isBlank(orgUnit.getConnObjectLink())) {
LOG.warn("Requesting propagation for {} but no ConnObjectLink
provided for {}",
- realm.getFullPath(), resource);
+ realm.getFullPath(), resource);
} else {
PropagationTaskInfo task = new PropagationTaskInfo();
task.setResource(resource.getKey());
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DBPasswordPullActions.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DBPasswordPullActions.java
index 3451c6d..7e14317 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DBPasswordPullActions.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DBPasswordPullActions.java
@@ -85,7 +85,8 @@ public class DBPasswordPullActions implements PullActions {
if (anyUR instanceof UserUR) {
PasswordPatch modPassword = ((UserUR) anyUR).getPassword();
-
parseEncodedPassword(Optional.ofNullable(modPassword).map(AbstractPatchItem::getValue).orElse(null),
profile.getConnector());
+ parseEncodedPassword(Optional.ofNullable(modPassword)
+ .map(AbstractPatchItem::getValue).orElse(null),
profile.getConnector());
}
}
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
index 70fb396..5b992bd 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
@@ -70,7 +70,9 @@ public class PushUtils {
}
try {
- return rule.map(pushCorrelationRule ->
findByCorrelationRule(connector, any, provision,
pushCorrelationRule)).orElseGet(() -> findByConnObjectKey(connector, any,
provision));
+ return rule
+ .map(pushCorrelationRule -> findByCorrelationRule(connector,
any, provision, pushCorrelationRule))
+ .orElseGet(() -> findByConnObjectKey(connector, any,
provision));
} catch (RuntimeException e) {
LOG.error("Could not match {} with any existing {}", any,
provision.getObjectClass(), e);
return Collections.<ConnectorObject>emptyList();
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
index 5b85dc9..511c787 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
@@ -117,7 +117,8 @@ public class ConnObjectUtils {
* @return transfer object
*/
public static ConnObjectTO getConnObjectTO(final ConnectorObject
connObject) {
- return Optional.ofNullable(connObject).map(object ->
getConnObjectTO(object.getAttributes())).orElseGet(ConnObjectTO::new);
+ return Optional.ofNullable(connObject)
+ .map(object ->
getConnObjectTO(object.getAttributes())).orElseGet(ConnObjectTO::new);
}
/**
diff --git
a/core/spring/src/main/java/org/apache/syncope/core/spring/ApplicationContextProvider.java
b/core/spring/src/main/java/org/apache/syncope/core/spring/ApplicationContextProvider.java
index 4c91cfa..c82adbe 100644
---
a/core/spring/src/main/java/org/apache/syncope/core/spring/ApplicationContextProvider.java
+++
b/core/spring/src/main/java/org/apache/syncope/core/spring/ApplicationContextProvider.java
@@ -40,7 +40,8 @@ public class ApplicationContextProvider implements
ApplicationContextAware {
}
public static DefaultListableBeanFactory getBeanFactory() {
- return Optional.ofNullable(BEAN_FACTORY).orElseGet(() ->
Optional.ofNullable(CTX).map(ctx -> (DefaultListableBeanFactory)
ctx.getBeanFactory()).orElse(null));
+ return Optional.ofNullable(BEAN_FACTORY).orElseGet(()
+ -> Optional.ofNullable(CTX).map(ctx ->
(DefaultListableBeanFactory) ctx.getBeanFactory()).orElse(null));
}
public static void setBeanFactory(final DefaultListableBeanFactory
beanFactory) {
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
index 748d635..532cd65 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
@@ -300,7 +300,9 @@ public class FlowableUserRequestHandler implements
UserRequestHandler {
}
protected UserRequestForm getForm(final Task task) {
- return Optional.ofNullable(task).map(task1 ->
FlowableUserRequestHandler.this.getForm(task1,
engine.getFormService().getTaskFormData(task1.getId()))).orElse(null);
+ return Optional.ofNullable(task)
+ .map(t -> FlowableUserRequestHandler.this.getForm(t,
engine.getFormService().getTaskFormData(t.getId())))
+ .orElse(null);
}
protected UserRequestForm getForm(final Task task, final TaskFormData fd) {
diff --git
a/ext/oidcclient/common-lib/src/main/java/org/apache/syncope/common/lib/to/OIDCProviderTO.java
b/ext/oidcclient/common-lib/src/main/java/org/apache/syncope/common/lib/to/OIDCProviderTO.java
index 9069c81..b0e85e7 100644
---
a/ext/oidcclient/common-lib/src/main/java/org/apache/syncope/common/lib/to/OIDCProviderTO.java
+++
b/ext/oidcclient/common-lib/src/main/java/org/apache/syncope/common/lib/to/OIDCProviderTO.java
@@ -206,7 +206,8 @@ public class OIDCProviderTO implements EntityTO,
ItemContainerTO {
@Override
public boolean setConnObjectKeyItem(final ItemTO connObjectKeyItem) {
- return
Optional.ofNullable(connObjectKeyItem).map(this::addConnObjectKeyItem).orElseGet(()
-> remove(getConnObjectKeyItem()));
+ return Optional.ofNullable(connObjectKeyItem)
+ .map(this::addConnObjectKeyItem).orElseGet(() ->
remove(getConnObjectKeyItem()));
}
@XmlElementWrapper(name = "items")
@@ -219,7 +220,8 @@ public class OIDCProviderTO implements EntityTO,
ItemContainerTO {
@Override
public boolean add(final ItemTO item) {
- return Optional.ofNullable(item).filter(itemTO ->
this.items.contains(itemTO) || this.items.add(itemTO)).isPresent();
+ return Optional.ofNullable(item)
+ .filter(itemTO -> this.items.contains(itemTO) ||
this.items.add(itemTO)).isPresent();
}
public boolean remove(final ItemTO item) {
diff --git
a/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/OIDCClientLogic.java
b/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/OIDCClientLogic.java
index 92755ca..36ccecf 100644
---
a/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/OIDCClientLogic.java
+++
b/ext/oidcclient/logic/src/main/java/org/apache/syncope/core/logic/OIDCClientLogic.java
@@ -330,7 +330,9 @@ public class OIDCClientLogic extends
AbstractTransactionalLogic<EntityTO> {
return responseTO;
} else {
- throw new
NotFoundException(Optional.ofNullable(keyValue).map(value -> "User matching the
provided value " + value).orElse("User marching the provided claims"));
+ throw new NotFoundException(Optional.ofNullable(keyValue)
+ .map(value -> "User matching the provided value " + value)
+ .orElse("User marching the provided claims"));
}
} else if (matchingUsers.size() > 1) {
throw new IllegalArgumentException("Several users match the
provided value " + keyValue);
diff --git
a/ext/saml2sp/common-lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPTO.java
b/ext/saml2sp/common-lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPTO.java
index c4f19fb..b7afd9d 100644
---
a/ext/saml2sp/common-lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPTO.java
+++
b/ext/saml2sp/common-lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPTO.java
@@ -179,7 +179,8 @@ public class SAML2IdPTO implements EntityTO,
ItemContainerTO {
@Override
public boolean setConnObjectKeyItem(final ItemTO connObjectKeyItem) {
- return
Optional.ofNullable(connObjectKeyItem).map(this::addConnObjectKeyItem).orElseGet(()
-> remove(getConnObjectKeyItem()));
+ return Optional.ofNullable(connObjectKeyItem)
+ .map(this::addConnObjectKeyItem).orElseGet(() ->
remove(getConnObjectKeyItem()));
}
@XmlElementWrapper(name = "items")
@@ -192,7 +193,8 @@ public class SAML2IdPTO implements EntityTO,
ItemContainerTO {
@Override
public boolean add(final ItemTO item) {
- return Optional.ofNullable(item).filter(itemTO ->
this.items.contains(itemTO) || this.items.add(itemTO)).isPresent();
+ return Optional.ofNullable(item)
+ .filter(itemTO -> this.items.contains(itemTO) ||
this.items.add(itemTO)).isPresent();
}
public boolean remove(final ItemTO item) {
diff --git
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
index 2d6aac6..d760057 100644
---
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
+++
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
@@ -80,7 +80,8 @@ public class SAML2IdPLogic extends
AbstractSAML2Logic<SAML2IdPTO> {
}
}
- idpTO.setLogoutSupported(Optional.ofNullable(idpEntity).filter(entity
-> entity.getSLOLocation(SAML2BindingType.POST) != null
+ idpTO.setLogoutSupported(Optional.ofNullable(idpEntity)
+ .filter(entity -> entity.getSLOLocation(SAML2BindingType.POST) !=
null
|| entity.getSLOLocation(SAML2BindingType.REDIRECT) !=
null).isPresent());
return idpTO;
}
diff --git
a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/scim/SearchCondVisitor.java
b/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/scim/SearchCondVisitor.java
index f84780a..02505f9 100644
---
a/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/scim/SearchCondVisitor.java
+++
b/ext/scimv2/logic/src/main/java/org/apache/syncope/core/logic/scim/SearchCondVisitor.java
@@ -56,7 +56,10 @@ public class SearchCondVisitor extends
SCIMFilterBaseVisitor<SearchCond> {
}
private boolean schemaEquals(final Resource resource, final String value,
final String schema) {
- return Optional.ofNullable(resource).map(resource1 ->
value.equalsIgnoreCase(schema) || (resource1.schema() + ":" +
value).equalsIgnoreCase(schema)).orElseGet(() -> value.contains(":")
+ return Optional.ofNullable(resource)
+ .map(resource1 -> value.equalsIgnoreCase(schema)
+ || (resource1.schema() + ":" + value).equalsIgnoreCase(schema))
+ .orElseGet(() -> value.contains(":")
? StringUtils.substringAfterLast(value,
":").equalsIgnoreCase(schema)
: value.equalsIgnoreCase(schema));
}
diff --git
a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/ProvisioningImpl.java
b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/ProvisioningImpl.java
index f59a2ee..9806d45 100644
---
a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/ProvisioningImpl.java
+++
b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/ProvisioningImpl.java
@@ -186,7 +186,8 @@ public class ProvisioningImpl implements Provisioning {
Connection conn = null;
try {
- String queryString = "SELECT * FROM user" +
(Optional.ofNullable(query).map(operand -> " WHERE " +
operand.toString()).orElse(""));
+ String queryString = "SELECT * FROM user" +
(Optional.ofNullable(query)
+ .map(operand -> " WHERE " + operand.toString()).orElse(""));
queryString = queryString.replaceAll("__NAME__", "userId").
replaceAll("__UID__", "userId").
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
index 60bf8de..ba2c7c0 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
@@ -182,7 +182,8 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)
resourceExplorerTree.
getLastSelectedPathComponent();
DefaultMutableTreeNode parentNode = (DefaultMutableTreeNode)
selectedNode.getParent();
- String parentNodeName = Optional.ofNullable(parentNode).map(node
-> String.valueOf(node.getUserObject())).orElse(null);
+ String parentNodeName = Optional.ofNullable(parentNode)
+ .map(node ->
String.valueOf(node.getUserObject())).orElse(null);
if (selectedNode.isLeaf() &&
StringUtils.isNotBlank(parentNodeName)) {
String leafNodeName = (String) selectedNode.getUserObject();
DefaultMutableTreeNode grandParentNode =
(DefaultMutableTreeNode) parentNode.getParent();
