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 2017/04/06 11:45:57 UTC
[07/50] tinkerpop git commit: TINKERPOP-1654 Fixed compilation errors
after jackson version bump
TINKERPOP-1654 Fixed compilation errors after jackson version bump
Jackson removed a deprecated method. Called the replacement method instead.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/380646cf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/380646cf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/380646cf
Branch: refs/heads/TINKERPOP-1577
Commit: 380646cf1df466925af8ed830fba8858cb8c49b3
Parents: 7db459b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 27 07:56:44 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 27 07:56:44 2017 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONTypeDeserializer.java | 2 +-
.../gremlin/structure/io/graphson/GraphSONTypeIdResolver.java | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/380646cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
index 9e6bd1e..6734506 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
@@ -154,7 +154,7 @@ public class GraphSONTypeDeserializer extends TypeDeserializerBase {
if (typeName != null && valueDetected) {
// Type has been detected pattern detected.
- final JavaType typeFromId = idRes.typeFromId(typeName);
+ final JavaType typeFromId = idRes.typeFromId(null, typeName);
if (!baseType.isJavaLangObject() && !baseType.equals(typeFromId)) {
throw new InstantiationException(
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/380646cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
index 183e11a..dda06e2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
@@ -92,11 +92,6 @@ public class GraphSONTypeIdResolver implements TypeIdResolver {
}
@Override
- public JavaType typeFromId(final String s) {
- return typeFromId(null, s);
- }
-
- @Override
public JavaType typeFromId(final DatabindContext databindContext, final String s) {
// Get the type from the string from the stored Map. If not found, default to deserialize as a String.
return getIdToType().containsKey(s)