Fix Micronaut inline test expectations

Author: nicolaswill

java/ql/test/library-tests/dataflow/taintsources/MicronautConfig.java

@@ -15,21 +15,21 @@ private static void sink(Object o) {}
 
     @Get("/secret")
     void testValueField() {
-        sink(secretValue); // $hasLocalValueFlow
+        sink(secretValue); // $ hasLocalValueFlow
     }
 
     @Get("/key")
     void testPropertyField() {
-        sink(apiKey); // $hasLocalValueFlow
+        sink(apiKey); // $ hasLocalValueFlow
     }
 
     @Get("/param")
     void testPropertyParam(@Property(name = "app.api-key") String appName) {
-        sink(appName); // $hasLocalValueFlow
+        sink(appName); // $ hasLocalValueFlow
     }
 
     @Get("/param")
     void testValueParam(@Value("${app.name}") String appName) {
-        sink(appName); // $hasLocalValueFlow
+        sink(appName); // $ hasLocalValueFlow
     }
 }

java/ql/test/library-tests/frameworks/micronaut/MicronautControllerTest.java

@@ -12,76 +12,76 @@ void sink(Object o) {}
 
     @Get("/path/{id}")
     void testPathVariable(@PathVariable String id) {
-        sink(id); // $hasTaintFlow
+        sink(id); // $ hasTaintFlow
     }
 
     @Get("/query")
     void testQueryValue(@QueryValue String name) {
-        sink(name); // $hasTaintFlow
+        sink(name); // $ hasTaintFlow
     }
 
     @Post("/body")
     void testBody(@Body String body) {
-        sink(body); // $hasTaintFlow
+        sink(body); // $ hasTaintFlow
     }
 
     @Get("/header")
     void testHeader(@Header String authorization) {
-        sink(authorization); // $hasTaintFlow
+        sink(authorization); // $ hasTaintFlow
     }
 
     @Get("/cookie")
     void testCookieValue(@CookieValue String sessionId) {
-        sink(sessionId); // $hasTaintFlow
+        sink(sessionId); // $ hasTaintFlow
     }
 
     @Post("/part")
     void testPart(@Part String name) {
-        sink(name); // $hasTaintFlow
+        sink(name); // $ hasTaintFlow
     }
 
     @Get("/attr")
     void testRequestAttribute(@RequestAttribute String attr) {
-        sink(attr); // $hasTaintFlow
+        sink(attr); // $ hasTaintFlow
     }
 
     @Post("/bean")
     void testRequestBean(@RequestBean Object bean) {
-        sink(bean); // $hasTaintFlow
+        sink(bean); // $ hasTaintFlow
     }
 
     @Get("/implicit")
     void testImplicitParam(String implicitParam) {
-        sink(implicitParam); // $hasTaintFlow
+        sink(implicitParam); // $ hasTaintFlow
     }
 
     @Get("/request")
     void testHttpRequest(HttpRequest<String> request) {
-        sink(request); // $hasTaintFlow
+        sink(request); // $ hasTaintFlow
     }
 
     @Get("/headers")
     void testHttpHeaders(HttpHeaders headers) {
-        sink(headers); // $hasTaintFlow
+        sink(headers); // $ hasTaintFlow
     }
 
     @Get("/parameters")
     void testHttpParameters(HttpParameters parameters) {
-        sink(parameters); // $hasTaintFlow
+        sink(parameters); // $ hasTaintFlow
     }
 
     @Get("/cookies")
     void testCookies(Cookies cookies) {
-        sink(cookies); // $hasTaintFlow
-        sink(cookies.getValue("session")); // $hasTaintFlow
+        sink(cookies); // $ hasTaintFlow
+        sink(cookies.getValue("session")); // $ hasTaintFlow
         for (java.util.Map.Entry<String, Cookie> entry : cookies) {
-            sink(entry.getValue()); // $hasTaintFlow
+            sink(entry.getValue()); // $ hasTaintFlow
         }
     }
 
     @Post("/stream")
     void testInputStream(@Body InputStream stream) {
-        sink(stream); // $hasTaintFlow
+        sink(stream); // $ hasTaintFlow
     }
 
     @Post("/reader")
@@ -91,39 +91,39 @@ void testReader(Reader reader) {
 
     @Post("/post")
     void testPostMethod(@Body String data) {
-        sink(data); // $hasTaintFlow
+        sink(data); // $ hasTaintFlow
     }
 
     @Put("/put")
     void testPutMethod(@Body String data) {
-        sink(data); // $hasTaintFlow
+        sink(data); // $ hasTaintFlow
     }
 
     @Delete("/delete/{id}")
     void testDeleteMethod(@PathVariable String id) {
-        sink(id); // $hasTaintFlow
+        sink(id); // $ hasTaintFlow
     }
 
     @Patch("/patch")
     void testPatchMethod(@Body String data) {
-        sink(data); // $hasTaintFlow
+        sink(data); // $ hasTaintFlow
     }
 
     @io.micronaut.http.annotation.Error
     void testErrorHandler(HttpRequest<?> request) {
-        sink(request); // $hasTaintFlow
+        sink(request); // $ hasTaintFlow
     }
 
     @io.micronaut.http.annotation.Error
     void testAnnotatedErrorHandler(@Header String header, @RequestBean Object bean) {
-        sink(header); // $hasTaintFlow
-        sink(bean); // $hasTaintFlow
+        sink(header); // $ hasTaintFlow
+        sink(bean); // $ hasTaintFlow
     }
 
     @io.micronaut.http.annotation.Error
     void testErrorHandlerCarriers(HttpHeaders headers, HttpParameters parameters, Cookies cookies) {
-        sink(headers); // $hasTaintFlow
-        sink(parameters); // $hasTaintFlow
-        sink(cookies); // $hasTaintFlow
+        sink(headers); // $ hasTaintFlow
+        sink(parameters); // $ hasTaintFlow
+        sink(cookies); // $ hasTaintFlow
     }
 }

java/ql/test/library-tests/frameworks/micronaut/MicronautFileUploadTest.java

@@ -9,10 +9,10 @@ void sink(Object o) {}
 
     @Post("/file")
     void testFileUpload(CompletedFileUpload file) throws IOException {
-        sink(file.getFilename()); // $hasTaintFlow
-        sink(file.getBytes()); // $hasTaintFlow
-        sink(file.getInputStream()); // $hasTaintFlow
-        sink(file.getContentType()); // $hasTaintFlow
-        sink(file.getSize()); // $hasTaintFlow
+        sink(file.getFilename()); // $ hasTaintFlow
+        sink(file.getBytes()); // $ hasTaintFlow
+        sink(file.getInputStream()); // $ hasTaintFlow
+        sink(file.getContentType()); // $ hasTaintFlow
+        sink(file.getSize()); // $ hasTaintFlow
     }
 }