Cleanup Jackson logic after code review

java/ql/src/semmle/code/java/frameworks/jackson/JacksonSerializability.qll

@@ -72,18 +72,6 @@ private class ExplicitlyWrittenJacksonSerializableType extends JacksonSerializab
   }
 }
 
-/** A type whose values are explicitly deserialized in a call to a Jackson method. */
-private class ExplicitlyReadJacksonSerializableType extends JacksonDeserializableType {
-  ExplicitlyReadJacksonSerializableType() {
-    exists(MethodAccess ma |
-      // A call to a Jackson read method...
-      ma.getMethod() instanceof JacksonReadValueMethod and
-      // ...where `this` is used in the final argument, indicating that this type will be deserialized.
-      usesType(ma.getArgument(ma.getNumArgument() - 1).getType(), this)
-    )
-  }
-}
-
 /** A type used in a `JacksonSerializableField` declaration. */
 private class FieldReferencedJacksonSerializableType extends JacksonSerializableType {
   FieldReferencedJacksonSerializableType() {
@@ -123,6 +111,13 @@ private class ExplicitlyReadJacksonDeserializableType extends JacksonDeserializa
     exists(TypeLiteralToJacksonDatabindFlowConfiguration conf |
       usesType(conf.getSourceWithFlowToJacksonDatabind().getTypeName().getType(), this)
     )
+    or
+    exists(MethodAccess ma |
+      // A call to a Jackson read method...
+      ma.getMethod() instanceof JacksonReadValueMethod and
+      // ...where `this` is used in the final argument, indicating that this type will be deserialized.
+      usesType(ma.getArgument(ma.getNumArgument() - 1).getType(), this)
+    )
   }
 }
 

java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql

@@ -31,4 +31,4 @@ class HasFlowTest extends InlineExpectationsTest {
       value = ""
     )
   }
-}
+}

java/ql/test/stubs/jackson-databind-2.10/com/fasterxml/jackson/databind/JsonNode.java

@@ -5,4 +5,4 @@ import java.util.*;
 public abstract class JsonNode implements Iterable<JsonNode> {
     public JsonNode() {
     }
-}
+}

java/ql/test/stubs/jackson-databind-2.10/com/fasterxml/jackson/databind/MappingIterator.java

@@ -25,4 +25,4 @@ public class MappingIterator<T> implements Iterator<T>, Closeable {
     public void close() throws IOException {
         
     }
-}
+}

java/ql/test/stubs/jackson-databind-2.10/com/fasterxml/jackson/databind/ObjectReader.java

@@ -79,4 +79,4 @@ public class ObjectReader {
         return null;
     }
 
-}
+}