diff --git a/Dockerfile b/Dockerfile index 29eef11..fd8b349 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -ARG MAVEN_BUILDER=3-openjdk-17-slim +#ARG MAVEN_BUILDER=3-openjdk-17-slim +#ARG SONARQUBE_VERSION=25.3.0.104237-community -#ARG SONARQUBE_VERSION=24.12.0.100206-community -ARG SONARQUBE_VERSION=25.3.0.104237-community +ARG MAVEN_BUILDER=3-openjdk-11-slim +ARG SONARQUBE_VERSION=9.9.8-community FROM maven:${MAVEN_BUILDER} AS builder diff --git a/pom.xml b/pom.xml index 69b9d72..a21bc84 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ - 17 + 11 ${java.version} ${java.version} @@ -82,7 +82,8 @@ false - 25.5.0.107428 + + 9.9.8.100196 ${sonarpython.version} @@ -329,7 +330,7 @@ com.mycila license-maven-plugin - + 4.1 diff --git a/src/it/test-projects/creedengo-python-plugin-test-project/pom.xml b/src/it/test-projects/creedengo-python-plugin-test-project/pom.xml index b42f947..5009f12 100644 --- a/src/it/test-projects/creedengo-python-plugin-test-project/pom.xml +++ b/src/it/test-projects/creedengo-python-plugin-test-project/pom.xml @@ -10,7 +10,7 @@ creedengo Python Sonar Plugin Test Project - 17 + 11 ${java.version} ${java.version} diff --git a/src/main/java/org/greencodeinitiative/creedengo/python/checks/DictionaryItemsUnused.java b/src/main/java/org/greencodeinitiative/creedengo/python/checks/DictionaryItemsUnused.java index 3fc6302..e481b45 100644 --- a/src/main/java/org/greencodeinitiative/creedengo/python/checks/DictionaryItemsUnused.java +++ b/src/main/java/org/greencodeinitiative/creedengo/python/checks/DictionaryItemsUnused.java @@ -79,7 +79,8 @@ private boolean isItemsCall(Expression expr) { } private void trackNameUsages(Tree node, ItemsLoopInfo info) { - if (node instanceof Name nodeName) { + if (node instanceof Name) { + Name nodeName = (Name) node; info.markUsage(nodeName.name()); } diff --git a/src/main/java/org/greencodeinitiative/creedengo/python/utils/UtilsAST.java b/src/main/java/org/greencodeinitiative/creedengo/python/utils/UtilsAST.java index 0818805..40e3880 100644 --- a/src/main/java/org/greencodeinitiative/creedengo/python/utils/UtilsAST.java +++ b/src/main/java/org/greencodeinitiative/creedengo/python/utils/UtilsAST.java @@ -102,8 +102,10 @@ public static RegularArgument nthArgumentOrKeyword(int argPosition, String keywo } private static boolean hasKeyword(Argument argument, String keyword) { - return argument instanceof RegularArgument regularArgument && - Optional.ofNullable(regularArgument.keywordArgument()) + if (! (argument instanceof RegularArgument)) + return false; + RegularArgument regularArgument = (RegularArgument) argument; + return Optional.ofNullable(regularArgument.keywordArgument()) .map(Name::name) .filter(name -> name.equals(keyword)) .isPresent();