Merge pull request #45 from xdev-software/develop

Release 1.0.5

Author: AB-xdev

.github/workflows/update-from-template.yml

@@ -81,12 +81,13 @@ jobs:
           echo "abort=0" >> $GITHUB_OUTPUT
           
       - name: pull-request
-        uses: repo-sync/pull-request@v2
         if: steps.main.outputs.abort == 0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          source_branch: ${{ env.UPDATE_BRANCH }}
-          destination_branch: ${{ steps.main.outputs.current_branch }}
-          pr_title: "Update from template"
-          pr_body: "An automated PR to sync changes from the template into this repo"
-          
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh_pr_up() { 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" ||  git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@" 
+          }
+          gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
+            --title "Update from template" \
+            --body "An automated PR to sync changes from the template into this repo"

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.5
+* Fixed ``Add class qualifier to static member access outside declaring class`` not working in combination with Qodana plugin #25
+
 ## 1.0.4
 * Fixed pluginIcon being not displayed #35
 * Improved support of Android Studio (until a 2023 version is released) #27

build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'java'
     id 'idea'
-    id 'org.jetbrains.intellij' version '1.15.0'
-    id 'org.sonarqube' version '4.4.0.3356'
+    id 'org.jetbrains.intellij' version '1.16.0'
+    id 'org.sonarqube' version '4.4.1.3373'
 }
 
 def properties(String key) {
@@ -27,7 +27,7 @@ repositories {
 
 // Add dependencies to test, junit5 api (annotations) and engine (runtime)
 dependencies {
-    testImplementation platform('org.junit:junit-bom:5.10.0'),
+    testImplementation platform('org.junit:junit-bom:5.10.1'),
             'org.junit.jupiter:junit-jupiter',
             'org.junit.jupiter:junit-jupiter-engine',
             'org.assertj:assertj-core:3.24.2'

gradle.properties

@@ -10,7 +10,7 @@ platformVersion=2023.1
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins=java
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion=8.1.1
+gradleVersion=8.4
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache=true
 # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -1,14 +1,7 @@
 package software.xdev.saveactions.processors.java;
 
-import software.xdev.saveactions.core.ExecutionMode;
-import software.xdev.saveactions.model.Action;
-import software.xdev.saveactions.processors.Processor;
-import software.xdev.saveactions.processors.SaveWriteCommand;
-import software.xdev.saveactions.processors.java.inspection.CustomLocalCanBeFinal;
-import software.xdev.saveactions.processors.java.inspection.SerializableHasSerialVersionUIDFieldInspectionWrapper;
 import com.intellij.codeInspection.ExplicitTypeCanBeDiamondInspection;
 import com.intellij.codeInspection.LocalInspectionTool;
-import software.xdev.saveactions.processors.java.inspection.CustomAccessCanBeTightenedInspection;
 import com.intellij.codeInspection.visibility.VisibilityInspection;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
@@ -17,7 +10,6 @@
 import com.siyeh.ig.maturity.SuppressionAnnotationInspection;
 import com.siyeh.ig.performance.MethodMayBeStaticInspection;
 import com.siyeh.ig.style.ControlFlowStatementWithoutBracesInspection;
-import software.xdev.saveactions.processors.java.inspection.CustomUnqualifiedStaticUsageInspection;
 import com.siyeh.ig.style.FieldMayBeFinalInspection;
 import com.siyeh.ig.style.SingleStatementInBlockInspection;
 import com.siyeh.ig.style.UnnecessaryFinalOnLocalVariableOrParameterInspection;
@@ -26,6 +18,14 @@
 import com.siyeh.ig.style.UnqualifiedFieldAccessInspection;
 import com.siyeh.ig.style.UnqualifiedMethodAccessInspection;
 import com.siyeh.ig.style.UnqualifiedStaticUsageInspection;
+import software.xdev.saveactions.core.ExecutionMode;
+import software.xdev.saveactions.model.Action;
+import software.xdev.saveactions.processors.Processor;
+import software.xdev.saveactions.processors.SaveWriteCommand;
+import software.xdev.saveactions.processors.java.inspection.CustomAccessCanBeTightenedInspection;
+import software.xdev.saveactions.processors.java.inspection.CustomLocalCanBeFinal;
+import software.xdev.saveactions.processors.java.inspection.SerializableHasSerialVersionUIDFieldInspectionWrapper;
+import software.xdev.saveactions.processors.java.inspection.style.CustomUnqualifiedStaticUsageInspection;
 
 import java.util.Arrays;
 import java.util.EnumSet;

src/main/java/software/xdev/saveactions/processors/java/JavaProcessor.java

@@ -19,10 +19,9 @@
  */
 public class CustomSerializableHasSerialVersionUidFieldInspection extends USerializableInspectionBase {
 
-
     @SuppressWarnings("unchecked")
     public CustomSerializableHasSerialVersionUidFieldInspection() {
-        super(new Class[]{UClass.class});
+        super(UClass.class);
     }
 
     @Override

src/main/java/software/xdev/saveactions/processors/java/inspection/CustomSerializableHasSerialVersionUidFieldInspection.java

@@ -1,8 +1,8 @@
 package software.xdev.saveactions.processors.java.inspection;
 
-import software.xdev.saveactions.core.service.SaveActionsService;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.openapi.diagnostic.Logger;
+import software.xdev.saveactions.core.service.SaveActionsService;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
@@ -31,11 +31,7 @@ public static LocalInspectionTool get() {
 
     private enum SerializableClass {
         CLASS_NAME_INTELLIJ_2021_3("com.intellij.codeInspection.SerializableHasSerialVersionUidFieldInspection",
-                "software.xdev.saveactions.processors.java.inspection.CustomSerializableHasSerialVersionUidFieldInspection"),
-        CLASS_NAME_INTELLIJ_2018_3("com.siyeh.ig.serialization.SerializableHasSerialVersionUIDFieldInspection",
-                "com.siyeh.ig.serialization.SerializableHasSerialVersionUIDFieldInspection"),
-        CLASS_NAME_INTELLIJ_2016("com.siyeh.ig.serialization.SerializableHasSerialVersionUIDFieldInspectionBase",
-                "com.siyeh.ig.serialization.SerializableHasSerialVersionUIDFieldInspectionBase");
+                "software.xdev.saveactions.processors.java.inspection.CustomSerializableHasSerialVersionUidFieldInspection");
 
         /**
          * Field className: Inspection class provided by IDE
@@ -61,7 +57,8 @@ public LocalInspectionTool getInspectionInstance() {
                         Class.forName(targetClass).asSubclass(LocalInspectionTool.class);
                 LOGGER.info(String.format("Found serial version uid class %s", targetInspectionClass.getName()));
                 return targetInspectionClass.cast(targetInspectionClass.getDeclaredConstructor().newInstance());
-            } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
+            } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException
+                     | InvocationTargetException e) {
                 return null;
             }
         }