Java: revert deletion of redundant imports

java/ql/lib/semmle/code/java/Javadoc.qll

@@ -3,6 +3,7 @@
  */
 
 import semmle.code.Location
+import Element
 
 /** A Javadoc parent is an element whose child can be some Javadoc documentation. */
 class JavadocParent extends @javadocParent, Top {

java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll

@@ -4,6 +4,7 @@
 
 import java
 import Dominance
+import semmle.code.java.ControlFlowGraph
 
 /**
  * A control-flow node that represents the start of a basic block.

java/ql/lib/semmle/code/java/controlflow/Dominance.qll

@@ -3,6 +3,7 @@
  */
 
 import java
+private import semmle.code.java.ControlFlowGraph
 
 /*
  * Predicates for basic-block-level dominance.

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

@@ -137,6 +137,7 @@ private module Frameworks {
   private import semmle.code.java.frameworks.MyBatis
   private import semmle.code.java.frameworks.Hibernate
   private import semmle.code.java.frameworks.jOOQ
+  private import semmle.code.java.frameworks.spring.SpringHttp
 }
 
 private predicate sourceModelCsv(string row) {

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

@@ -27,6 +27,7 @@ import semmle.code.java.frameworks.Guice
 import semmle.code.java.frameworks.struts.StrutsActions
 import semmle.code.java.frameworks.Thrift
 import semmle.code.java.frameworks.javaee.jsf.JSFRenderer
+private import semmle.code.java.dataflow.ExternalFlow
 
 /** A data flow source of remote user input. */
 abstract class RemoteFlowSource extends DataFlow::Node {

java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll

@@ -15,6 +15,7 @@ private import semmle.code.java.dataflow.FlowSources
 private import semmle.code.java.dataflow.internal.DataFlowPrivate
 import semmle.code.java.dataflow.FlowSteps
 private import FlowSummaryImpl as FlowSummaryImpl
+private import semmle.code.java.frameworks.JaxWS
 
 /**
  * Holds if taint can flow from `src` to `sink` in zero or more

java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll

@@ -1,4 +1,5 @@
 import java
+import semmle.code.java.JDKAnnotations
 
 /**
  * Direct flow of values (i.e. object references) through expressions.

java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll

@@ -9,6 +9,7 @@ import semmle.code.java.deadcode.WebEntryPoints
 import semmle.code.java.frameworks.javaee.JavaServerFaces
 import semmle.code.java.frameworks.JAXB
 import semmle.code.java.frameworks.JaxWS
+import semmle.code.java.JMX
 import semmle.code.java.Reflection
 import semmle.code.java.frameworks.JavaxAnnotations
 import semmle.code.java.frameworks.Selenium

java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll

@@ -3,6 +3,7 @@ import semmle.code.java.deadcode.DeadCode
 import semmle.code.java.frameworks.Cucumber
 import semmle.code.java.deadcode.frameworks.FitNesseEntryPoints
 import semmle.code.java.frameworks.Mockito
+import semmle.code.java.UnitTests
 
 /**
  * A test method, suite, or an associated setup/teardown method.

java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll

@@ -3,6 +3,8 @@
  */
 
 import java
+import semmle.code.java.Type
+import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The interface `org.apache.directory.ldap.client.api.LdapConnection`. */

java/ql/lib/semmle/code/java/frameworks/Jndi.qll

@@ -3,6 +3,8 @@
  */
 
 import java
+import semmle.code.java.Type
+import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The interface `javax.naming.Context`. */

java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll

@@ -3,6 +3,8 @@
  */
 
 import java
+import semmle.code.java.Type
+import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The class `org.springframework.ldap.core.LdapTemplate`. */

java/ql/lib/semmle/code/java/frameworks/UnboundId.qll

@@ -3,6 +3,8 @@
  */
 
 import java
+import semmle.code.java.Type
+import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The interface `com.unboundid.ldap.sdk.ReadOnlySearchRequest`. */

java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll

@@ -3,6 +3,7 @@
 import java
 import Android
 import semmle.code.java.dataflow.FlowSteps
+import semmle.code.java.dataflow.ExternalFlow
 
 /**
  * The class `android.database.sqlite.SQLiteDatabase`.

java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll

@@ -1,4 +1,5 @@
 import java
+import semmle.code.xml.XML
 
 /**
  * Holds if any struts XML files are included in this snapshot.

java/ql/lib/semmle/code/java/metrics/MetricPackage.qll

@@ -5,6 +5,7 @@
 import semmle.code.java.Package
 import MetricElement
 import MetricRefType
+import semmle.code.java.Dependency
 import MetricCallable
 
 /** This class provides access to metrics information for packages. */

java/ql/lib/semmle/code/java/security/InsecureBasicAuthQuery.qll

@@ -3,6 +3,7 @@
 import java
 import semmle.code.java.security.HttpsUrls
 import semmle.code.java.security.InsecureBasicAuth
+import semmle.code.java.dataflow.TaintTracking
 
 /**
  * A taint tracking configuration for the Basic authentication scheme

java/ql/lib/semmle/code/java/security/ResponseSplitting.qll

@@ -3,6 +3,8 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.Servlets
+import semmle.code.java.frameworks.JaxWS
 private import semmle.code.java.dataflow.ExternalFlow
 
 /** A sink that is vulnerable to an HTTP header splitting attack. */

java/ql/src/Advisory/Declarations/NonPrivateField.ql

@@ -10,6 +10,7 @@
  */
 
 import java
+import semmle.code.java.JDKAnnotations
 
 class NonConstantSourceField extends Field {
   NonConstantSourceField() {

java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql

@@ -12,6 +12,7 @@
  */
 
 import java
+import semmle.code.java.JDKAnnotations
 import semmle.code.java.Collections
 import semmle.code.java.Maps
 import semmle.code.java.frameworks.javaee.ejb.EJB

java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql

@@ -12,6 +12,7 @@
  */
 
 import java
+import semmle.code.java.JDKAnnotations
 
 predicate isSerializable(RefType t) { t.getAnAncestor() instanceof TypeSerializable }
 

java/ql/src/Telemetry/SupportedExternalSinks.ql

@@ -8,6 +8,7 @@
 
 import java
 import ExternalApi
+import semmle.code.java.GeneratedFiles
 
 from ExternalApi api, int usages
 where

java/ql/src/Telemetry/SupportedExternalSources.ql

@@ -8,6 +8,7 @@
 
 import java
 import ExternalApi
+import semmle.code.java.GeneratedFiles
 
 from ExternalApi api, int usages
 where

java/ql/src/Telemetry/SupportedExternalTaint.ql

@@ -8,6 +8,7 @@
 
 import java
 import ExternalApi
+import semmle.code.java.GeneratedFiles
 
 from ExternalApi api, int usages
 where

java/ql/src/Telemetry/UnsupportedExternalAPIs.ql

@@ -8,6 +8,7 @@
 
 import java
 import ExternalApi
+import semmle.code.java.GeneratedFiles
 
 from ExternalApi api, int usages
 where

java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql

@@ -15,6 +15,7 @@ import java
 import DataFlow::PathGraph
 import MyBatisCommonLib
 import MyBatisAnnotationSqlInjectionLib
+import semmle.code.java.dataflow.FlowSources
 
 private class MyBatisAnnotationSqlInjectionConfiguration extends TaintTracking::Configuration {
   MyBatisAnnotationSqlInjectionConfiguration() { this = "MyBatis annotation sql injection" }

java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjectionLib.qll

@@ -4,6 +4,8 @@
 
 import java
 import MyBatisCommonLib
+import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.Properties
 
 /** An argument of a MyBatis annotated method. */
 class MyBatisAnnotatedMethodCallArgument extends DataFlow::Node {

java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll

@@ -6,6 +6,7 @@ import java
 import semmle.code.xml.MyBatisMapperXML
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.frameworks.MyBatis
+import semmle.code.java.frameworks.Properties
 
 private predicate propertiesKey(DataFlow::Node prop, string key) {
   exists(MethodAccess m |

java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql

@@ -15,6 +15,8 @@ import java
 import DataFlow::PathGraph
 import MyBatisCommonLib
 import MyBatisMapperXmlSqlInjectionLib
+import semmle.code.xml.MyBatisMapperXML
+import semmle.code.java.dataflow.FlowSources
 
 private class MyBatisMapperXmlSqlInjectionConfiguration extends TaintTracking::Configuration {
   MyBatisMapperXmlSqlInjectionConfiguration() { this = "MyBatis mapper xml sql injection" }

java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjectionLib.qll

@@ -5,6 +5,7 @@
 import java
 import semmle.code.xml.MyBatisMapperXML
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.Properties
 
 /** A sink for MyBatis Mapper method call an argument. */
 class MyBatisMapperMethodCallAnArgument extends DataFlow::Node {

java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql

@@ -12,6 +12,7 @@
 
 import java
 import BeanShellInjection
+import semmle.code.java.dataflow.FlowSources
 import DataFlow::PathGraph
 
 class BeanShellInjectionConfig extends TaintTracking::Configuration {

java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql

@@ -12,6 +12,7 @@
 
 import java
 import JShellInjection
+import semmle.code.java.dataflow.FlowSources
 import DataFlow::PathGraph
 
 class JShellInjectionConfiguration extends TaintTracking::Configuration {

java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll

@@ -1,5 +1,6 @@
 import java
 import FlowUtils
+import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking
 
 /**

java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql

@@ -13,6 +13,7 @@
 
 import java
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.spring.SpringController
 import DataFlow::PathGraph
 
 /** The class `org.python.util.PythonInterpreter`. */

java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll

@@ -3,6 +3,7 @@
 import java
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking2
+import semmle.code.java.frameworks.android.Android
 
 /** The `startActivityForResult` method of Android's `Activity` class. */
 class StartActivityForResultMethod extends Method {

java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql

@@ -11,6 +11,7 @@
 
 import java
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.Servlets
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.TaintTracking2
 import DataFlow::PathGraph

java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql

@@ -12,6 +12,7 @@
 
 import java
 import JsonpInjectionLib
+import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.deadcode.WebEntryPoints
 import DataFlow::PathGraph
 

java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll

@@ -2,7 +2,10 @@ import java
 import DataFlow
 import JsonStringLib
 import semmle.code.java.security.XSS
+import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.DataFlow3
+import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.spring.SpringController
 
 /**
  * A method that is called to handle an HTTP GET request.

java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql

@@ -14,6 +14,7 @@ import java
 import DataFlow
 import UnsafeReflectionLib
 import semmle.code.java.dataflow.DataFlow
+import semmle.code.java.dataflow.FlowSources
 import DataFlow::PathGraph
 
 private class ContainsSanitizer extends DataFlow::BarrierGuard {

java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql

@@ -10,6 +10,7 @@
  */
 
 import java
+import semmle.code.java.J2EE
 import TestLib
 
 /** The `main` method in an Enterprise Java Bean. */

java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql

@@ -15,6 +15,7 @@
 import java
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking
+import semmle.code.java.frameworks.Servlets
 import semmle.code.xml.WebXML
 import DataFlow::PathGraph
 

java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql

@@ -12,6 +12,7 @@
 
 import java
 import SpringUrlRedirect
+import semmle.code.java.dataflow.FlowSources
 import DataFlow::PathGraph
 
 private class StartsWithSanitizer extends DataFlow::BarrierGuard {

java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll

@@ -3,6 +3,7 @@ import DataFlow
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.DataFlow2
 import semmle.code.java.dataflow.TaintTracking
+import semmle.code.java.frameworks.spring.SpringController
 
 /**
  * A concatenate expression using the string `redirect:` or `ajaxredirect:` or `forward:` on the left.

java/ql/src/experimental/semmle/code/java/frameworks/CredentialsInPropertiesFile.qll

@@ -5,6 +5,7 @@
 import java
 import semmle.code.configfiles.ConfigFiles
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.frameworks.Properties
 
 private string possibleSecretName() {
   result =