Merge pull request #47 from overture-stack/rc/2.5.0

Release Candidate 2.5.0

Author: Buwujiu

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>bio.overture</groupId>
     <artifactId>rollcall</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0</version>
     <packaging>jar</packaging>
 
     <name>rollcall</name>

src/main/java/bio/overture/rollcall/repository/IndexRepository.java

@@ -118,12 +118,7 @@ public boolean createIndex(@NonNull String indexName) {
   public boolean createIndex(@NonNull String indexName, @NonNull String settings) {
     val req = new CreateIndexRequest(indexName);
     req.settings(settings, XContentType.JSON);
-    return client.indices().create(new CreateIndexRequest(indexName), RequestOptions.DEFAULT).isAcknowledged();
-  }
-
-  @SneakyThrows
-  public boolean cloneIndex(@NonNull String indexToClone, @NonNull String newIndexName) {
-    return cloneIndex(indexToClone, newIndexName, "{}");
+    return client.indices().create(req, RequestOptions.DEFAULT).isAcknowledged();
   }
 
   @SneakyThrows

src/test/java/bio/overture/rollcall/service/IndexServiceTest.java

@@ -29,6 +29,7 @@
 import org.apache.http.HttpHost;
 import org.assertj.core.util.Lists;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.client.RequestOptions;
@@ -87,6 +88,20 @@ public void tearDown() {
         client.indices().delete(new DeleteIndexRequest("*"), RequestOptions.DEFAULT);
     }
 
+    @Test
+    @SneakyThrows
+    public void testIndexSettingOnCreateIndex() {
+        val indexSetting = "{\"index.number_of_shards\":3,\"index.number_of_replicas\":2}";
+        val req = new CreateResolvableIndexRequest(ENTITY_VALUE, TYPE_VALUE, "sd", "kkde23", "re", false, indexSetting);
+        val newResolvedIndex = service.createResolvableIndex(req);
+        val getSettingsReq = new GetSettingsRequest().indices(newResolvedIndex.getIndexName());
+        val resp = client.indices().getSettings(getSettingsReq, RequestOptions.DEFAULT);
+        val replicasNum = Integer.valueOf(resp.getSetting(newResolvedIndex.getIndexName(), "index.number_of_replicas"));
+        val shardNum = Integer.valueOf(resp.getSetting(newResolvedIndex.getIndexName(), "index.number_of_shards"));
+        assertThat(shardNum).isEqualTo(3);
+        assertThat(replicasNum).isEqualTo(2);
+    }
+
     @Test
     public void testIndexCreationAndUpdatedRelease() {
         // create new index, an index with the parameters already exists so it should create index with updated release value