[syncope] branch master updated: [SYNCOPE-1440] Adjusting 'from' param

[ilgrosso]

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 8b348db  [SYNCOPE-1440] Adjusting 'from' param
8b348db is described below

commit 8b348db262d4e77285c88df9fe41a93dfabdeb35
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Mon Mar 4 11:19:21 2019 +0100

    [SYNCOPE-1440] Adjusting 'from' param
---
 .../client/ElasticsearchClientContext.java           |  2 ++
 .../ext/elasticsearch/client/ElasticsearchUtils.java | 20 ++++++++++++++++++++
 .../jpa/dao/ElasticsearchAnySearchDAO.java           |  2 +-
 .../provisioning/java/job/ElasticsearchReindex.java  |  7 ++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git 
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientContext.java
 
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientContext.java
index c8f30e1..1d34495 100644
--- 
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientContext.java
+++ 
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientContext.java
@@ -46,6 +46,8 @@ public class ElasticsearchClientContext {
         ElasticsearchUtils utils = new ElasticsearchUtils();
         utils.setIndexMaxResultWindow(10000);
         utils.setRetryOnConflict(5);
+        utils.setNumberOfShards(1);
+        utils.setNumberOfReplicas(1);
         return utils;
     }
 }
diff --git 
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
 
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
index 14a521c..2f64eb7 100644
--- 
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
+++ 
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
@@ -58,6 +58,10 @@ public class ElasticsearchUtils {
 
     private int retryOnConflict = 5;
 
+    private int numberOfShards = 1;
+
+    private int numberOfReplicas = 1;
+
     public void setIndexMaxResultWindow(final int indexMaxResultWindow) {
         this.indexMaxResultWindow = indexMaxResultWindow;
     }
@@ -74,6 +78,22 @@ public class ElasticsearchUtils {
         return retryOnConflict;
     }
 
+    public int getNumberOfShards() {
+        return numberOfShards;
+    }
+
+    public void setNumberOfShards(final int numberOfShards) {
+        this.numberOfShards = numberOfShards;
+    }
+
+    public int getNumberOfReplicas() {
+        return numberOfReplicas;
+    }
+
+    public void setNumberOfReplicas(final int numberOfReplicas) {
+        this.numberOfReplicas = numberOfReplicas;
+    }
+
     /**
      * Returns the builder specialized with content from the provided any.
      *
diff --git 
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
 
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
index bf8490f..a99ed24 100644
--- 
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
+++ 
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
@@ -200,7 +200,7 @@ public class ElasticsearchAnySearchDAO extends 
AbstractAnySearchDAO {
                 adminRealms,
                 cond,
                 kind,
-                (page <= 0 ? 0 : page - 1),
+                (itemsPerPage * (page <= 0 ? 0 : page - 1)),
                 (itemsPerPage < 0 ? 
elasticsearchUtils.getIndexMaxResultWindow() : itemsPerPage),
                 sortBuilders(kind, orderBy));
 
diff --git 
a/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
 
b/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
index 260e589..eea2a8f 100644
--- 
a/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
+++ 
b/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
@@ -156,6 +156,10 @@ public class ElasticsearchReindex extends 
AbstractSchedTaskJobDelegate {
                 endObject().
                 endObject().
                 endObject().
+                startObject("index").
+                field("number_of_shards", 
elasticsearchUtils.getNumberOfShards()).
+                field("number_of_replicas", 
elasticsearchUtils.getNumberOfReplicas()).
+                endObject().
                 endObject();
 
         XContentBuilder mapping = XContentFactory.jsonBuilder().
@@ -174,7 +178,8 @@ public class ElasticsearchReindex extends 
AbstractSchedTaskJobDelegate {
                 endObject();
 
         CreateIndexResponse response = client.indices().create(
-                new 
CreateIndexRequest(elasticsearchUtils.getContextDomainName(kind)).settings(settings).
+                new 
CreateIndexRequest(elasticsearchUtils.getContextDomainName(kind)).
+                        settings(settings).
                         mapping(kind.name(), mapping), RequestOptions.DEFAULT);
         LOG.debug("Successfully created {} for {}: {}",
                 elasticsearchUtils.getContextDomainName(kind), kind.name(), 
response);