This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit da2f055e708f8db58010b6562852f25bf678db5b Author: Juan Cabrerizo <[email protected]> AuthorDate: Wed Jun 16 12:21:35 2021 +0100 Corrects field names for BrooklynOpenSearchModel --- .../opensearch/BrooklynOpenSearchModel.java | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/core/src/main/java/org/apache/brooklyn/util/core/logbook/opensearch/BrooklynOpenSearchModel.java b/core/src/main/java/org/apache/brooklyn/util/core/logbook/opensearch/BrooklynOpenSearchModel.java index 1cd8e26..1d71eec 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/logbook/opensearch/BrooklynOpenSearchModel.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/logbook/opensearch/BrooklynOpenSearchModel.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.util.core.logbook.opensearch; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.brooklyn.util.core.logbook.BrooklynLogEntry; import java.util.List; @@ -30,7 +31,8 @@ import java.util.List; class BrooklynOpenSearchModel { OpenSearchHitsWrapper hits; Integer took; - Boolean timed_out; + @JsonProperty("timed_out") + Boolean timedOut; public OpenSearchHitsWrapper getHits() { return hits; @@ -48,12 +50,12 @@ class BrooklynOpenSearchModel { this.took = took; } - public Boolean getTimed_out() { - return timed_out; + public Boolean getTimedOut() { + return timedOut; } - public void setTimed_out(Boolean timed_out) { - this.timed_out = timed_out; + public void setTimedOut(Boolean timedOut) { + this.timedOut = timedOut; } static class OpenSearchHitsWrapper { @@ -69,37 +71,39 @@ class BrooklynOpenSearchModel { } static class OpenSearchHit { - String _index; - String _type; - BrooklynLogEntry _source; + @JsonProperty("_index") + String index; - public String get_index() { - return _index; - } + @JsonProperty("_type") + String type; - public void set_index(String _index) { - this._index = _index; - } + @JsonProperty("_source") + BrooklynLogEntry source; - public String get_type() { - return _type; + public String getIndex() { + return index; } - public void set_type(String _type) { - this._type = _type; + public void setIndex(String index) { + this.index = index; } - public BrooklynLogEntry get_source() { - return _source; + public String getType() { + return type; } - public void set_source(BrooklynLogEntry _source) { - this._source = _source; + public void setType(String type) { + this.type = type; } public BrooklynLogEntry getSource() { - return _source; + return source; } + + public void setSource(BrooklynLogEntry source) { + this.source = source; + } + } }
