another fix

Signed-off-by: David Kral <[email protected]>

Author: Verdent

src/main/java/org/eclipse/yasson/internal/DeserializationContextImpl.java

@@ -110,7 +110,8 @@ public <T> T deserialize(Type type, JsonParser parser) {
     @SuppressWarnings("unchecked")
     private <T> T deserializeItem(Type type, JsonParser parser) {
         try {
-            if (parser.currentEvent() == null) {
+            JsonParser.Event startingEvent = parser.currentEvent();
+            if (startingEvent == null || startingEvent == JsonParser.Event.KEY_NAME) {
                 parser.next();
                 checkState(parser);
             }

src/main/java/org/eclipse/yasson/internal/deserializer/JsonbCreatorDeserializer.java

@@ -29,6 +29,9 @@
 import org.eclipse.yasson.internal.properties.MessageKeys;
 import org.eclipse.yasson.internal.properties.Messages;
 
+import static org.eclipse.yasson.internal.deserializer.ObjectDeserializer.DEFAULT_SKIPPER;
+import static org.eclipse.yasson.internal.deserializer.ObjectDeserializer.VALUE_SKIPPER;
+
 /**
  * Creator of the Object instance with the usage of the {@link JsonbCreator}.
  */
@@ -87,6 +90,8 @@ public Object deserialize(JsonParser parser, DeserializationContextImpl context)
                     }
                 } else if (failOnUnknownProperties && !ignoredProperties.contains(key)) {
                     throw new JsonbException(Messages.getMessage(MessageKeys.UNKNOWN_JSON_PROPERTY, key, clazz));
+                } else {
+                    VALUE_SKIPPER.getOrDefault(parser.currentEvent(), DEFAULT_SKIPPER).accept(parser);
                 }
                 break;
             case END_OBJECT:

src/main/java/org/eclipse/yasson/internal/deserializer/ObjectDeserializer.java

@@ -14,6 +14,7 @@
 
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import jakarta.json.bind.JsonbException;
@@ -28,6 +29,14 @@
  */
 class ObjectDeserializer implements ModelDeserializer<JsonParser> {
 
+    static final Map<JsonParser.Event, Consumer<JsonParser>> VALUE_SKIPPER;
+    static final Consumer<JsonParser> DEFAULT_SKIPPER = jsonParser -> {}; //NO-OP
+
+    static {
+        VALUE_SKIPPER = Map.of(JsonParser.Event.START_OBJECT, JsonParser::skipObject,
+                               JsonParser.Event.START_ARRAY, JsonParser::skipArray);
+    }
+
     private final Map<String, ModelDeserializer<JsonParser>> propertyDeserializerChains;
     private final Function<String, String> renamer;
     private final Class<?> rawClass;
@@ -69,6 +78,8 @@ public Object deserialize(JsonParser parser, DeserializationContextImpl context)
                     }
                 } else if (failOnUnknownProperty && !ignoredProperties.contains(key)) {
                     throw new JsonbException(Messages.getMessage(MessageKeys.UNKNOWN_JSON_PROPERTY, key, rawClass));
+                } else {
+                    VALUE_SKIPPER.getOrDefault(parser.currentEvent(), DEFAULT_SKIPPER).accept(parser);
                 }
                 break;
             case END_ARRAY:

src/test/java/org/eclipse/yasson/defaultmapping/WrappedDeserialization.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0,
+ * or the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+package org.eclipse.yasson.defaultmapping;
+
+import jakarta.json.bind.annotation.JsonbCreator;
+
+import org.eclipse.yasson.Jsonbs;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+public class WrappedDeserialization {
+
+    private static final String TO_DESERIALIZE = "{\"inner\":{\"color\":\"yellow\"}}";
+
+    @Test
+    public void testDeserializationOfInnerType() {
+        Car deserialized = Jsonbs.defaultJsonb.fromJson(TO_DESERIALIZE, Car.class);
+        assertThat(deserialized.color, is("red"));
+    }
+
+    @Test
+    public void testDeserializationOfInnerTypeWithCreator() {
+        CarWithCreator deserialized = Jsonbs.defaultJsonb.fromJson(TO_DESERIALIZE, CarWithCreator.class);
+        assertThat(deserialized.color, nullValue());
+    }
+
+    public static class Car {
+
+        public String color = "red";
+
+    }
+
+    public static class CarWithCreator {
+
+        public String color;
+
+        @JsonbCreator
+        public CarWithCreator(String color) {
+            this.color = color;
+        }
+
+    }
+
+}

src/test/java/org/eclipse/yasson/jsonpsubstitution/PreinstantiatedJsonpTest.java

@@ -44,7 +44,11 @@ public Dog(String name, int age) {
 
         @Override
         public String toString() {
-            return "Dog:\nname: " + name + "\nage: " + age + "\ngoodDog: " + goodDog;
+            return "Dog{"
+                    + "name='" + name + "', "
+                    + "age=" + age + ", "
+                    + "goodDog=" + goodDog
+                    + '}';
         }
     }
 
@@ -125,6 +129,8 @@ public void testGeneratorWrappedWithUserInteraction() {
         assertEquals(WRAPPED_JSON, new String(out.toByteArray()));
     }
 
+    @Disabled("JsonParser now provides access to current event. "
+            + "This test passes since Yasson 3.0.0 due to addition of JsonParser.currentEvent()")
     @Test
     public void testInvalidJsonParserAdvancedToCustomPosition() {
         ByteArrayInputStream in = new ByteArrayInputStream(WRAPPED_JSON.getBytes());