Java: Add some spurious source and sink examples.

java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ext.yml

@@ -5,6 +5,7 @@ extensions:
       extensible: sinkModel
     data:
       - [ "p", "Sinks", False, "sink", "(Object)", "", "Argument[0]", "test-sink", "manual" ]
+      - [ "p", "Sinks", False, "manualSinkAlreadyDefined", "(Object)", "", "Argument[0]", "test-sink", "manual" ]
 
   - addsTo:
       pack: codeql/java-all

java/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ext.yml

@@ -5,3 +5,10 @@ extensions:
       extensible: sourceModel
     data:
       - [ "p", "Sources", False, "source", "()", "", "ReturnValue", "test-source", "manual" ]
+      - [ "p", "Sources", False, "manualSourceAlreadyDefined", "()", "", "ReturnValue", "test-source", "manual" ]
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["p", "Sources", "manualNeutralSource", "()", "source", "manual"]

java/ql/test/utils/modelgenerator/dataflow/p/Sinks.java

@@ -71,4 +71,11 @@ public class Sinks {
     Boolean b = s == "hello";
     sink(b);
   }
+
+  // Not a new sink as this callable already has a manual sink.
+  // SPURIOUS-sink=p;Sinks;true;manualSinkAlreadyDefined;(Object);;Argument[0];test-sink;df-generated
+  // neutral=p;Sinks;manualSinkAlreadyDefined;(Object);summary;df-generated
+  public void manualSinkAlreadyDefined(Object o) {
+    sink(o);
+  }
 }

java/ql/test/utils/modelgenerator/dataflow/p/Sources.java

@@ -66,4 +66,19 @@ public class Sources {
       return value.toString();
     }
   }
+
+  // Not a new source as this callable has been manually modelled
+  // as source neutral.
+  // SPURIOUS-source=p;Sources;true;manualNeutralSource;();;ReturnValue;test-source;df-generated
+  // neutral=p;Sources;manualNeutralSource;();summary;df-generated
+  public String manualNeutralSource() {
+    return source();
+  }
+
+  // Not a new source as this callable already has a manual source.
+  // SPURIOUS-source=p;Sources;true;manualSourceAlreadyDefined;();;ReturnValue;test-source;df-generated
+  // neutral=p;Sources;manualSourceAlreadyDefined;();summary;df-generated
+  public String manualSourceAlreadyDefined() {
+    return source();
+  }
 }