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 2021/06/02 12:30:44 UTC
[tinkerpop] branch master updated (dc4a5d8 -> 4fc4f3a)
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 dc4a5d8 Merge pull request #1423 from apache/TINKERPOP-2562
new 5538770 TINKERPOP-2565 Fixed bug with vertexLabelKey validation in GraphMLWriter CTR
new 81135d1 Merge branch '3.4-dev' into 3.5-dev
new 4fc4f3a Merge branch '3.5-dev'
The 3 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 +
.../apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch '3.5-dev'
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 4fc4f3a8618b3ee241343d6365eb8d25b06ff95c
Merge: dc4a5d8 81135d1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 2 08:30:29 2021 -0400
Merge branch '3.5-dev'
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 01/03: TINKERPOP-2565 Fixed bug with vertexLabelKey
validation in GraphMLWriter 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 5538770599a979212b56e2dcb77308a60ff656a4
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 2 08:29:43 2021 -0400
TINKERPOP-2565 Fixed bug with vertexLabelKey validation in GraphMLWriter CTR
---
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 46fdeb1..42170ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-4-12]]
=== TinkerPop 3.4.12 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Fixed bug in the `vertexLabelKey` validation for `GraphMLWriter` which was inadvertently validating the `edgeLabelKey`.
[[release-3-4-11]]
=== TinkerPop 3.4.11 (Release Date: May 3, 2021)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
index 3991e4e..8cca6fa 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
@@ -173,7 +173,7 @@ public final class GraphMLWriter implements GraphWriter {
if (identifiedEdgeKeyTypes.containsKey(this.edgeLabelKey))
throw new IllegalStateException(String.format("The edgeLabelKey value of[%s] conflicts with the name of an existing property key to be included in the GraphML", this.edgeLabelKey));
- if (identifiedEdgeKeyTypes.containsKey(this.edgeLabelKey))
+ if (identifiedVertexKeyTypes.containsKey(this.vertexLabelKey))
throw new IllegalStateException(String.format("The vertexLabelKey value of[%s] conflicts with the name of an existing property key to be included in the GraphML", this.vertexLabelKey));
identifiedEdgeKeyTypes.put(this.edgeLabelKey, GraphMLTokens.STRING);
[tinkerpop] 02/03: Merge branch '3.4-dev' into 3.5-dev
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 81135d17c8b4d5e72bb79e088f097905eab888b4
Merge: cca37aa 5538770
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 2 08:30:23 2021 -0400
Merge branch '3.4-dev' into 3.5-dev
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)