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/02/14 07:42:08 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1542] Always lookup groups
from root realm
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 20da3c3 [SYNCOPE-1542] Always lookup groups from root realm
20da3c3 is described below
commit 20da3c333a6b9328e88084adf3b79b3834a3d115
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Feb 14 08:37:50 2020 +0100
[SYNCOPE-1542] Always lookup groups from root realm
---
.../org/apache/syncope/client/console/panels/AnyPanel.java | 6 +++---
.../client/console/panels/search/AbstractSearchPanel.java | 11 -----------
.../client/console/panels/search/AnyObjectSearchPanel.java | 3 ++-
.../client/console/panels/search/SearchClausePanel.java | 9 +++------
4 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
index 2575593..c3fd912 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
@@ -320,7 +320,7 @@ public class AnyPanel extends Panel implements ModalPanel {
clause.setProperty("username");
panel = new UserSearchPanel.Builder(
- new ListModel<>(clauses)).realm(realmTO.getFullPath()).required(true).enableSearch().build(id);
+ new ListModel<>(clauses)).required(true).enableSearch().build(id);
break;
case GROUP:
@@ -329,7 +329,7 @@ public class AnyPanel extends Panel implements ModalPanel {
clause.setProperty("name");
panel = new GroupSearchPanel.Builder(
- new ListModel<>(clauses)).realm(realmTO.getFullPath()).required(true).enableSearch().build(id);
+ new ListModel<>(clauses)).required(true).enableSearch().build(id);
break;
case ANY_OBJECT:
@@ -338,7 +338,7 @@ public class AnyPanel extends Panel implements ModalPanel {
clause.setProperty("name");
panel = new AnyObjectSearchPanel.Builder(anyTypeTO.getKey(),
- new ListModel<>(clauses)).realm(realmTO.getFullPath()).required(true).enableSearch().build(id);
+ new ListModel<>(clauses)).required(true).enableSearch().build(id);
break;
default:
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
index 6942293..d321199 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
@@ -74,8 +74,6 @@ public abstract class AbstractSearchPanel extends Panel {
protected WebMarkupContainer searchFormContainer;
- protected final String realm;
-
protected final AnyTypeKind typeKind;
protected final String type;
@@ -92,8 +90,6 @@ public abstract class AbstractSearchPanel extends Panel {
protected final IModel<List<SearchClause>> model;
- protected String realm = SyncopeConstants.ROOT_REALM;
-
protected boolean required = true;
protected boolean enableSearch = false;
@@ -110,11 +106,6 @@ public abstract class AbstractSearchPanel extends Panel {
this.model = model;
}
- public Builder<T> realm(final String realm) {
- this.realm = realm;
- return this;
- }
-
public Builder<T> enableSearch(final IEventSink resultContainer) {
this.resultContainer = resultContainer;
return enableSearch();
@@ -153,7 +144,6 @@ public abstract class AbstractSearchPanel extends Panel {
: Pair.of(groupNames, 0);
this.model = builder.model;
- this.realm = builder.realm;
this.typeKind = kind;
this.type = type;
this.required = builder.required;
@@ -167,7 +157,6 @@ public abstract class AbstractSearchPanel extends Panel {
SearchClausePanel searchClausePanel = new SearchClausePanel("panel", "panel",
Model.of(new SearchClause()),
- realm,
required,
types,
builder.customizer,
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
index 43340ae..f18a6cf 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.PlainSchemaTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -82,7 +83,7 @@ public class AnyObjectSearchPanel extends AbstractSearchPanel {
@Override
protected List<String> load() {
return groupRestClient.search(
- realm,
+ SyncopeConstants.ROOT_REALM,
null,
1,
Constants.MAX_GROUP_LIST_SIZE,
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
index 47250bc..d096f8b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
@@ -44,6 +44,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownCho
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.client.console.wicket.markup.html.form.FieldPanel;
import org.apache.syncope.client.lib.SyncopeClient;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.PlainSchemaTO;
import org.apache.syncope.common.lib.to.RelationshipTypeTO;
@@ -126,8 +127,6 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
}
}
- private final String realm;
-
private final boolean required;
private final IModel<List<SearchClause.Type>> types;
@@ -166,7 +165,6 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
final String id,
final String name,
final Model<SearchClause> clause,
- final String realm,
final boolean required,
final IModel<List<SearchClause.Type>> types,
final Customizer customizer,
@@ -181,7 +179,6 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
this.clause = clause == null ? new Model<>(null) : clause;
- this.realm = realm;
this.required = required;
this.types = types;
this.customizer = customizer;
@@ -452,7 +449,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
inputValue = inputValue + "*";
}
property.setChoices(groupRestClient.search(
- realm,
+ SyncopeConstants.ROOT_REALM,
SyncopeClient.getGroupSearchConditionBuilder().
is("name").equalToIgnoreCase(inputValue).
query(),
@@ -888,7 +885,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
@Override
public FieldPanel<SearchClause> clone() {
SearchClausePanel panel = new SearchClausePanel(
- getId(), name, null, realm, required, types, customizer, anames, dnames, groupInfo,
+ getId(), name, null, required, types, customizer, anames, dnames, groupInfo,
roleNames, privilegeNames, resourceNames);
panel.setReadOnly(this.isReadOnly());
panel.setRequired(this.isRequired());