You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/09/03 16:22:25 UTC
[tinkerpop] branch master updated (4c577cd -> 47d4249)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 4c577cd Merge branch 'tp34'
add 4e9639f Use ip address instead of hostname for connection
new 25bb663 Merge branch 'pr-1182' into tp33
new 4790fea Updated CHANGELOG CTR
new 91f0265 Isolate PowerMock to gremlin-driver.
new 20fcff7 Code formatting CTR
new c2a01b8 Merge branch 'tp33' into tp34
new 47d4249 Merge branch 'tp34'
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
gremlin-driver/pom.xml | 18 +++++++++
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++----
.../org/apache/tinkerpop/gremlin/driver/Host.java | 3 +-
.../apache/tinkerpop/gremlin/driver/HostTest.java | 46 +++++++++++++++++++++-
5 files changed, 75 insertions(+), 10 deletions(-)
[tinkerpop] 04/06: Code formatting CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 20fcff7f390a336b33b601108ed05453efb73360
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 11:40:02 2019 -0400
Code formatting CTR
---
.../test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java
index 38aacd6..321e843 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/HostTest.java
@@ -67,21 +67,21 @@ public class HostTest {
PowerMockito.mockStatic(InetAddress.class);
PowerMockito.when(InetAddress.getAllByName(hostname)).thenReturn(hosts);
- Cluster cluster = Cluster.build().addContactPoint(hostname).create();
+ final Cluster cluster = Cluster.build().addContactPoint(hostname).create();
cluster.init();
assertEquals(addresses.size(), cluster.allHosts().size());
cluster.allHosts().forEach(host -> {
- String uriHost = host.getHostUri().getHost();
- String address = host.getAddress().getAddress().getHostAddress();
+ final String uriHost = host.getHostUri().getHost();
+ final String address = host.getAddress().getAddress().getHostAddress();
assertEquals(address, uriHost);
assertTrue(addresses.contains(address));
});
}
- private InetAddress inetAddress(String hostname, String address) {
+ private InetAddress inetAddress(final String hostname, final String address) {
try {
return InetAddress.getByAddress(hostname, InetAddress.getByName(address).getAddress());
} catch (UnknownHostException ex) {
[tinkerpop] 03/06: Isolate PowerMock to gremlin-driver.
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 91f0265fe94ed92352c1427a0215abec1b42242b
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 11:38:14 2019 -0400
Isolate PowerMock to gremlin-driver.
There's only one usage of this mocking framework in all tests. It's needed because mockito doesn't support mocking of static methods. CTR
---
gremlin-driver/pom.xml | 3 +++
pom.xml | 16 ----------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index b9fc736..b72d361 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -107,16 +107,19 @@ limitations under the License.
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
+ <version>1.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
+ <version>1.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule</artifactId>
+ <version>1.6.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 15f9641..ffb0f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,6 @@ limitations under the License.
<log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.2</metrics.version>
<netty.version>4.0.56.Final</netty.version>
- <powermock.version>1.6.2</powermock.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.15</snakeyaml.version>
<spark.version>2.2.0</spark.version>
@@ -748,21 +747,6 @@ limitations under the License.
<artifactId>commons-codec</artifactId>
<version>1.12</version>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>${powermock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4-rule</artifactId>
- <version>${powermock.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
[tinkerpop] 06/06: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 47d4249ace7b4fe33dcd95194258ea5fc53e4ee3
Merge: 4c577cd c2a01b8
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 12:22:13 2019 -0400
Merge branch 'tp34'
CHANGELOG.asciidoc | 1 +
gremlin-driver/pom.xml | 18 +++++++++
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++----
.../org/apache/tinkerpop/gremlin/driver/Host.java | 3 +-
.../apache/tinkerpop/gremlin/driver/HostTest.java | 46 +++++++++++++++++++++-
5 files changed, 75 insertions(+), 10 deletions(-)
[tinkerpop] 05/06: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c2a01b8e7783a72bc88f151114096d0076201080
Merge: 091a528 20fcff7
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 12:22:05 2019 -0400
Merge branch 'tp33' into tp34
CHANGELOG.asciidoc | 1 +
gremlin-driver/pom.xml | 18 +++++++++
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++----
.../org/apache/tinkerpop/gremlin/driver/Host.java | 3 +-
.../apache/tinkerpop/gremlin/driver/HostTest.java | 46 +++++++++++++++++++++-
5 files changed, 75 insertions(+), 10 deletions(-)
[tinkerpop] 02/06: Updated CHANGELOG CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 4790feafdc1c0e87b9f59941ebfc16a33e8f1a64
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 11:35:33 2019 -0400
Updated CHANGELOG CTR
---
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 98c3b8a..1d1d06a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
=== TinkerPop 3.3.9 (Release Date: NOT OFFICIALLY RELEASED YET)
* Update jackson databind 2.9.9.3.
+* Modified Java driver to use IP address rather than hostname to create connections.
* Fixed potential for `NullPointerException` with empty identifiers in `GraphStep`.
* Postpone the timing of transport creation to `connection.write` in Gremlin Python.
[tinkerpop] 01/06: Merge branch 'pr-1182' into tp33
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 25bb66335b90400ac49d00c53be24f1cf4749590
Merge: ba562d1 4e9639f
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 11:34:48 2019 -0400
Merge branch 'pr-1182' into tp33
gremlin-driver/pom.xml | 15 +++++++
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++----
.../org/apache/tinkerpop/gremlin/driver/Host.java | 3 +-
.../apache/tinkerpop/gremlin/driver/HostTest.java | 46 +++++++++++++++++++++-
pom.xml | 16 ++++++++
5 files changed, 87 insertions(+), 10 deletions(-)