You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/01/23 12:44:29 UTC
[syncope] branch 2_1_X updated: White noise
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 13f463f White noise
13f463f is described below
commit 13f463f991fa8637c18d4d7414d76fb7e0ec4691
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jan 23 12:43:26 2020 +0100
White noise
---
.../syncope/client/console/commons/AnyDataProvider.java | 16 +++++++---------
.../client/console/wizards/any/AnyObjectDetails.java | 6 ++----
.../syncope/client/console/wizards/any/GroupDetails.java | 5 ++---
.../syncope/client/console/wizards/any/UserDetails.java | 1 -
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
index 1036007..f0ed257 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
@@ -41,19 +41,19 @@ public class AnyDataProvider<A extends AnyTO> extends DirectoryDataProvider<A> {
protected static final Logger LOG = LoggerFactory.getLogger(AnyDataProvider.class);
- private final SortableAnyProviderComparator<A> comparator;
+ protected final SortableAnyProviderComparator<A> comparator;
- private final AbstractAnyRestClient<A> restClient;
+ protected final AbstractAnyRestClient<A> restClient;
protected String fiql;
protected final boolean filtered;
- private final String realm;
+ protected final String realm;
- private final String type;
+ protected final String type;
- private final PageReference pageRef;
+ protected final PageReference pageRef;
public AnyDataProvider(
final AbstractAnyRestClient<A> restClient,
@@ -132,10 +132,8 @@ public class AnyDataProvider<A extends AnyTO> extends DirectoryDataProvider<A> {
LOG.error("While requesting for size() with FIQL {}", fiql, e);
SyncopeConsoleSession.get().onException(e);
- Optional<AjaxRequestTarget> target = RequestCycle.get().find(AjaxRequestTarget.class);
- if (target.isPresent()) {
- ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target.get());
- }
+ RequestCycle.get().find(AjaxRequestTarget.class).
+ ifPresent(target -> ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target));
}
return result;
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectDetails.java
index 5dff819..e56ca7b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectDetails.java
@@ -35,10 +35,8 @@ public class AnyObjectDetails extends Details<AnyObjectTO> {
super(wrapper, templateMode, includeStatusPanel, pageRef);
- AnyObjectTO anyObjectTO = wrapper.getInnerObject();
-
- AjaxTextFieldPanel name =
- new AjaxTextFieldPanel("name", "name", new PropertyModel<>(anyObjectTO, "name"), false);
+ AjaxTextFieldPanel name = new AjaxTextFieldPanel(
+ "name", "name", new PropertyModel<>(wrapper.getInnerObject(), "name"), false);
if (templateMode) {
name.enableJexlHelp();
} else {
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
index 249f4cf..00502ca 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupDetails.java
@@ -35,9 +35,8 @@ public class GroupDetails extends Details<GroupTO> {
super(wrapper, templateMode, includeStatusPanel, pageRef);
- GroupTO groupTO = GroupWrapper.class.cast(wrapper).getInnerObject();
-
- AjaxTextFieldPanel name = new AjaxTextFieldPanel("name", "name", new PropertyModel<>(groupTO, "name"), false);
+ AjaxTextFieldPanel name = new AjaxTextFieldPanel(
+ "name", "name", new PropertyModel<>(wrapper.getInnerObject(), "name"), false);
if (templateMode) {
name.enableJexlHelp();
} else {
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
index 6fbd21a..7380437 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -141,6 +141,5 @@ public class UserDetails extends Details<UserTO> {
add(new Label("warning", new ResourceModel("password.change.warning")));
add(new PasswordPanel("passwordPanel", wrapper, templateMode));
}
-
}
}