ES: code refactoring - create a inherited method bulkFromClasspathFile()

ES: update registry categories

ucoinj-elasticsearch/src/main/java/io/ucoin/ucoinj/elasticsearch/service/BaseIndexerService.java

@@ -27,17 +27,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ucoin.ucoinj.core.beans.Bean;
 import io.ucoin.ucoinj.core.beans.InitializingBean;
 import io.ucoin.ucoinj.core.exception.TechnicalException;
+import io.ucoin.ucoinj.core.util.StringUtils;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequestBuilder;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequestBuilder;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.client.Requests;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.Closeable;
-import java.io.IOException;
+import java.io.*;
 
 /**
  * Created by Benoit on 08/04/2015.
@@ -105,4 +108,51 @@ public abstract class BaseIndexerService implements Bean, InitializingBean, Clos
             throw new TechnicalException("Error while preparing default index analyzer: " + e.getMessage(), e);
         }
     }
+
+    protected void bulkFromClasspathFile(String classpathFile, String indexName, String indexType) {
+        BulkRequest bulkRequest = Requests.bulkRequest();
+
+        InputStream ris = null;
+        try {
+            ris = getClass().getClassLoader().getResourceAsStream(classpathFile);
+            if (ris == null) {
+                throw new TechnicalException(String.format("Could not retrieve data file [%s] need to fill index [%s]: ", classpathFile, indexName));
+            }
+
+            StringBuilder builder = new StringBuilder();
+            BufferedReader bf = new BufferedReader(new InputStreamReader(ris));
+            String line = bf.readLine();
+            while(line != null) {
+                if (StringUtils.isNotBlank(line)) {
+                    if (log.isTraceEnabled()) {
+                        log.trace(String.format("[%s] Add to bulk: %s", indexName, line));
+                    }
+                    builder.append(line).append('\n');
+                }
+                line = bf.readLine();
+            }
+
+            byte[] data = builder.toString().getBytes();
+            bulkRequest.add(new BytesArray(data), indexName, indexType, false);
+
+        } catch(Exception e) {
+            throw new TechnicalException(String.format("[%s] Error while inserting rows", indexName), e);
+        }
+        finally {
+            if (ris != null) {
+                try  {
+                    ris.close();
+                }
+                catch(IOException e) {
+                    // Silent is gold
+                }
+            }
+        }
+
+        try {
+            getClient().bulk(bulkRequest).actionGet();
+        } catch(Exception e) {
+            throw new TechnicalException(String.format("[%s] Error while inserting rows", indexName), e);
+        }
+    }
 }

ucoinj-elasticsearch/src/main/java/io/ucoin/ucoinj/elasticsearch/service/market/MarketCategoryIndexerService.java

@@ -147,56 +147,11 @@ public class MarketCategoryIndexerService extends BaseIndexerService {
 
     public void initCategories() {
         if (log.isDebugEnabled()) {
-            log.debug("Initializing all categories");
+            log.debug("Initializing all market categories");
         }
 
-        BulkRequest bulkRequest = Requests.bulkRequest();
-
-        InputStream ris = null;
-        try {
-            ris = getClass().getClassLoader().getResourceAsStream(CATEGORIES_BULK_CLASSPATH_FILE);
-            if (ris == null) {
-                throw new TechnicalException(String.format("Could not retrieve data file [%s] need to fill index [%s]: ", CATEGORIES_BULK_CLASSPATH_FILE, INDEX_NAME));
-            }
-
-            StringBuilder builder = new StringBuilder();
-            BufferedReader bf = new BufferedReader(new InputStreamReader(ris));
-            String line = bf.readLine();
-            while(line != null) {
-                if (StringUtils.isNotBlank(line)) {
-                    if (log.isTraceEnabled()) {
-                        log.trace("Add to category bulk: " + line);
-                    }
-                    builder.append(line).append('\n');
-                }
-                line = bf.readLine();
-            }
-
-            byte[] data = builder.toString().getBytes();
-            bulkRequest.add(new BytesArray(data), INDEX_NAME, INDEX_TYPE, false);
-
-/*
-            InputStreamStreamInput is = new InputStreamStreamInput(ris);
-            bulkRequest.readFrom(is);*/
-        } catch(Exception e) {
-            throw new TechnicalException(String.format("Error while initializing data [%s]", INDEX_NAME), e);
-        }
-        finally {
-            if (ris != null) {
-                try  {
-                    ris.close();
-                }
-                catch(IOException e) {
-                    // Silent is gold
-                }
-            }
-        }
-
-        try {
-            getClient().bulk(bulkRequest).actionGet();
-        } catch(Exception e) {
-            throw new TechnicalException(String.format("Error while initializing data [%s]", INDEX_NAME), e);
-        }
+        // Insert categories
+        bulkFromClasspathFile(CATEGORIES_BULK_CLASSPATH_FILE, INDEX_NAME, INDEX_TYPE);
     }
 
     /* -- Internal methods -- */

ucoinj-elasticsearch/src/main/java/io/ucoin/ucoinj/elasticsearch/service/registry/RegistryCategoryIndexerService.java

@@ -55,6 +55,7 @@ public class RegistryCategoryIndexerService extends BaseIndexerService {
     private static final Logger log = LoggerFactory.getLogger(RegistryCategoryIndexerService.class);
 
     private static final String CATEGORIES_BULK_CLASSPATH_FILE = "registry-categories-bulk-insert.json";
+    private static final String SUB_CATEGORIES_BULK_CLASSPATH_FILE = "registry-sub-categories-bulk-insert.json";
 
     public static final String INDEX_NAME = "registry";
     public static final String INDEX_TYPE = "category";
@@ -151,53 +152,11 @@ public class RegistryCategoryIndexerService extends BaseIndexerService {
 
     public void initCategories() {
         if (log.isDebugEnabled()) {
-            log.debug("Initializing all categories");
+            log.debug("Initializing all registry categories");
         }
 
-        BulkRequest bulkRequest = Requests.bulkRequest();
-
-        InputStream ris = null;
-        try {
-            ris = getClass().getClassLoader().getResourceAsStream(CATEGORIES_BULK_CLASSPATH_FILE);
-            if (ris == null) {
-                throw new TechnicalException(String.format("Could not retrieve data file [%s] need to fill index [%s]: ", CATEGORIES_BULK_CLASSPATH_FILE, INDEX_NAME));
-            }
-
-            StringBuilder builder = new StringBuilder();
-            BufferedReader bf = new BufferedReader(new InputStreamReader(ris));
-            String line = bf.readLine();
-            while(line != null) {
-                if (StringUtils.isNotBlank(line)) {
-                    if (log.isTraceEnabled()) {
-                        log.trace("Add to category bulk: " + line);
-                    }
-                    builder.append(line).append('\n');
-                }
-                line = bf.readLine();
-            }
-
-            byte[] data = builder.toString().getBytes();
-            bulkRequest.add(new BytesArray(data), INDEX_NAME, INDEX_TYPE, false);
-
-        } catch(Exception e) {
-            throw new TechnicalException(String.format("Error while initializing data [%s]", INDEX_NAME), e);
-        }
-        finally {
-            if (ris != null) {
-                try  {
-                    ris.close();
-                }
-                catch(IOException e) {
-                    // Silent is gold
-                }
-            }
-        }
-
-        try {
-            getClient().bulk(bulkRequest).actionGet();
-        } catch(Exception e) {
-            throw new TechnicalException(String.format("Error while initializing data [%s]", INDEX_NAME), e);
-        }
+        // Insert categories
+        bulkFromClasspathFile(CATEGORIES_BULK_CLASSPATH_FILE, INDEX_NAME, INDEX_TYPE);
     }
 
     /* -- Internal methods -- */