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/06/11 06:16:55 UTC
[syncope] 02/02: [SYNCOPE-1569] Code to save search conditions into
Conf class was not ported from 2_0_X
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
commit 0da7a8371371a2beef832c70d1b784c2d02a430e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jun 11 07:32:24 2020 +0200
[SYNCOPE-1569] Code to save search conditions into Conf class was not ported from 2_0_X
---
.../client/console/panels/search/AbstractSearchPanel.java | 2 ++
.../syncope/client/console/panels/search/SearchUtils.java | 2 +-
.../client/console/reports/ReportletWizardBuilder.java | 12 +++++++++---
.../syncope/client/console/wizards/any/UserDetails.java | 5 +++--
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
index 3ae2d9b..1ff07ae 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
@@ -145,6 +145,8 @@ public abstract class AbstractSearchPanel extends Panel {
typeKind != AnyTypeKind.GROUP && SyncopeConsoleSession.get().owns(IdRepoEntitlement.GROUP_SEARCH)
? Pair.of(groupNames, new LoadableDetachableModel<Integer>() {
+ private static final long serialVersionUID = 7362833782319137329L;
+
@Override
protected Integer load() {
return groupRestClient.count(SyncopeConstants.ROOT_REALM, null, null);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
index 9c8d755..5c0539b 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
@@ -309,7 +309,7 @@ public final class SearchUtils implements Serializable {
}
}
- SyncopeProperty property = builder.is(clause.getProperty());
+ SyncopeProperty<?> property = builder.is(clause.getProperty());
switch (clause.getComparator()) {
case IS_NULL:
condition = builder.isNull(clause.getProperty());
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportletWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportletWizardBuilder.java
index 5dd04fd..dace20d 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportletWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportletWizardBuilder.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
import java.util.stream.Collectors;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.console.panels.BeanPanel;
+import org.apache.syncope.client.console.panels.search.SearchUtils;
import org.apache.syncope.client.console.rest.ImplementationRestClient;
import org.apache.syncope.client.console.rest.ReportRestClient;
import org.apache.syncope.client.console.wizards.BaseAjaxWizardBuilder;
@@ -41,6 +42,8 @@ import org.apache.wicket.extensions.wizard.WizardModel;
import org.apache.wicket.extensions.wizard.WizardStep;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.PropertyAccessorFactory;
public class ReportletWizardBuilder extends BaseAjaxWizardBuilder<ReportletWrapper> {
@@ -61,6 +64,10 @@ public class ReportletWizardBuilder extends BaseAjaxWizardBuilder<ReportletWrapp
@Override
protected Serializable onApplyInternal(final ReportletWrapper modelObject) {
if (modelObject.getImplementationEngine() == ImplementationEngine.JAVA) {
+ BeanWrapper confWrapper = PropertyAccessorFactory.forBeanPropertyAccess(modelObject.getConf());
+ modelObject.getSCondWrapper().forEach((fieldName, pair) -> {
+ confWrapper.setPropertyValue(fieldName, SearchUtils.buildFIQL(pair.getRight(), pair.getLeft()));
+ });
ImplementationTO reportlet = ImplementationRestClient.read(
IdRepoImplementationType.REPORTLET, modelObject.getImplementationKey());
try {
@@ -81,8 +88,7 @@ public class ReportletWizardBuilder extends BaseAjaxWizardBuilder<ReportletWrapp
}
@Override
- protected WizardModel buildModelSteps(
- final ReportletWrapper modelObject, final WizardModel wizardModel) {
+ protected WizardModel buildModelSteps(final ReportletWrapper modelObject, final WizardModel wizardModel) {
wizardModel.add(new Profile(modelObject));
wizardModel.add(new Configuration(modelObject));
return wizardModel;
@@ -93,7 +99,7 @@ public class ReportletWizardBuilder extends BaseAjaxWizardBuilder<ReportletWrapp
private static final long serialVersionUID = -3043839139187792810L;
public Profile(final ReportletWrapper reportlet) {
- final AjaxDropDownChoicePanel<String> conf = new AjaxDropDownChoicePanel<>(
+ AjaxDropDownChoicePanel<String> conf = new AjaxDropDownChoicePanel<>(
"reportlet", getString("reportlet"), new PropertyModel<>(reportlet, "implementationKey"));
conf.setChoices(ImplementationRestClient.list(IdRepoImplementationType.REPORTLET).stream().
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
index d2e3417..48e7ed1 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -62,8 +62,9 @@ public class UserDetails extends Details<UserTO> {
// ------------------------
username = new AjaxTextFieldPanel("username", "username", new PropertyModel<>(userTO, "username"), false);
- if (wrapper.getPreviousUserTO() != null && StringUtils.
- compare(wrapper.getPreviousUserTO().getUsername(), wrapper.getInnerObject().getUsername()) != 0) {
+ if (wrapper.getPreviousUserTO() != null && StringUtils.compare(
+ wrapper.getPreviousUserTO().getUsername(), wrapper.getInnerObject().getUsername()) != 0) {
+
username.showExternAction(new LabelInfo("externalAction", wrapper.getPreviousUserTO().getUsername()));
}