This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push: new cc499d7 Update neo4j-java-driver from 1.7.5 to 4.0.1 (#594) cc499d7 is described below commit cc499d7aa16e07ca4eb8976d14985cdbb7193110 Author: Michael Weidmann <37302540+michaelweidm...@users.noreply.github.com> AuthorDate: Tue May 26 14:47:58 2020 +0200 Update neo4j-java-driver from 1.7.5 to 4.0.1 (#594) --- checksum.xml | 1 + gradle.properties | 2 +- src/licenses/licenses/reactive-streams/LICENSE | 8 ++++++++ .../protocol/bolt/config/BoltConnectionElement.java | 6 +++--- .../jmeter/protocol/bolt/sampler/BoltSampler.java | 18 +++++++++--------- .../protocol/bolt/sampler/BoltSamplerSpec.groovy | 16 ++++++++-------- xdocs/changes.xml | 1 + 7 files changed, 31 insertions(+), 21 deletions(-) diff --git a/checksum.xml b/checksum.xml index a713c08..e2b2a15 100644 --- a/checksum.xml +++ b/checksum.xml @@ -137,6 +137,7 @@ <trusted-key id='7c7d8456294423ba' group='org.objenesis' /> <trusted-key id='85911f425ec61b51' group='org.opentest4j' /> <trusted-key id='5f69ad087600b22c' group='org.ow2.asm' /> + <trusted-key id='1364c5e2df3e99c5' group='org.reactivestreams' /> <trusted-key id='2c7b12f2a511e325' group='org.slf4j' /> <trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.api' /> <trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.gradle' /> diff --git a/gradle.properties b/gradle.properties index 27532dd..5909169 100644 --- a/gradle.properties +++ b/gradle.properties @@ -102,7 +102,7 @@ mail.version=1.5.0-b01 miglayout.version=5.2 mina-core.version=2.0.19 mongo-java-driver.version=2.11.3 -neo4j-java-driver.version=1.7.5 +neo4j-java-driver.version=4.0.1 objenesis.version=2.6 oro.version=2.0.8 ph-commons.version=9.4.1 diff --git a/src/licenses/licenses/reactive-streams/LICENSE b/src/licenses/licenses/reactive-streams/LICENSE new file mode 100644 index 0000000..eadae05 --- /dev/null +++ b/src/licenses/licenses/reactive-streams/LICENSE @@ -0,0 +1,8 @@ +Licensed under Public Domain (CC0) + +To the extent possible under law, the person who associated CC0 with +this code has waived all copyright and related or neighboring +rights to this code. + +You should have received a copy of the CC0 legalcode along with this +work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. \ No newline at end of file diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java index 8d3722e..c3211dc 100644 --- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java +++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java @@ -25,9 +25,9 @@ import org.apache.jmeter.testelement.AbstractTestElement; import org.apache.jmeter.testelement.TestStateListener; import org.apache.jmeter.threads.JMeterContextService; import org.apache.jmeter.threads.JMeterVariables; -import org.neo4j.driver.v1.AuthTokens; -import org.neo4j.driver.v1.Driver; -import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.AuthTokens; +import org.neo4j.driver.Driver; +import org.neo4j.driver.GraphDatabase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java index 8bae5b5..1eb2b9c 100644 --- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java +++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java @@ -35,12 +35,12 @@ import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.samplers.Sampler; import org.apache.jmeter.testbeans.TestBean; import org.apache.jmeter.testelement.TestElement; -import org.neo4j.driver.v1.Driver; -import org.neo4j.driver.v1.Record; -import org.neo4j.driver.v1.Session; -import org.neo4j.driver.v1.StatementResult; -import org.neo4j.driver.v1.exceptions.Neo4jException; -import org.neo4j.driver.v1.summary.ResultSummary; +import org.neo4j.driver.Driver; +import org.neo4j.driver.Record; +import org.neo4j.driver.Result; +import org.neo4j.driver.Session; +import org.neo4j.driver.exceptions.Neo4jException; +import org.neo4j.driver.summary.ResultSummary; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -102,7 +102,7 @@ public class BoltSampler extends AbstractBoltTestElement implements Sampler, Tes private String execute(Driver driver, String cypher, Map<String, Object> params) { try (Session session = driver.session()) { - StatementResult statementResult = session.run(cypher, params); + Result statementResult = session.run(cypher, params); return response(statementResult); } } @@ -137,10 +137,10 @@ public class BoltSampler extends AbstractBoltTestElement implements Sampler, Tes return request.toString(); } - private String response(StatementResult result) { + private String response(Result result) { StringBuilder response = new StringBuilder(); response.append("\nSummary:"); - ResultSummary summary = result.summary(); + ResultSummary summary = result.consume(); response.append("\nConstraints Added: ") .append(summary.counters().constraintsAdded()) .append("\nConstraints Removed: ") diff --git a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy b/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy index 5233a0d..ffd3b5a 100644 --- a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy +++ b/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy @@ -21,12 +21,12 @@ import org.apache.jmeter.protocol.bolt.config.BoltConnectionElement import org.apache.jmeter.samplers.Entry import org.apache.jmeter.threads.JMeterContextService import org.apache.jmeter.threads.JMeterVariables -import org.neo4j.driver.v1.Driver -import org.neo4j.driver.v1.Session -import org.neo4j.driver.v1.StatementResult -import org.neo4j.driver.v1.exceptions.ClientException -import org.neo4j.driver.v1.summary.ResultSummary -import org.neo4j.driver.v1.summary.SummaryCounters +import org.neo4j.driver.Driver +import org.neo4j.driver.Result +import org.neo4j.driver.Session +import org.neo4j.driver.exceptions.ClientException +import org.neo4j.driver.summary.ResultSummary +import org.neo4j.driver.summary.SummaryCounters import spock.lang.Specification @@ -112,9 +112,9 @@ class BoltSamplerSpec extends Specification { } def getEmptyQueryResult() { - def queryResult = Mock(StatementResult) + def queryResult = Mock(Result) def summary = Mock(ResultSummary) - queryResult.summary() >> summary + queryResult.consume() >> summary SummaryCounters counters = Mock(SummaryCounters) summary.counters() >> counters return queryResult diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2286eaa..8dd2c93 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -222,6 +222,7 @@ Counter Config, XPath2 Extractor, Function Helper Dialog, Search popup, JMS Elem <li>Updated hamcrest-date to 2.0.7 (from 2.0.4)</li> <li>Updated equalsverifier to 3.1.13 (from 3.1.12)</li> <li>Updated xstream to 1.4.11.1 (from 1.4.11)</li> + <li>Updated neo4j-java-driver to 4.0.1 (from 1.7.5)</li> <li><pr>559</pr>Add a note to the source of TrustAllSSLSocketFactory, that it is not secure to trust everyone. Based on a PR from YYTVicky (yytvicky at github)</li> <li><pr>588</pr>Add documentation on usage of InfluxDB v2 for real-time results. Based on PR from Jakub Bednář (jakub.bednar at gmail.com)</li> </ul>