From e2df550694ad99b9cd4ff7a4cb3b84af1e31e3d8 Mon Sep 17 00:00:00 2001 From: objectiser Date: Fri, 20 Jun 2014 18:25:01 +0100 Subject: [PATCH] RTGOV-502 Fix situation properties query --- .../store/elasticsearch/ElasticsearchSituationStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/activity-analysis/situation-store-elasticsearch/src/main/java/org/overlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStore.java b/modules/activity-analysis/situation-store-elasticsearch/src/main/java/org/overlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStore.java index dfc6ae4f..5c604299 100644 --- a/modules/activity-analysis/situation-store-elasticsearch/src/main/java/org/overlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStore.java +++ b/modules/activity-analysis/situation-store-elasticsearch/src/main/java/org/overlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStore.java @@ -176,7 +176,7 @@ protected QueryBuilder getQueryBuilder(SituationsQuery sitQuery) { BoolQueryBuilder bool=QueryBuilders.boolQuery(); if (!isNullOrEmpty(sitQuery.getResolutionState())) { - bool.must(QueryBuilders.matchQuery("situationProperties."+SituationStore.RESOLUTION_STATE_PROPERTY, sitQuery.getResolutionState())); + bool.must(QueryBuilders.matchQuery("properties."+SituationStore.RESOLUTION_STATE_PROPERTY, sitQuery.getResolutionState())); } if (sitQuery.getProperties() != null && !sitQuery.getProperties().isEmpty()) { @@ -185,9 +185,9 @@ protected QueryBuilder getQueryBuilder(SituationsQuery sitQuery) { Object key = entry.getKey(); Object value = entry.getValue(); if (value instanceof String) { - bool.must(QueryBuilders.fuzzyLikeThisFieldQuery("situationProperties."+key).likeText((String)value)); + bool.must(QueryBuilders.fuzzyLikeThisFieldQuery("properties."+key).likeText((String)value)); } else { - bool.must(QueryBuilders.matchQuery("situationProperties."+key, value)); + bool.must(QueryBuilders.matchQuery("properties."+key, value)); } } }