From 33f7d52a46806b07189e4e9da675f72fe4483311 Mon Sep 17 00:00:00 2001 From: Francis Alexander Date: Fri, 18 Sep 2020 17:33:39 +0530 Subject: [PATCH] Naming Fixes --- .../src/semmle/code/java/frameworks/play/PlayController.qll | 2 +- .../src/semmle/code/java/frameworks/play/PlayMVCResult.qll | 4 ++-- .../src/semmle/code/java/frameworks/play/PlayMVCResults.qll | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/ql/src/semmle/code/java/frameworks/play/PlayController.qll b/java/ql/src/semmle/code/java/frameworks/play/PlayController.qll index 5592f05ca69..ff68d006e18 100644 --- a/java/ql/src/semmle/code/java/frameworks/play/PlayController.qll +++ b/java/ql/src/semmle/code/java/frameworks/play/PlayController.qll @@ -35,7 +35,7 @@ class PlayControllerActionMethod extends Method { this = controller.getAMethod() and ( this.getReturnType() instanceof PlayAsyncResultPromise or - this.getReturnType() instanceof PlayMVCResult or + this.getReturnType() instanceof PlayMVCResultClass or this.getReturnType() instanceof PlayAsyncResultCompletionStage ) ) diff --git a/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResult.qll b/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResult.qll index 60729bf7041..2a0ce62e36e 100644 --- a/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResult.qll +++ b/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResult.qll @@ -6,6 +6,6 @@ import java * @description Gets the play.mvc.Result class - Used to set a HTTP result with a status code, a set of HTTP headers and a body to be sent to the web client. * (https://www.playframework.com/documentation/2.8.x/JavaActions) */ -class PlayMVCResult extends Class { - PlayMVCResult() { this.hasQualifiedName("play.mvc", "Result") } +class PlayMVCResultClass extends Class { + PlayMVCResultClass() { this.hasQualifiedName("play.mvc", "Result") } } diff --git a/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResults.qll b/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResults.qll index 1c3d46c3ae4..28274de0312 100644 --- a/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResults.qll +++ b/java/ql/src/semmle/code/java/frameworks/play/PlayMVCResults.qll @@ -6,8 +6,8 @@ import java * @description Gets the play.mvc.Results class - Helper utilities to generate results * (https://www.playframework.com/documentation/2.8.x/JavaActions) */ -class PlayMVCResults extends Class { - PlayMVCResults() { this.hasQualifiedName("play.mvc", "Results") } +class PlayMVCResultsClass extends Class { + PlayMVCResultsClass() { this.hasQualifiedName("play.mvc", "Results") } } /** @@ -17,7 +17,7 @@ class PlayMVCResults extends Class { * (https://www.playframework.com/documentation/2.5.8/api/java/play/mvc/Results.html) */ class PlayHTTPResultsMethods extends Method { - PlayHTTPResultsMethods() { this.getDeclaringType() instanceof PlayMVCResults } + PlayHTTPResultsMethods() { this.getDeclaringType() instanceof PlayMVCResultsClass } /** * Gets all references to play.mvc.Results ok method