From fc999618d71b657ed1ceca9c97ffc747c44e917f Mon Sep 17 00:00:00 2001 From: David DE CARVALHO Date: Wed, 20 Aug 2025 00:13:19 +0200 Subject: [PATCH 1/2] =?UTF-8?q?tests=20pour=20compatibilit=C3=A9=20JDK11?= =?UTF-8?q?=20(avec=20JDK=2017=20local=20-=20JDK11=20local=20KO=20sur=20se?= =?UTF-8?q?veur=20sonar)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 7 ++++--- pom.xml | 8 +++++--- .../creedengo/python/checks/DictionaryItemsUnused.java | 3 ++- .../creedengo/python/utils/UtilsAST.java | 6 ++++-- 4 files changed, 15 insertions(+), 9 deletions(-) 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 848a816..82810a6 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ - 17 + 11 ${java.version} ${java.version} @@ -78,7 +78,8 @@ false - 25.5.0.107428 + + 9.9.8.100196 ${sonarpython.version} @@ -325,7 +326,8 @@ com.mycila license-maven-plugin - 5.0.0 + + 3.0 Green Code Initiative 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 cb23d72..7f9be1c 100644 --- a/src/main/java/org/greencodeinitiative/creedengo/python/utils/UtilsAST.java +++ b/src/main/java/org/greencodeinitiative/creedengo/python/utils/UtilsAST.java @@ -89,8 +89,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(); From 998d2beaebce58a67937dd2540addd06913a331c Mon Sep 17 00:00:00 2001 From: David DE CARVALHO Date: Sat, 30 Aug 2025 18:49:56 +0200 Subject: [PATCH 2/2] jdk11 for test-project --- .../test-projects/creedengo-python-plugin-test-project/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}