Java: Follow-up changes

Author: hvitved

java/ql/src/semmle/code/java/dataflow/internal/DataFlowPrivate.qll

@@ -1,6 +1,6 @@
 private import java
 private import DataFlowUtil
-private import DataFlowImplCommon::Public
+private import DataFlowImplCommon
 private import DataFlowDispatch
 private import semmle.code.java.controlflow.Guards
 private import semmle.code.java.dataflow.SSA

java/ql/test/library-tests/dataflow/gettersetter/gettersetter.ql

@@ -1,8 +1,18 @@
 import java
-import semmle.code.java.dataflow.internal.DataFlowImplCommon::Public
+import semmle.code.java.dataflow.internal.DataFlowImplCommon
 import semmle.code.java.dataflow.internal.DataFlowImplSpecific::Public
 import semmle.code.java.dataflow.internal.DataFlowImplSpecific::Private
 
+private predicate read(Node n1, Content f, Node n2) {
+  readDirect(n1, f, n2) or
+  argumentValueFlowsThrough(_, n1, TContentSome(f), TContentNone(), n2)
+}
+
+private predicate store(Node n1, Content f, Node n2) {
+  storeDirect(n1, f, n2) or
+  argumentValueFlowsThrough(_, n1, TContentNone(), TContentSome(f), n2)
+}
+
 from Node n1, Content f, Node n2, string k
 where
   read(n1, f, n2) and k = "Read"