Java: Argument[-1] -> Argument[this] #12556

michaelnebel · 2023-03-16T15:21:59Z

In this PR we change the syntax of the input/output DSL of MaD models such that Argument[this] is used to denote the qualifier instead of Argument[-1].
Please note that

The is a breaking change and models using Argument[-1] will no longer work.
Validation has been introduced to ensure that for Argument[n] then n >= 0 (this also applies to ranges).
The discrepancy in the number of models is because some models need to be split into several rows. If a model used a range that included -1 (e.g. Argument[-1..0]) then that model needed to be split.
The model generator has been updated such that it produces models using Argument[this] as qualifier.
The Java test generator works out of the box for this change.

@lcartey : This is relevant for the field team. All models need to be updated accordingly.

github-actions · 2023-03-17T13:17:45Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,611,141,30,,,9,,,10
+    Java Standard Library,``java.*``,3,612,141,30,,,9,,,10
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8467,1582,133,6,10,113,33,1,88
+    Totals,,217,8475,1582,133,6,10,113,33,1,88

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,16,,16,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,16,
+ java.nio,16,,17,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,17,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

github-actions · 2023-03-17T13:45:55Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,611,141,30,,,9,,,10
+    Java Standard Library,``java.*``,3,612,141,30,,,9,,,10
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8467,1582,133,6,10,113,33,1,88
+    Totals,,217,8475,1582,133,6,10,113,33,1,88

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,16,,16,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,16,
+ java.nio,16,,17,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,17,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

github-actions · 2023-03-17T13:51:50Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,611,141,30,,,9,,,10
+    Java Standard Library,``java.*``,3,612,141,30,,,9,,,10
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8467,1582,133,6,10,113,33,1,88
+    Totals,,217,8475,1582,133,6,10,113,33,1,88

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,16,,16,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,16,
+ java.nio,16,,17,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,17,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

github-actions · 2023-03-17T15:28:14Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,611,141,30,,,9,,,10
+    Java Standard Library,``java.*``,3,612,141,30,,,9,,,10
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8467,1582,133,6,10,113,33,1,88
+    Totals,,217,8475,1582,133,6,10,113,33,1,88

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,16,,16,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,16,
+ java.nio,16,,17,,13,,,,,,,,,,,,,,,1,,,,,,,,,,,,,2,,,,,,,,17,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

… model generator.

github-actions · 2023-03-20T08:57:17Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,615,147,32,,,9,,,12
+    Java Standard Library,``java.*``,3,616,147,32,,,9,,,12
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8477,1612,140,6,10,113,33,1,97
+    Totals,,217,8485,1612,140,6,10,113,33,1,97

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,20,,15,,15,,,,,,,,,,,,,,,3,,,,,,,,,,,,,2,,,,,,,,15,
+ java.nio,20,,16,,15,,,,,,,,,,,,,,,3,,,,,,,,,,,,,2,,,,,,,,16,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

github-actions · 2023-03-20T09:14:18Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,615,147,32,,,9,,,12
+    Java Standard Library,``java.*``,3,616,147,32,,,9,,,12
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8477,1612,140,6,10,113,33,1,97
+    Totals,,217,8485,1612,140,6,10,113,33,1,97

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,20,,15,,15,,,,,,,,,,,,,,,3,,,,,,,,,,,,,2,,,,,,,,15,
+ java.nio,20,,16,,15,,,,,,,,,,,,,,,3,,,,,,,,,,,,,2,,,,,,,,16,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

github-actions · 2023-03-20T09:17:38Z

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. The generated reports are available in the artifacts of this workflow run. The differences will be picked up by the nightly job after the PR gets merged.

Click to show differences in coverage

java

Generated file changes for java

Changes to framework-coverage-java.rst:

-    Android,``android.*``,52,479,138,,,3,67,,,
+    Android,``android.*``,52,481,138,,,3,67,,,
-    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
+    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,39,,6,,,,,
-    Java Standard Library,``java.*``,3,615,147,32,,,9,,,12
+    Java Standard Library,``java.*``,3,616,147,32,,,9,,,12
-    `Spring <https://spring.io/>`_,``org.springframework.*``,29,477,101,,,,19,14,,29
+    `Spring <https://spring.io/>`_,``org.springframework.*``,29,480,101,,,,19,14,,29
-    Totals,,217,8477,1612,140,6,10,113,33,1,97
+    Totals,,217,8485,1612,140,6,10,113,33,1,97

Changes to framework-coverage-java.csv:

- android.database,59,,39,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,39,
+ android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
- com.google.common.base,4,,85,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,62,23
+ com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,63,24
- java.nio,20,,15,,15,,,,,,,,,,,,,,,3,,,,,,,,,,,,,2,,,,,,,,15,
+ java.nio,20,,16,,15,,,,,,,,,,,,,,,3,,,,,,,,,,,,,2,,,,,,,,16,
- org.springframework.http,14,,70,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,60,10
+ org.springframework.http,14,,71,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,61,10
- org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+ org.springframework.web.util,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25

tausbn

Python 👍

atorralba

Java LGTM (didn't review all the YMLs, only the CodeQL).

michaelnebel · 2023-03-20T14:59:27Z

DCA looks good.
Merging now to avoid further conflicts.

See: github/codeql#12556

github-actions bot added C# Java Kotlin labels Mar 16, 2023

michaelnebel force-pushed the java/argumentthis branch from 9c2f92e to 7b29936 Compare March 17, 2023 13:14

github-actions bot added the DataFlow Library label Mar 17, 2023

michaelnebel force-pushed the java/argumentthis branch from 7b29936 to 1370228 Compare March 17, 2023 13:43

github-actions bot added Go Python Ruby Swift labels Mar 17, 2023

github-actions bot added the documentation label Mar 17, 2023

michaelnebel added 6 commits March 20, 2023 09:38

C#: Update internal documentation for this parameter in models.

352bb5a

Java: Update the java internal documentation for models.

abd9f67

Java: Update summary parsing to use this instead of -1 and adjust the…

9a3c2d3

… model generator.

Java: Introduce index validation.

0ec5620

Sync files.

37484a4

C#: Introduce Argument and Parameter index validation for models.

e78af3e

michaelnebel force-pushed the java/argumentthis branch from 390c5f3 to 7245182 Compare March 20, 2023 08:54

michaelnebel added 5 commits March 20, 2023 10:14

Java: Replace Argument[-1] with Argument[this].

e86f1e4

Java: Update models that uses -1 in a range.

9039a46

Java: Add change-note.

ae12510

Java: Update expected test-output (different sorting).

ba711ab

Java: Update test comments to use this instead of -1.

01ade87

michaelnebel force-pushed the java/argumentthis branch from 8f2ac50 to 01ade87 Compare March 20, 2023 09:15

michaelnebel marked this pull request as ready for review March 20, 2023 12:31

michaelnebel requested review from a team as code owners March 20, 2023 12:31

tausbn approved these changes Mar 20, 2023

View reviewed changes

atorralba approved these changes Mar 20, 2023

View reviewed changes

michaelnebel merged commit 17b3383 into github:main Mar 20, 2023

michaelnebel deleted the java/argumentthis branch March 20, 2023 15:00

jcogs33 mentioned this pull request Mar 20, 2023

Java: update Argument[-1] to Argument[this] for a couple AI models #12602

Closed

koesie10 added a commit to github/vscode-codeql that referenced this pull request Apr 25, 2023

Rename Argument[-1] to Argument[this]

92b57bf

See: github/codeql#12556

koesie10 mentioned this pull request Apr 25, 2023

Rename Argument[-1] to Argument[this] github/vscode-codeql#2371

Merged

3 tasks

Java: Argument[-1] -> Argument[this] #12556

Java: Argument[-1] -> Argument[this] #12556

Uh oh!

Conversation

michaelnebel commented Mar 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 17, 2023

java

Generated file changes for java

Uh oh!

github-actions bot commented Mar 17, 2023

java

Generated file changes for java

Uh oh!

github-actions bot commented Mar 17, 2023

java

Generated file changes for java

Uh oh!

github-actions bot commented Mar 17, 2023

java

Generated file changes for java

Uh oh!

github-actions bot commented Mar 20, 2023

java

Generated file changes for java

Uh oh!

github-actions bot commented Mar 20, 2023

java

Generated file changes for java

Uh oh!

github-actions bot commented Mar 20, 2023

java

Generated file changes for java

Uh oh!

tausbn left a comment

Choose a reason for hiding this comment

Uh oh!

atorralba left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

michaelnebel commented Mar 20, 2023

Uh oh!

Uh oh!

michaelnebel commented Mar 16, 2023 •

edited

Loading

atorralba left a comment •

edited

Loading