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/04 08:22:14 UTC
[syncope] branch master updated (d57d09f -> 89b0c49)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from d57d09f [SYNCOPE-1562] Fix test execution with YAML and XML
new 74fcd55 Various performance enhancements on Console
new 89b0c49 Upgrading Elasticsearch
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../syncope/client/console/rest/RemediationRestClient.java | 2 +-
.../client/console/panels/search/AbstractSearchPanel.java | 14 ++++++++++----
.../client/console/panels/search/SearchClausePanel.java | 6 +++---
.../syncope/client/console/rest/AccessTokenRestClient.java | 2 +-
.../syncope/client/console/rest/AnyObjectRestClient.java | 2 +-
.../syncope/client/console/rest/GroupRestClient.java | 4 ++--
.../syncope/client/console/rest/LoggerRestClient.java | 2 +-
.../syncope/client/console/rest/ReportRestClient.java | 2 +-
.../apache/syncope/client/console/rest/TaskRestClient.java | 10 +++++-----
.../apache/syncope/client/console/rest/UserRestClient.java | 4 ++--
.../syncope/client/enduser/rest/GroupRestClient.java | 2 +-
.../syncope/client/console/rest/UserRequestRestClient.java | 6 +++---
.../syncope/client/enduser/rest/UserRequestRestClient.java | 4 ++--
pom.xml | 2 +-
14 files changed, 34 insertions(+), 28 deletions(-)
[syncope] 02/02: Upgrading Elasticsearch
Posted by il...@apache.org.
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 89b0c4928e90be5aba1303452377d902e29056aa
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jun 4 10:15:19 2020 +0200
Upgrading Elasticsearch
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 99e179c..528383a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,7 +433,7 @@ under the License.
<slf4j.version>2.0.0-alpha1</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>7.7.0</elasticsearch.version>
+ <elasticsearch.version>7.7.1</elasticsearch.version>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apachedirapi.version>2.0.0</apachedirapi.version>
[syncope] 01/02: Various performance enhancements on Console
Posted by il...@apache.org.
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 74fcd557f1d1ed9e68ff59ba4ff0232928306d2d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jun 4 10:02:08 2020 +0200
Various performance enhancements on Console
---
.../syncope/client/console/rest/RemediationRestClient.java | 2 +-
.../client/console/panels/search/AbstractSearchPanel.java | 14 ++++++++++----
.../client/console/panels/search/SearchClausePanel.java | 6 +++---
.../syncope/client/console/rest/AccessTokenRestClient.java | 2 +-
.../syncope/client/console/rest/AnyObjectRestClient.java | 2 +-
.../syncope/client/console/rest/GroupRestClient.java | 4 ++--
.../syncope/client/console/rest/LoggerRestClient.java | 2 +-
.../syncope/client/console/rest/ReportRestClient.java | 2 +-
.../apache/syncope/client/console/rest/TaskRestClient.java | 10 +++++-----
.../apache/syncope/client/console/rest/UserRestClient.java | 4 ++--
.../syncope/client/enduser/rest/GroupRestClient.java | 2 +-
.../syncope/client/console/rest/UserRequestRestClient.java | 6 +++---
.../syncope/client/enduser/rest/UserRequestRestClient.java | 4 ++--
13 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/RemediationRestClient.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/RemediationRestClient.java
index 7f4aa0d..7a31fd8 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/RemediationRestClient.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/RemediationRestClient.java
@@ -36,7 +36,7 @@ public class RemediationRestClient extends BaseRestClient {
public static int countRemediations() {
return getService(RemediationService.class).
- list(new RemediationQuery.Builder().page(1).size(1).build()).
+ list(new RemediationQuery.Builder().page(1).size(0).build()).
getTotalCount();
}
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 d1c6c50..3ae2d9b 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
@@ -128,10 +128,6 @@ public abstract class AbstractSearchPanel extends Panel {
super(id);
populate();
- Pair<IModel<List<String>>, Integer> groupInfo =
- SyncopeConsoleSession.get().owns(IdRepoEntitlement.GROUP_SEARCH)
- ? Pair.of(groupNames, groupRestClient.count(SyncopeConstants.ROOT_REALM, null, null))
- : Pair.of(groupNames, 0);
this.model = builder.model;
this.typeKind = kind;
@@ -145,6 +141,16 @@ public abstract class AbstractSearchPanel extends Panel {
searchFormContainer.setOutputMarkupId(true);
add(searchFormContainer);
+ Pair<IModel<List<String>>, IModel<Integer>> groupInfo =
+ typeKind != AnyTypeKind.GROUP && SyncopeConsoleSession.get().owns(IdRepoEntitlement.GROUP_SEARCH)
+ ? Pair.of(groupNames, new LoadableDetachableModel<Integer>() {
+
+ @Override
+ protected Integer load() {
+ return groupRestClient.count(SyncopeConstants.ROOT_REALM, null, null);
+ }
+ })
+ : Pair.of(groupNames, Model.of(0));
SearchClausePanel searchClausePanel = new SearchClausePanel("panel", "panel",
Model.of(new SearchClause()),
required,
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
index 759406f..7e613a6 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
@@ -135,7 +135,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
private final IModel<List<String>> dnames;
- private final Pair<IModel<List<String>>, Integer> groupInfo;
+ private final Pair<IModel<List<String>>, IModel<Integer>> groupInfo;
private final IModel<List<String>> roleNames;
@@ -168,7 +168,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
final Customizer customizer,
final IModel<Map<String, PlainSchemaTO>> anames,
final IModel<List<String>> dnames,
- final Pair<IModel<List<String>>, Integer> groupInfo,
+ final Pair<IModel<List<String>>, IModel<Integer>> groupInfo,
final IModel<List<String>> roleNames,
final IModel<List<String>> privilegeNames,
final IModel<List<String>> resourceNames) {
@@ -435,7 +435,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
String[] inputAsArray = property.getField().getInputAsArray();
if (ArrayUtils.isEmpty(inputAsArray)) {
property.setChoices(properties.getObject());
- } else if (groupInfo.getRight() > Constants.MAX_GROUP_LIST_SIZE) {
+ } else if (groupInfo.getRight().getObject() > Constants.MAX_GROUP_LIST_SIZE) {
String inputValue = inputAsArray.length > 1 && inputAsArray[1] != null
? inputAsArray[1]
: property.getField().getInput();
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AccessTokenRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AccessTokenRestClient.java
index 356a1b4..ed95b43 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AccessTokenRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AccessTokenRestClient.java
@@ -37,7 +37,7 @@ public class AccessTokenRestClient extends BaseRestClient {
public static int count() {
return getService(AccessTokenService.class).list(
- new AccessTokenQuery.Builder().page(1).size(1).build()).
+ new AccessTokenQuery.Builder().page(1).size(0).build()).
getTotalCount();
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
index eab12a8..3add237 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
@@ -62,7 +62,7 @@ public class AnyObjectRestClient extends AbstractAnyRestClient<AnyObjectTO> {
@Override
public int count(final String realm, final String fiql, final String type) {
return getService(AnyObjectService.class).
- search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(1).build()).
+ search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).build()).
getTotalCount();
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
index 8d843ec..2a1c2f6 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
@@ -63,7 +63,7 @@ public class GroupRestClient extends AbstractAnyRestClient<GroupTO> {
@Override
public int count(final String realm, final String fiql, final String type) {
return getService(GroupService.class).
- search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(1).build()).
+ search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).details(false).build()).
getTotalCount();
}
@@ -77,7 +77,7 @@ public class GroupRestClient extends AbstractAnyRestClient<GroupTO> {
final String type) {
return getService(GroupService.class).
- search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).
+ search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).details(false).
orderBy(toOrderBy(sort)).details(false).build()).getResult();
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
index 6ec8c85..9dcc214 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
@@ -143,7 +143,7 @@ public class LoggerRestClient extends BaseRestClient {
AuditQuery query = new AuditQuery.Builder().
entityKey(key).
page(1).
- size(1).
+ size(0).
type(type).
category(category).
events(events).
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
index 3de8715..99485ad 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
@@ -118,7 +118,7 @@ public class ReportRestClient extends BaseRestClient
@Override
public int countExecutions(final String taskKey) {
return getService(ReportService.class).
- listExecutions(new ExecQuery.Builder().key(taskKey).page(1).size(1).build()).getTotalCount();
+ listExecutions(new ExecQuery.Builder().key(taskKey).page(1).size(0).build()).getTotalCount();
}
@Override
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
index d992cb7..6b39a0a 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
@@ -67,31 +67,31 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
public static int count(final TaskType kind) {
return getService(TaskService.class).search(
- new TaskQuery.Builder(kind).page(1).size(1).build()).getTotalCount();
+ new TaskQuery.Builder(kind).page(1).size(0).build()).getTotalCount();
}
public static int count(final String resource, final TaskType kind) {
return getService(TaskService.class).search(
- new TaskQuery.Builder(kind).resource(resource).page(1).size(1).build()).getTotalCount();
+ new TaskQuery.Builder(kind).resource(resource).page(1).size(0).build()).getTotalCount();
}
public static int count(final AnyTypeKind anyTypeKind, final String entityKey, final TaskType kind) {
return getService(TaskService.class).search(
- new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
+ new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(0).build()).
getTotalCount();
}
public static int count(final AnyTypeKind anyTypeKind, final String entityKey, final String notification) {
return getService(TaskService.class).search(
new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification).
- anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
+ anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(0).build()).
getTotalCount();
}
@Override
public int countExecutions(final String taskKey) {
return getService(TaskService.class).
- listExecutions(new ExecQuery.Builder().key(taskKey).page(1).size(1).build()).getTotalCount();
+ listExecutions(new ExecQuery.Builder().key(taskKey).page(1).size(0).build()).getTotalCount();
}
public static List<PropagationTaskTO> listPropagationTasks(
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
index f95d253..eb69255 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
@@ -72,7 +72,7 @@ public class UserRestClient extends AbstractAnyRestClient<UserTO> {
@Override
public int count(final String realm, final String fiql, final String type) {
return getService(UserService.class).
- search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(1).build()).
+ search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).details(false).build()).
getTotalCount();
}
@@ -82,7 +82,7 @@ public class UserRestClient extends AbstractAnyRestClient<UserTO> {
final String type) {
return getService(UserService.class).
- search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).
+ search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).details(false).
orderBy(toOrderBy(sort)).details(false).build()).getResult();
}
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/GroupRestClient.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/GroupRestClient.java
index ffeb769..f9e22c3 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/GroupRestClient.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/GroupRestClient.java
@@ -71,7 +71,7 @@ public class GroupRestClient extends AbstractAnyRestClient<GroupTO> {
@Override
public int count(final String realm, final String fiql, final String type) {
return getService(GroupService.class).
- search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(1).build()).
+ search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).details(false).build()).
getTotalCount();
}
diff --git a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
index de6135b..41a72bb 100644
--- a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
+++ b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
@@ -34,7 +34,7 @@ public class UserRequestRestClient extends BaseRestClient {
public static int countUserRequests() {
return getService(UserRequestService.class).
- list(new UserRequestQuery.Builder().page(1).size(1).build()).
+ list(new UserRequestQuery.Builder().page(1).size(0).build()).
getTotalCount();
}
@@ -50,7 +50,7 @@ public class UserRequestRestClient extends BaseRestClient {
public static int countForms() {
return getService(UserRequestService.class).
- getForms(new UserRequestFormQuery.Builder().page(1).size(1).build()).
+ getForms(new UserRequestFormQuery.Builder().page(1).size(0).build()).
getTotalCount();
}
@@ -62,7 +62,7 @@ public class UserRequestRestClient extends BaseRestClient {
public static Optional<UserRequestForm> getForm(final String userKey) {
PagedResult<UserRequestForm> forms = getService(UserRequestService.class).
- getForms(new UserRequestFormQuery.Builder().user(userKey).page(1).size(1).build());
+ getForms(new UserRequestFormQuery.Builder().user(userKey).page(1).size(0).build());
UserRequestForm form = forms.getResult().isEmpty()
? null
: forms.getResult().get(0);
diff --git a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
index 3d449af..02ac11f 100644
--- a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
+++ b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
@@ -38,7 +38,7 @@ public class UserRequestRestClient extends BaseRestClient {
list(new UserRequestQuery.Builder()
.user(SyncopeEnduserSession.get().getSelfTO().getUsername())
.page(1)
- .size(1)
+ .size(0)
.build()).getTotalCount();
}
@@ -60,7 +60,7 @@ public class UserRequestRestClient extends BaseRestClient {
public static int countForms() {
return getService(UserRequestService.class).
- getForms(new UserRequestFormQuery.Builder().page(1).size(1).build()).
+ getForms(new UserRequestFormQuery.Builder().page(1).size(0).build()).
getTotalCount();
}