Skip to content

Commit 574f568

Browse files
michaelnebelmichaelnebel
committed
Java: Update model generator expected output.
1 parent 24c5259 commit 574f568

File tree

9 files changed

+209
-209
lines changed

9 files changed

+209
-209
lines changed

‎java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
| p;Factory;getIntValue;();generated |
2-
| p;FinalClass;returnsConstant;();generated |
3-
| p;FluentAPI$Inner;notThis;(String);generated |
4-
| p;ImmutablePojo;getX;();generated |
5-
| p;Joiner;length;();generated |
6-
| p;ParamFlow;ignorePrimitiveReturnValue;(String);generated |
7-
| p;ParamFlow;mapType;(Class);generated |
8-
| p;Pojo;doNotSetValue;(String);generated |
9-
| p;Pojo;getBigDecimal;();generated |
10-
| p;Pojo;getBigInt;();generated |
11-
| p;Pojo;getBoxedArray;();generated |
12-
| p;Pojo;getBoxedCollection;();generated |
13-
| p;Pojo;getBoxedValue;();generated |
14-
| p;Pojo;getFloatArray;();generated |
15-
| p;Pojo;getIntValue;();generated |
16-
| p;Pojo;getPrimitiveArray;();generated |
17-
| p;PrivateFlowViaPublicInterface$SPI;openStream;();generated |
18-
| p;PrivateFlowViaPublicInterface$SPI;openStreamNone;();generated |
19-
| p;PrivateFlowViaPublicInterface;createAnSPIWithoutTrackingFile;(File);generated |
20-
| p;Sinks;copyFileToDirectory;(Path,Path,CopyOption[]);generated |
21-
| p;Sinks;propagate;(String);generated |
22-
| p;Sinks;readUrl;(URL,Charset);generated |
23-
| p;Sources;readUrl;(URL);generated |
24-
| p;Sources;socketStream;();generated |
25-
| p;Sources;sourceToParameter;(InputStream[],List);generated |
26-
| p;Sources;wrappedSocketStream;();generated |
1+
| p;Factory;getIntValue;();df-generated |
2+
| p;FinalClass;returnsConstant;();df-generated |
3+
| p;FluentAPI$Inner;notThis;(String);df-generated |
4+
| p;ImmutablePojo;getX;();df-generated |
5+
| p;Joiner;length;();df-generated |
6+
| p;ParamFlow;ignorePrimitiveReturnValue;(String);df-generated |
7+
| p;ParamFlow;mapType;(Class);df-generated |
8+
| p;Pojo;doNotSetValue;(String);df-generated |
9+
| p;Pojo;getBigDecimal;();df-generated |
10+
| p;Pojo;getBigInt;();df-generated |
11+
| p;Pojo;getBoxedArray;();df-generated |
12+
| p;Pojo;getBoxedCollection;();df-generated |
13+
| p;Pojo;getBoxedValue;();df-generated |
14+
| p;Pojo;getFloatArray;();df-generated |
15+
| p;Pojo;getIntValue;();df-generated |
16+
| p;Pojo;getPrimitiveArray;();df-generated |
17+
| p;PrivateFlowViaPublicInterface$SPI;openStream;();df-generated |
18+
| p;PrivateFlowViaPublicInterface$SPI;openStreamNone;();df-generated |
19+
| p;PrivateFlowViaPublicInterface;createAnSPIWithoutTrackingFile;(File);df-generated |
20+
| p;Sinks;copyFileToDirectory;(Path,Path,CopyOption[]);df-generated |
21+
| p;Sinks;propagate;(String);df-generated |
22+
| p;Sinks;readUrl;(URL,Charset);df-generated |
23+
| p;Sources;readUrl;(URL);df-generated |
24+
| p;Sources;socketStream;();df-generated |
25+
| p;Sources;sourceToParameter;(InputStream[],List);df-generated |
26+
| p;Sources;wrappedSocketStream;();df-generated |

‎java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];create-file;generated |
2-
| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[0];read-file;generated |
3-
| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];create-file;generated |
4-
| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];open-url;generated |
5-
| p;Sources;true;readUrl;(URL);;Argument[0];open-url;generated |
1+
| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];create-file;df-generated |
2+
| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[0];read-file;df-generated |
3+
| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];create-file;df-generated |
4+
| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];open-url;df-generated |
5+
| p;Sources;true;readUrl;(URL);;Argument[0];open-url;df-generated |

‎java/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| p;Sources;true;readUrl;(URL);;ReturnValue;remote;generated |
2-
| p;Sources;true;socketStream;();;ReturnValue;remote;generated |
3-
| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[0].ArrayElement;remote;generated |
4-
| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[1].Element;remote;generated |
5-
| p;Sources;true;wrappedSocketStream;();;ReturnValue;remote;generated |
1+
| p;Sources;true;readUrl;(URL);;ReturnValue;remote;df-generated |
2+
| p;Sources;true;socketStream;();;ReturnValue;remote;df-generated |
3+
| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[0].ArrayElement;remote;df-generated |
4+
| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[1].Element;remote;df-generated |
5+
| p;Sources;true;wrappedSocketStream;();;ReturnValue;remote;df-generated |

‎java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.expected

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
| p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;generated |
2-
| p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;generated |
3-
| p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;generated |
4-
| p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;generated |
5-
| p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;generated |
6-
| p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;generated |
7-
| p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;generated |
8-
| p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;generated |
9-
| p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;generated |
10-
| p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;generated |
11-
| p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;generated |
12-
| p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;generated |
13-
| p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;generated |
14-
| p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;generated |
15-
| p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;generated |
16-
| p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;generated |
17-
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;generated |
18-
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;generated |
19-
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;generated |
20-
| p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;generated |
21-
| p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;generated |
22-
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;generated |
23-
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;generated |
24-
| p;Joiner;false;toString;();;Argument[this];ReturnValue;taint;generated |
25-
| p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;generated |
26-
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;generated |
27-
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;generated |
28-
| p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint;generated |
29-
| p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;generated |
30-
| p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint;generated |
31-
| p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint;generated |
32-
| p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint;generated |
33-
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint;generated |
34-
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint;generated |
35-
| p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;generated |
36-
| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint;generated |
37-
| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;generated |
38-
| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;generated |
39-
| p;Pojo;false;fillIn;(List);;Argument[this];Argument[0].Element;taint;generated |
40-
| p;Pojo;false;getBoxedBytes;();;Argument[this];ReturnValue;taint;generated |
41-
| p;Pojo;false;getBoxedChars;();;Argument[this];ReturnValue;taint;generated |
42-
| p;Pojo;false;getByteArray;();;Argument[this];ReturnValue;taint;generated |
43-
| p;Pojo;false;getCharArray;();;Argument[this];ReturnValue;taint;generated |
44-
| p;Pojo;false;getValue;();;Argument[this];ReturnValue;taint;generated |
45-
| p;Pojo;false;setValue;(String);;Argument[0];Argument[this];taint;generated |
46-
| p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;generated |
1+
| p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated |
2+
| p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated |
3+
| p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated |
4+
| p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated |
5+
| p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated |
6+
| p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated |
7+
| p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated |
8+
| p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated |
9+
| p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated |
10+
| p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated |
11+
| p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated |
12+
| p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated |
13+
| p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated |
14+
| p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated |
15+
| p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated |
16+
| p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated |
17+
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated |
18+
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated |
19+
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated |
20+
| p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated |
21+
| p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated |
22+
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated |
23+
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated |
24+
| p;Joiner;false;toString;();;Argument[this];ReturnValue;taint;df-generated |
25+
| p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;df-generated |
26+
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;df-generated |
27+
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;df-generated |
28+
| p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint;df-generated |
29+
| p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated |
30+
| p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint;df-generated |
31+
| p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint;df-generated |
32+
| p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint;df-generated |
33+
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint;df-generated |
34+
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint;df-generated |
35+
| p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated |
36+
| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated |
37+
| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;df-generated |
38+
| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;df-generated |
39+
| p;Pojo;false;fillIn;(List);;Argument[this];Argument[0].Element;taint;df-generated |
40+
| p;Pojo;false;getBoxedBytes;();;Argument[this];ReturnValue;taint;df-generated |
41+
| p;Pojo;false;getBoxedChars;();;Argument[this];ReturnValue;taint;df-generated |
42+
| p;Pojo;false;getByteArray;();;Argument[this];ReturnValue;taint;df-generated |
43+
| p;Pojo;false;getCharArray;();;Argument[this];ReturnValue;taint;df-generated |
44+
| p;Pojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated |
45+
| p;Pojo;false;setValue;(String);;Argument[0];Argument[this];taint;df-generated |
46+
| p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;df-generated |

‎java/ql/test/utils/modelgenerator/typebasedflow/p/MyFunction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
@FunctionalInterface
44
public interface MyFunction<T1, T2, T3> {
55

6-
// MaD=p;MyFunction;true;apply;(Object,Object);;Argument[this].SyntheticField[ArgType2];ReturnValue;value;generated
7-
// MaD=p;MyFunction;true;apply;(Object,Object);;Argument[0];Argument[this].SyntheticField[ArgType0];value;generated
8-
// MaD=p;MyFunction;true;apply;(Object,Object);;Argument[1];Argument[this].SyntheticField[ArgType1];value;generated
6+
// MaD=p;MyFunction;true;apply;(Object,Object);;Argument[this].SyntheticField[ArgType2];ReturnValue;value;tb-generated
7+
// MaD=p;MyFunction;true;apply;(Object,Object);;Argument[0];Argument[this].SyntheticField[ArgType0];value;tb-generated
8+
// MaD=p;MyFunction;true;apply;(Object,Object);;Argument[1];Argument[this].SyntheticField[ArgType1];value;tb-generated
99
T3 apply(T1 x, T2 y);
1010
}

0 commit comments

Comments
 (0)