Integration of ElasticSearch v1.0 (GROUND - 6) #68
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,14 +14,7 @@ | |
|
|
||
| package edu.berkeley.ground; | ||
|
|
||
| import edu.berkeley.ground.dao.models.*; | ||
|
Member
There was a problem hiding this comment. We're using the Google Java style guide which specifies no |
||
| import edu.berkeley.ground.dao.usage.LineageEdgeFactory; | ||
| import edu.berkeley.ground.dao.usage.LineageEdgeVersionFactory; | ||
| import edu.berkeley.ground.dao.usage.LineageGraphFactory; | ||
|
|
@@ -37,6 +30,7 @@ | |
| import edu.berkeley.ground.resources.LineageGraphsResource; | ||
| import edu.berkeley.ground.resources.NodesResource; | ||
| import edu.berkeley.ground.resources.StructuresResource; | ||
| import edu.berkeley.ground.resources.TagsResource; | ||
| import edu.berkeley.ground.util.CassandraFactories; | ||
| import edu.berkeley.ground.util.FactoryGenerator; | ||
| import edu.berkeley.ground.util.Neo4jFactories; | ||
|
|
@@ -60,9 +54,11 @@ public class GroundServer extends Application<GroundServerConfiguration> { | |
| private StructureVersionFactory structureVersionFactory; | ||
| private LineageGraphFactory lineageGraphFactory; | ||
| private LineageGraphVersionFactory lineageGraphVersionFactory; | ||
| private TagFactory tagFactory; | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| new GroundServer().run(args); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -135,16 +131,17 @@ public void run(GroundServerConfiguration configuration, Environment environment | |
| this.structureVersionFactory, | ||
| dbClient); | ||
| final LineageGraphsResource lineageGraphsResource = new LineageGraphsResource( | ||
| this.lineageGraphFactory, this.lineageGraphVersionFactory, dbClient); | ||
| final TagsResource tagsResource = new TagsResource(this.tagFactory); | ||
|
|
||
|
|
||
| environment.jersey().register(edgesResource); | ||
| environment.jersey().register(graphsResource); | ||
| environment.jersey().register(lineageEdgesResource); | ||
| environment.jersey().register(nodesResource); | ||
| environment.jersey().register(structuresResource); | ||
| environment.jersey().register(lineageGraphsResource); | ||
| environment.jersey().register(tagsResource); | ||
| } | ||
|
|
||
| private void setPostgresFactories(PostgresClient postgresClient, int machineId, int numMachines) { | ||
|
|
@@ -174,5 +171,6 @@ private void setFactories(FactoryGenerator factoryGenerator) { | |
| structureVersionFactory = factoryGenerator.getStructureVersionFactory(); | ||
| lineageGraphFactory = factoryGenerator.getLineageGraphFactory(); | ||
| lineageGraphVersionFactory = factoryGenerator.getLineageGraphVersionFactory(); | ||
| tagFactory = factoryGenerator.getTagFactory(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package edu.berkeley.ground.resources; | ||
|
|
||
| import com.codahale.metrics.annotation.Timed; | ||
| import edu.berkeley.ground.dao.models.TagFactory; | ||
| import edu.berkeley.ground.exceptions.GroundException; | ||
| import edu.berkeley.ground.model.models.Tag; | ||
| import io.swagger.annotations.Api; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import javax.ws.rs.*; | ||
| import javax.ws.rs.core.MediaType; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
|
|
||
| @Path("/tags") | ||
| @Api(value = "/tags", description = "Interact with tags") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @Consumes(MediaType.APPLICATION_JSON) | ||
| public class TagsResource { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(NodesResource.class); | ||
|
|
||
| private final TagFactory tagFactory; | ||
| public TagsResource(TagFactory tagFactory) { | ||
| this.tagFactory = tagFactory; | ||
|
|
||
| } | ||
|
|
||
| @GET | ||
| @Timed | ||
| @Path("/versions/{id}") | ||
| public Map<String, Tag> retrieveFromDatabaseByVersionId(@PathParam("id") long id) throws GroundException { | ||
| LOGGER.info("Retrieving version with id: " + id + "."); | ||
| return this.tagFactory.retrieveFromDatabaseByVersionId(id); | ||
| } | ||
|
|
||
| @GET | ||
| @Timed | ||
| @Path("/items/{id}") | ||
| public Map<String, Tag> retrieveFromDatabaseByItemId(@PathParam("id") long id) throws GroundException { | ||
| LOGGER.info("Retrieving item with id: " + id + "."); | ||
| return this.tagFactory.retrieveFromDatabaseByItemId(id); | ||
| } | ||
|
|
||
| @GET | ||
| @Timed | ||
| @Path("/versions/{*name}") | ||
|
Member
There was a problem hiding this comment. Is there a reason there's a |
||
| public List<Long> getVersionIdsByTag(@PathParam("*name") String tag) throws GroundException { | ||
| LOGGER.info("Retrieving all version ids with tag: " + tag + "."); | ||
| return this.tagFactory.getVersionIdsByTag(tag); | ||
| } | ||
|
|
||
| @GET | ||
| @Timed | ||
| @Path("/items/{*name}") | ||
| public List<Long> getItemIdsByTag(@PathParam("*name") String tag) throws GroundException { | ||
| LOGGER.info("Retrieving all item ids with tag: " + tag + "."); | ||
| return this.tagFactory.getItemIdsByTag(tag); | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The version should be a variable in the properties field of the POM.