Backport #1288 fix

FasterXML · Jul 12, 2016 · f6fbed5 · f6fbed5
1 parent 261ea42
commit f6fbed5
Show file tree

Hide file tree

Showing 3 changed files with 529 additions and 2 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -9,6 +9,7 @@ Project: jackson-databind
 #1215: Problem with type specialization for Maps with `@JsonDeserialize(as=subtype)`
  (reported by brentryan@github)
 #1279: Ensure DOM parsing defaults to not expanding external entities
+#1288: Type id not exposed for `JsonTypeInfo.As.EXTERNAL_PROPERTY` even when `visible` set to `true`
 
 2.7.5 (11-Jun-2016)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
@@ -652,11 +652,16 @@ protected Object deserializeWithExternalTypeId(JsonParser p,
     {
         final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
         final ExternalTypeHandler ext = _externalTypeIdHandler.start();
-        for (; p.getCurrentToken() != JsonToken.END_OBJECT; p.nextToken()) {
+
+        for (JsonToken t = p.getCurrentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
             String propName = p.getCurrentName();
-            p.nextToken();
+            t = p.nextToken();
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) { // normal case
+                // [JACKSON-831]: may have property AND be used as external type id:
+                if (t.isScalarValue()) {
+                    ext.handleTypePropertyValue(p, ctxt, propName, bean);
+                }
                 if (activeView != null && !prop.visibleInView(activeView)) {
                     p.skipChildren();
                     continue;