Integration of ElasticSearch v1.0 (GROUND - 6)

app/controllers/EdgeController.java

@@ -5,11 +5,6 @@
 import dao.models.EdgeVersionFactory;
 import db.DbClient;
 import exceptions.GroundException;
-import exceptions.GroundItemNotFoundException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
 import models.models.Edge;
 import models.models.EdgeVersion;
 import models.models.Tag;
@@ -19,6 +14,10 @@
 import util.ControllerUtils;
 import util.FactoryGenerator;
 
+import javax.inject.Inject;
+import java.util.List;
+import java.util.Map;
+
 public class EdgeController extends Controller {
   private final EdgeFactory edgeFactory;
   private final EdgeVersionFactory edgeVersionFactory;

app/controllers/GraphController.java

@@ -6,10 +6,6 @@
 import db.DbClient;
 import exceptions.GroundException;
 import exceptions.GroundItemNotFoundException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
 import models.models.Graph;
 import models.models.GraphVersion;
 import models.models.Tag;
@@ -19,6 +15,11 @@
 import util.ControllerUtils;
 import util.FactoryGenerator;
 
+import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class GraphController extends Controller {
   private final GraphFactory graphFactory;
   private final GraphVersionFactory graphVersionFactory;

app/controllers/NodeController.java

@@ -7,20 +7,20 @@
 import db.DbClient;
 import exceptions.GroundException;
 import exceptions.GroundItemNotFoundException;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
 import models.models.Node;
 import models.models.NodeVersion;
 import models.models.Tag;
 import play.libs.Json;
 import play.mvc.Controller;
 import play.mvc.Result;
-
-import java.util.HashMap;
 import util.ControllerUtils;
 import util.FactoryGenerator;
 
+import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class NodeController extends Controller {
   private final NodeFactory nodeFactory;
   private final NodeVersionFactory nodeVersionFactory;
@@ -106,4 +106,4 @@ public Result createNodeVersion(String sourceKey) throws GroundException {
       throw e;
     }
   }
-}
+}

app/dao/models/cassandra/CassandraRichVersionFactory.java

@@ -26,6 +26,7 @@
 import models.models.StructureVersion;
 import models.models.Tag;
 import models.versions.GroundType;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -93,7 +94,7 @@ public void insertIntoDatabase(long id,
 
     for (String key : tags.keySet()) {
       Tag tag = tags.get(key);
-
+      ElasticSearch.insertElasticSearch(tag, "rich_version");
       List<DbDataContainer> tagInsertion = new ArrayList<>();
       tagInsertion.add(new DbDataContainer("rich_version_id", GroundType.LONG, id));
       tagInsertion.add(new DbDataContainer("key", GroundType.STRING, key));

app/dao/models/cassandra/CassandraTagFactory.java

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 
+
 package dao.models.cassandra;
 
 import dao.models.TagFactory;
@@ -22,17 +23,19 @@
 import exceptions.GroundException;
 import models.models.Tag;
 import models.versions.GroundType;
-
+import util.ElasticSearch;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class CassandraTagFactory implements TagFactory {
   private final CassandraClient dbClient;
+  private final boolean elasticSearchOn;
 
-  public CassandraTagFactory(CassandraClient dbClient) {
+  public CassandraTagFactory(CassandraClient dbClient, boolean elasticSearchOn) {
     this.dbClient = dbClient;
+    this.elasticSearchOn = elasticSearchOn;
   }
 
   @Override
@@ -75,16 +78,24 @@ private Map<String, Tag> retrieveFromDatabaseById(long id, String keyPrefix)
     return result;
   }
 
-  @Override
   public List<Long> getVersionIdsByTag(String tag) throws GroundException {
-    return this.getIdsByTag(tag, "rich_version");
+    if (elasticSearchOn) {
+      return ElasticSearch.getSearchResponse("rich_version", tag);
+    } else {
+      return this.getIdsByTag(tag, "rich_version");
+    }
   }
 
-  @Override
   public List<Long> getItemIdsByTag(String tag) throws GroundException {
-    return this.getIdsByTag(tag, "item");
+    if (elasticSearchOn) {
+      return ElasticSearch.getSearchResponse("item", tag);
+    } else {
+      return this.getIdsByTag(tag, "item");
+    }
   }
 
+
+
   private List<Long> getIdsByTag(String tag, String keyPrefix) throws GroundException {
     List<Long> result = new ArrayList<>();
 

app/dao/models/neo4j/Neo4jRichVersionFactory.java

@@ -12,29 +12,29 @@
  * limitations under the License.
  */
 
+
 package dao.models.neo4j;
 
 import dao.models.RichVersionFactory;
 import dao.versions.neo4j.Neo4jVersionFactory;
 import db.DbDataContainer;
 import db.Neo4jClient;
-import exceptions.GroundDbException;
 import exceptions.GroundException;
 import exceptions.GroundVersionNotFoundException;
 import models.models.RichVersion;
 import models.models.StructureVersion;
 import models.models.Tag;
 import models.versions.GroundType;
+import org.neo4j.driver.internal.value.NullValue;
+import org.neo4j.driver.internal.value.StringValue;
+import org.neo4j.driver.v1.Record;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.neo4j.driver.internal.value.NullValue;
-import org.neo4j.driver.internal.value.StringValue;
-import org.neo4j.driver.v1.Record;
-
 public abstract  class Neo4jRichVersionFactory<T extends RichVersion>
     extends Neo4jVersionFactory<T>
     implements RichVersionFactory<T> {
@@ -104,7 +104,7 @@ public void insertIntoDatabase(long id,
 
     for (String key : tags.keySet()) {
       Tag tag = tags.get(key);
-
+      ElasticSearch.insertElasticSearch(tag, "rich_version");
       List<DbDataContainer> tagInsertion = new ArrayList<>();
       tagInsertion.add(new DbDataContainer("rich_version_id", GroundType.LONG, id));
       tagInsertion.add(new DbDataContainer("tkey", GroundType.STRING, key));

app/dao/models/neo4j/Neo4jTagFactory.java

@@ -21,21 +21,23 @@
 import exceptions.GroundException;
 import models.models.Tag;
 import models.versions.GroundType;
+import org.neo4j.driver.internal.value.NullValue;
+import org.neo4j.driver.internal.value.StringValue;
+import org.neo4j.driver.v1.Record;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.neo4j.driver.internal.value.NullValue;
-import org.neo4j.driver.internal.value.StringValue;
-import org.neo4j.driver.v1.Record;
-
 public class Neo4jTagFactory implements TagFactory {
   private final Neo4jClient dbClient;
+  private final boolean elasticSearchOn;
 
-  public Neo4jTagFactory(Neo4jClient dbClient) {
+  public Neo4jTagFactory(Neo4jClient dbClient, boolean elasticSearchOn) {
     this.dbClient = dbClient;
+    this.elasticSearchOn = elasticSearchOn;
   }
 
   @Override
@@ -86,14 +88,20 @@ private Map<String, Tag> retrieveFromDatabaseById(long id, String keyPrefix)
     return tags;
   }
 
-  @Override
-  public List<Long> getVersionIdsByTag(String tag) throws GroundDbException {
-    return this.getIdsByTag(tag, "rich_version_id");
+  public List<Long> getVersionIdsByTag(String tag) throws GroundException {
+    if (this.elasticSearchOn) {
+      return ElasticSearch.getSearchResponse("rich_version", tag);
+    } else {
+      return this.getIdsByTag(tag, "rich_version");
+    }
   }
 
-  @Override
-  public List<Long> getItemIdsByTag(String tag) throws GroundDbException {
-    return this.getIdsByTag(tag, "item_id");
+  public List<Long> getItemIdsByTag(String tag) throws GroundException {
+    if (this.elasticSearchOn) {
+      return ElasticSearch.getSearchResponse("item", tag);
+    } else {
+      return this.getIdsByTag(tag, "item");
+    }
   }
 
   private List<Long> getIdsByTag(String tag, String idAttribute) throws GroundDbException {

app/dao/models/postgres/PostgresRichVersionFactory.java

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+
+
 package dao.models.postgres;
 
 import dao.models.RichVersionFactory;
@@ -26,6 +28,7 @@
 import models.models.StructureVersion;
 import models.models.Tag;
 import models.versions.GroundType;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -92,7 +95,7 @@ public void insertIntoDatabase(long id,
 
     for (String key : tags.keySet()) {
       Tag tag = tags.get(key);
-
+      ElasticSearch.insertElasticSearch(tag, "rich_version");
       List<DbDataContainer> tagInsertion = new ArrayList<>();
       tagInsertion.add(new DbDataContainer("rich_version_id", GroundType.LONG, id));
       tagInsertion.add(new DbDataContainer("key", GroundType.STRING, key));

app/dao/models/postgres/PostgresTagFactory.java

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 
+
 package dao.models.postgres;
 
 import dao.models.TagFactory;
@@ -22,6 +23,7 @@
 import exceptions.GroundException;
 import models.models.Tag;
 import models.versions.GroundType;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,9 +32,11 @@
 
 public class PostgresTagFactory implements TagFactory {
   private final PostgresClient dbClient;
+  private final boolean elasticSearchOn;
 
-  public PostgresTagFactory(PostgresClient dbClient) {
+  public PostgresTagFactory(PostgresClient dbClient, boolean elasticSearchOn) {
     this.dbClient = dbClient;
+    this.elasticSearchOn = elasticSearchOn;
   }
 
   @Override
@@ -76,13 +80,21 @@ private Map<String, Tag> retrieveFromDatabaseById(long id, String keyPrefix)
 
   @Override
   public List<Long> getVersionIdsByTag(String tag) throws GroundException {
-    return this.getIdsByTag(tag, "rich_version");
+    if (this.elasticSearchOn) {
+      return ElasticSearch.getSearchResponse("rich_version", tag);
+    } else {
+      return this.getIdsByTag(tag, "rich_version");
+    }
   }
 
 
   @Override
   public List<Long> getItemIdsByTag(String tag) throws GroundException {
-    return this.getIdsByTag(tag, "item");
+    if (this.elasticSearchOn) {
+      return ElasticSearch.getSearchResponse("item", tag);
+    } else {
+      return this.getIdsByTag(tag, "item");
+    }
   }
 
   private List<Long> getIdsByTag(String tag, String keyPrefix) throws GroundException {

app/dao/versions/cassandra/CassandraItemFactory.java

@@ -25,14 +25,14 @@
 import models.versions.GroundType;
 import models.versions.Item;
 import models.versions.VersionHistoryDag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public abstract class CassandraItemFactory<T extends Item> implements ItemFactory<T> {
   private static final Logger LOGGER = LoggerFactory.getLogger(CassandraItemFactory.class);
 
@@ -70,7 +70,7 @@ public void insertIntoDatabase(long id, Map<String, Tag> tags) throws GroundExce
 
     for (String key : tags.keySet()) {
       Tag tag = tags.get(key);
-
+      ElasticSearch.insertElasticSearch(tag, "item");
       List<DbDataContainer> tagInsertion = new ArrayList<>();
       tagInsertion.add(new DbDataContainer("item_id", GroundType.LONG, id));
       tagInsertion.add(new DbDataContainer("key", GroundType.STRING, key));

app/dao/versions/cassandra/CassandraVersionFactory.java

@@ -43,7 +43,6 @@ public CassandraVersionFactory(CassandraClient dbClient) {
   public void insertIntoDatabase(long id) throws GroundException {
     List<DbDataContainer> insertions = new ArrayList<>();
     insertions.add(new DbDataContainer("id", GroundType.LONG, id));
-
     this.dbClient.insert("version", insertions);
   }
 

app/dao/versions/neo4j/Neo4jItemFactory.java

@@ -14,8 +14,6 @@
 
 package dao.versions.neo4j;
 
-import org.neo4j.driver.v1.Record;
-
 import dao.models.neo4j.Neo4jTagFactory;
 import dao.versions.ItemFactory;
 import db.DbDataContainer;
@@ -27,6 +25,8 @@
 import models.versions.GroundType;
 import models.versions.Item;
 import models.versions.VersionHistoryDag;
+import org.neo4j.driver.v1.Record;
+import util.ElasticSearch;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,9 +59,11 @@ public Neo4jItemFactory(Neo4jClient dbClient,
    * @param tags the tags associated with the item
    * @throws GroundDbException an error inserting data into the database
    */
-  public void insertIntoDatabase(long id, Map<String, Tag> tags) throws GroundDbException {
+
+  public void insertIntoDatabase(long id, Map<String, Tag> tags) throws GroundException {
     for (String key : tags.keySet()) {
       Tag tag = tags.get(key);
+      ElasticSearch.insertElasticSearch(tag, "item");
 
       List<DbDataContainer> tagInsertion = new ArrayList<>();
       tagInsertion.add(new DbDataContainer("item_id", GroundType.LONG, id));