From 5f333786b1b52c811ff042402c9000e7360c06f8 Mon Sep 17 00:00:00 2001 From: Mariko Medlock Date: Wed, 26 Jul 2023 17:59:09 -0400 Subject: [PATCH] Fix modifier hint attribute lookup bug. --- .../main/java/bio/terra/tanagra/service/QuerysService.java | 2 +- .../terra/tanagra/service/instances/EntityHintRequest.java | 6 ------ .../bio/terra/tanagra/underlayspecific/BaseHintsTest.java | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/service/src/main/java/bio/terra/tanagra/service/QuerysService.java b/service/src/main/java/bio/terra/tanagra/service/QuerysService.java index 2ca03fe2c..683da8f75 100644 --- a/service/src/main/java/bio/terra/tanagra/service/QuerysService.java +++ b/service/src/main/java/bio/terra/tanagra/service/QuerysService.java @@ -81,7 +81,7 @@ public EntityHintResult listEntityHints(EntityHintRequest entityHintRequest) { String attrName = rowResult.get(MODIFIER_AUX_DATA_ATTR_COL).getLiteral().orElseThrow().getStringVal(); - Attribute attr = entityHintRequest.getAttribute(attrName); + Attribute attr = entityHintRequest.getEntity().getAttribute(attrName); OptionalDouble min = rowResult.get(MODIFIER_AUX_DATA_MIN_COL).getDouble(); if (min.isPresent()) { diff --git a/service/src/main/java/bio/terra/tanagra/service/instances/EntityHintRequest.java b/service/src/main/java/bio/terra/tanagra/service/instances/EntityHintRequest.java index 5dcd94e74..f3d749794 100644 --- a/service/src/main/java/bio/terra/tanagra/service/instances/EntityHintRequest.java +++ b/service/src/main/java/bio/terra/tanagra/service/instances/EntityHintRequest.java @@ -31,12 +31,6 @@ public Entity getEntity() { return entity; } - public Attribute getAttribute(String attributeName) { - return isEntityLevelHints() - ? entity.getAttribute(attributeName) - : relatedEntity.getAttribute(attributeName); - } - public Underlay.MappingType getMappingType() { // Hints always hit the index dataset. return Underlay.MappingType.INDEX; diff --git a/service/src/test/java/bio/terra/tanagra/underlayspecific/BaseHintsTest.java b/service/src/test/java/bio/terra/tanagra/underlayspecific/BaseHintsTest.java index 04d086634..fadc42ef0 100644 --- a/service/src/test/java/bio/terra/tanagra/underlayspecific/BaseHintsTest.java +++ b/service/src/test/java/bio/terra/tanagra/underlayspecific/BaseHintsTest.java @@ -64,7 +64,7 @@ private void assertHintsMatch( EntityHintResult entityHintResult = querysService.listEntityHints(entityHintRequest); for (Map.Entry expected : expectedHints.entrySet()) { - Attribute attr = entityHintRequest.getAttribute(expected.getKey()); + Attribute attr = entityHintRequest.getEntity().getAttribute(expected.getKey()); DisplayHint actual = entityHintResult.getHintMap().get(attr); assertEquals(expected.getValue(), actual); }