Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(elasticsearch): Add ES 7.x support
Closes gravitee-io/issues#2165
- Loading branch information
Showing
35 changed files
with
1,057 additions
and
56 deletions.
There are no files selected for viewing
This file contains 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 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 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
40 changes: 40 additions & 0 deletions
40
gravitee-common-elasticsearch/src/main/java/io/gravitee/elasticsearch/model/TotalHits.java
This file contains 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,40 @@ | ||
| /** | ||
| * Copyright (C) 2015 The Gravitee team (http://gravitee.io) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.gravitee.elasticsearch.model; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import io.gravitee.elasticsearch.model.jackson.TotalHitsDeserializer; | ||
|
|
||
| /** | ||
| * @author David BRASSELY (david.brassely at graviteesource.com) | ||
| * @author GraviteeSource Team | ||
| */ | ||
| @JsonDeserialize(using = TotalHitsDeserializer.class) | ||
| public class TotalHits { | ||
| private long value; | ||
|
|
||
| public TotalHits(final long value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public long getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public void setValue(long value) { | ||
| this.value = value; | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...icsearch/src/main/java/io/gravitee/elasticsearch/model/jackson/TotalHitsDeserializer.java
This file contains 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,54 @@ | ||
| /** | ||
| * Copyright (C) 2015 The Gravitee team (http://gravitee.io) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.gravitee.elasticsearch.model.jackson; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.deser.std.StdDeserializer; | ||
| import io.gravitee.elasticsearch.model.TotalHits; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * @author David BRASSELY (david.brassely at graviteesource.com) | ||
| * @author GraviteeSource Team | ||
| */ | ||
| public class TotalHitsDeserializer extends StdDeserializer<TotalHits> { | ||
|
|
||
| public TotalHitsDeserializer() { | ||
| this(null); | ||
| } | ||
|
|
||
| public TotalHitsDeserializer(Class<?> vc) { | ||
| super(vc); | ||
| } | ||
|
|
||
| @Override | ||
| public TotalHits deserialize(JsonParser jp, DeserializationContext ctxt) | ||
| throws IOException { | ||
| JsonNode node = jp.getCodec().readTree(jp); | ||
|
|
||
| if (node.isNumber()) { | ||
| return new TotalHits(node.longValue()); | ||
| } else if (node.isObject()) { | ||
| return new TotalHits(node.get("value").longValue()); | ||
| } | ||
|
|
||
| throw new IllegalStateException(); | ||
| } | ||
| } | ||
|
|
This file contains 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
71 changes: 71 additions & 0 deletions
71
...mmon-elasticsearch/src/main/java/io/gravitee/elasticsearch/version/ElasticsearchInfo.java
This file contains 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,71 @@ | ||
| /** | ||
| * Copyright (C) 2015 The Gravitee team (http://gravitee.io) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.gravitee.elasticsearch.version; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| /** | ||
| * @author David BRASSELY (david.brassely at graviteesource.com) | ||
| * @author GraviteeSource Team | ||
| */ | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public class ElasticsearchInfo { | ||
|
|
||
| private String name; | ||
|
|
||
| @JsonProperty("cluster_name") | ||
| private String clusterName; | ||
|
|
||
| @JsonProperty("cluster_uuid") | ||
| private String clusterUuid; | ||
|
|
||
| private Version version; | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public String getClusterName() { | ||
| return clusterName; | ||
| } | ||
|
|
||
| public void setClusterName(String clusterName) { | ||
| this.clusterName = clusterName; | ||
| } | ||
|
|
||
| public String getClusterUuid() { | ||
| return clusterUuid; | ||
| } | ||
|
|
||
| public void setClusterUuid(String clusterUuid) { | ||
| this.clusterUuid = clusterUuid; | ||
| } | ||
|
|
||
| public Version getVersion() { | ||
| return version; | ||
| } | ||
|
|
||
| public void setVersion(Version version) { | ||
| this.version = version; | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
gravitee-common-elasticsearch/src/main/java/io/gravitee/elasticsearch/version/Version.java
This file contains 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,59 @@ | ||
| /** | ||
| * Copyright (C) 2015 The Gravitee team (http://gravitee.io) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.gravitee.elasticsearch.version; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| /** | ||
| * @author David BRASSELY (david.brassely at graviteesource.com) | ||
| * @author GraviteeSource Team | ||
| */ | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public class Version { | ||
|
|
||
| private String number; | ||
|
|
||
| @JsonProperty("lucene_version") | ||
| private String luceneVersion; | ||
|
|
||
| private int majorVersion = -1; | ||
|
|
||
| public String getNumber() { | ||
| return number; | ||
| } | ||
|
|
||
| public void setNumber(String number) { | ||
| this.number = number; | ||
| } | ||
|
|
||
| public String getLuceneVersion() { | ||
| return luceneVersion; | ||
| } | ||
|
|
||
| public void setLuceneVersion(String luceneVersion) { | ||
| this.luceneVersion = luceneVersion; | ||
| } | ||
|
|
||
| public int getMajorVersion() { | ||
| if (majorVersion == -1) { | ||
| majorVersion = Integer.valueOf(getNumber().substring(0, 1)); | ||
| } | ||
| return majorVersion; | ||
| } | ||
| } |
This file contains 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 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
Oops, something went wrong.