diff --git a/agr_api/pom.xml b/agr_api/pom.xml index afdc66ced..a1898e832 100644 --- a/agr_api/pom.xml +++ b/agr_api/pom.xml @@ -25,7 +25,7 @@ org.bitbucket.b_c jose4j - 0.9.3 + 0.9.4 diff --git a/agr_indexer/src/main/java/org/alliancegenome/indexer/indexers/Indexer.java b/agr_indexer/src/main/java/org/alliancegenome/indexer/indexers/Indexer.java index a1e2561d7..bd7098a77 100644 --- a/agr_indexer/src/main/java/org/alliancegenome/indexer/indexers/Indexer.java +++ b/agr_indexer/src/main/java/org/alliancegenome/indexer/indexers/Indexer.java @@ -31,13 +31,12 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.core.TimeValue; +import org.elasticsearch.xcontent.XContentType; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.extern.slf4j.Slf4j; diff --git a/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Builder.java b/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Builder.java index f9ba707a5..17ca083c1 100644 --- a/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Builder.java +++ b/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Builder.java @@ -2,8 +2,8 @@ import java.io.IOException; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.xcontent.XContentBuilder; +import org.elasticsearch.xcontent.XContentFactory; public abstract class Builder { diff --git a/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Mapping.java b/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Mapping.java index 553e8b9ca..0f2af72cd 100644 --- a/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Mapping.java +++ b/agr_java_core/src/main/java/org/alliancegenome/es/index/site/schema/Mapping.java @@ -2,7 +2,7 @@ import java.io.IOException; -import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.xcontent.XContentBuilder; public class Mapping extends Builder { diff --git a/agr_java_core/src/main/java/org/alliancegenome/neo4j/repository/VariantRepository.java b/agr_java_core/src/main/java/org/alliancegenome/neo4j/repository/VariantRepository.java index 2e5f770ad..621af28f8 100644 --- a/agr_java_core/src/main/java/org/alliancegenome/neo4j/repository/VariantRepository.java +++ b/agr_java_core/src/main/java/org/alliancegenome/neo4j/repository/VariantRepository.java @@ -62,11 +62,10 @@ public Variant getVariant(String variantID) { query += " WHERE variant.primaryKey = $" + paramName; query += " OPTIONAL MATCH consequence=(:GenomicLocation)--(variant:Variant)-[:ASSOCIATION]->(:TranscriptLevelConsequence)" + "<-[:ASSOCIATION]-(t:Transcript)<-[:TRANSCRIPT_TYPE]-(:SOTerm)"; - query += " OPTIONAL MATCH gene=(t:Transcript)-[:TRANSCRIPT]-(ge:Gene)--(:GenomicLocation)"; - query += " OPTIONAL MATCH geneSpecies=(t:Transcript)-[:TRANSCRIPT]-(ge:Gene)--(:Species)"; + query += " OPTIONAL MATCH gene=(t:Transcript)-[:TRANSCRIPT]-(ge:Gene)--(:GenomicLocation|Species)"; query += " OPTIONAL MATCH transcriptLocation=(t:Transcript)-[:ASSOCIATION]-(:GenomicLocation)"; query += " OPTIONAL MATCH exons=(:GenomicLocation)--(:Exon)-[:EXON]->(t:Transcript)"; - query += " RETURN p1, consequence, gene, geneSpecies, exons, transcriptLocation "; + query += " RETURN p1, consequence, gene, exons, transcriptLocation "; Iterable variants = query(query, map); for (Variant a : variants) { diff --git a/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/es/managers/SourceDocumentCreation.java b/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/es/managers/SourceDocumentCreation.java index b258d6d55..c278dec27 100644 --- a/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/es/managers/SourceDocumentCreation.java +++ b/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/es/managers/SourceDocumentCreation.java @@ -26,8 +26,8 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.core.TimeValue; +import org.elasticsearch.xcontent.XContentType; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.MapperFeature; diff --git a/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/scripts/TestLoadJsonFile.java b/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/scripts/TestLoadJsonFile.java index 2cc7f3b77..94e735e90 100644 --- a/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/scripts/TestLoadJsonFile.java +++ b/agr_variant_indexer/src/main/java/org/alliancegenome/indexer/variant/scripts/TestLoadJsonFile.java @@ -25,8 +25,8 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.core.TimeValue; +import org.elasticsearch.xcontent.XContentType; import lombok.extern.slf4j.Slf4j; diff --git a/pom.xml b/pom.xml index 9b33c6629..7df6b67b9 100644 --- a/pom.xml +++ b/pom.xml @@ -58,17 +58,17 @@ org.elasticsearch elasticsearch - 7.14.2 + 7.17.14 org.elasticsearch elasticsearch-core - 7.14.2 + 7.17.14 org.elasticsearch.client elasticsearch-rest-high-level-client - 7.14.2 + 7.17.14 com.github.mmazi