Switch to CSV based modelling

Author: joefarebrother

java/ql/src/semmle/code/java/dataflow/ExternalFlow.qll

@@ -64,6 +64,14 @@ import java
 private import semmle.code.java.dataflow.DataFlow::DataFlow
 private import internal.DataFlowPrivate
 
+/**
+ * A module importing the frameworks that provide external flow data,
+ * ensuring that they are visible to the taint tracking / data flow library.
+ */
+private module Frameworks {
+  private import semmle.code.java.frameworks.ApacheHttp
+}
+
 private predicate sourceModelCsv(string row) {
   row =
     [

java/ql/src/semmle/code/java/dataflow/FlowSources.qll

@@ -163,14 +163,6 @@ private class GuiceRequestParameterSource extends RemoteFlowSource {
   override string getSourceType() { result = "Guice request parameter" }
 }
 
-private class ApacheHttpRequestParameterSource extends RemoteFlowSource {
-  ApacheHttpRequestParameterSource() {
-    this.asParameter() instanceof ApacheHttpRequestHandlerParameter
-  }
-
-  override string getSourceType() { result = "Apache HTTP request parameter" }
-}
-
 private class Struts2ActionSupportClassFieldReadSource extends RemoteFlowSource {
   Struts2ActionSupportClassFieldReadSource() {
     exists(Struts2ActionSupportClass c |

java/ql/src/semmle/code/java/dataflow/FlowSteps.qll

@@ -9,7 +9,7 @@ private import semmle.code.java.dataflow.DataFlow
  * A module importing the frameworks that implement additional flow steps,
  * ensuring that they are visible to the taint tracking library.
  */
-module Frameworks {
+private module Frameworks {
   private import semmle.code.java.frameworks.jackson.JacksonSerializability
   private import semmle.code.java.frameworks.android.Intent
   private import semmle.code.java.frameworks.android.SQLite