Skip to content

Commit 6bbbec9

Browse files
Fixed pom, fixed getElasticSearchVersion
1 parent ea4ac07 commit 6bbbec9

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>main.java.io.github.delirius325</groupId>
6+
<groupId>io.github.delirius325</groupId>
77
<artifactId>jmeter.backendlistener.elasticsearch</artifactId>
88
<version>2.6.6</version>
99
<packaging>jar</packaging>

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
import org.elasticsearch.client.RequestOptions;
1616
import org.elasticsearch.client.Response;
1717
import org.elasticsearch.client.RestClient;
18-
import org.json.simple.JSONObject;
19-
import org.json.simple.parser.JSONParser;
18+
import org.json.JSONObject;
2019
import org.slf4j.Logger;
2120
import org.slf4j.LoggerFactory;
2221

@@ -108,12 +107,11 @@ public int getElasticSearchVersion() {
108107
logger.error("Unable to perform request to ElasticSearch engine", this.esIndex);
109108
}else {
110109
String responseBody = EntityUtils.toString(response.getEntity());
111-
JSONParser parser = new JSONParser();
112-
JSONObject elasticSearchConfig = (JSONObject) parser.parse(responseBody);
113-
JSONObject version = (JSONObject)elasticSearchConfig.get("version");
110+
JSONObject elasticSearchConfig = new JSONObject(responseBody);
111+
JSONObject version = (JSONObject) elasticSearchConfig.get("version");
114112
String elasticVersion = version.get("number").toString();
115113
elasticSearchVersion = Integer.parseInt(elasticVersion.split("\\.")[0]);
116-
114+
logger.info("ElasticSearch Version : " + Integer.toString(elasticSearchVersion));
117115
}
118116
} catch (Exception e) {
119117
if (logger.isErrorEnabled()) {
@@ -130,7 +128,6 @@ public int getElasticSearchVersion() {
130128
* sent through the low-level ElasticSearch REST Client.
131129
*/
132130
public void sendRequest(int elasticSearchVersionPrefix) {
133-
logger.info("Elastic Search version : " + Integer.toString(elasticSearchVersionPrefix));
134131
Request request;
135132
StringBuilder bulkRequestBody = new StringBuilder();
136133
String actionMetaData;

0 commit comments

Comments
 (0)