Merge pull request #333 from AxonFramework/feature/fix-version-npe

Fix NPE in version check

Author: CodeDrivenMitch

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 # Axon Framework plugin Changelog
 
+## [0.9.4]
+- Fix NPE in version check when using a malformed version string for an Axon dependency
+
 ## [0.9.3]
 - Remove build-until from plugin.xml, as we generally stay compatible with IDEA
 

build.gradle.kts

@@ -141,7 +141,7 @@ dependencies {
         intellijIdeaCommunity(properties("platformVersion"))
         bundledPlugin("com.intellij.java")
         bundledPlugin("org.jetbrains.kotlin")
-        pluginVerifier()
+        pluginVerifier(version="1.383")
         zipSigner()
         instrumentationTools()
 

gradle.properties

@@ -18,7 +18,7 @@
 # Basic plugin information
 pluginGroup=io.axoniq.ide.intellij
 pluginName=Axon Framework
-pluginVersion=0.9.3
+pluginVersion=0.9.4
 axonVersion=4.10.1
 javaVersion = 17
 

src/main/kotlin/org/axonframework/intellij/ide/plugin/actions/ReportFeedbackAction.kt

@@ -16,6 +16,7 @@
 
 package org.axonframework.intellij.ide.plugin.actions
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
@@ -47,4 +48,8 @@ class ReportFeedbackAction : AnAction(AxonIcons.Axon) {
             service.reportFeedback(e.project, feedback)
         }
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
 }

src/main/kotlin/org/axonframework/intellij/ide/plugin/usage/AxonVersionService.kt

@@ -156,24 +156,29 @@ class AxonVersionService(val project: Project) {
         }
 
     private fun extractVersion(properties: Properties): AxonDependencyVersion? {
-        val groupId = properties.getProperty("groupId")
-        val artifactId = properties.getProperty("artifactId")
-        val version = properties.getProperty("version")
-        if(groupId.isNullOrEmpty() || artifactId.isNullOrEmpty() || version.isNullOrEmpty()) {
-            return null
-        }
-        val dependency = AxonDependency.entries.firstOrNull { it.groupId == groupId && it.artifactId == artifactId }
-        if(dependency == null) {
+        try {
+            val groupId = properties.getProperty("groupId")
+            val artifactId = properties.getProperty("artifactId")
+            val version = properties.getProperty("version")
+            if (groupId.isNullOrEmpty() || artifactId.isNullOrEmpty() || version.isNullOrEmpty()) {
+                return null
+            }
+            val dependency = AxonDependency.entries.firstOrNull { it.groupId == groupId && it.artifactId == artifactId }
+            if (dependency == null) {
+                return null
+            }
+            val (majorVersion, minorVersion, patchVersion, remaining) = versionRegex.find(version)?.destructured ?: return null
+            return AxonDependencyVersion(
+                dependency,
+                Integer.parseInt(majorVersion),
+                Integer.parseInt(minorVersion),
+                Integer.parseInt(patchVersion),
+                remaining
+            )
+        } catch (e: Exception) {
+            // Ignore
             return null
         }
-        val (majorVersion, minorVersion, patchVersion, remaining) = versionRegex.find(version)!!.destructured
-        return AxonDependencyVersion(
-            dependency,
-            Integer.parseInt(majorVersion),
-            Integer.parseInt(minorVersion),
-            Integer.parseInt(patchVersion),
-            remaining
-        )
     }
 
     data class AxonDependencyVersion(