Merge pull request #111 from yusufugurozbek/next

Relase version 1.0.5

Author: yusufugurozbek

.github/workflows/build.yml

@@ -114,7 +114,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2022.2.3
+        uses: JetBrains/qodana-action@v2022.3.0
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Testcontainers Port Updater Changelog
 
 ## [Unreleased]
+- Bump dependencies to their latest versions 
+- Fix unnecessary updates on the data source URL
+- Bump Gradle version to 7.6
 
 ## [1.0.4] - 2022-12-12
 - Support latest IntelliJ 2022.3

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.yusufugurozbek.testcontainers.port.updater
 pluginName = Testcontainers Port Updater
-pluginVersion = 1.0.4
+pluginVersion = 1.0.5
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 222
@@ -17,7 +17,7 @@ platformVersion = 2022.3
 platformPlugins = com.intellij.database
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.5.1
+gradleVersion = 7.6
 
 # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 # suppress inspection "UnusedProperty"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/github/yusufugurozbek/testcontainers/port/updater/common/StringUtils.kt

@@ -8,3 +8,7 @@ fun String.equalsIgnoringPort(other: String): Boolean {
 
     return thisWithoutNumbers == otherWithoutNumbers
 }
+
+fun String.hasPort(): Boolean {
+    return PORT_REGEX.containsMatchIn(this)
+}

src/main/kotlin/com/github/yusufugurozbek/testcontainers/port/updater/impl/DatasourceUpdaterImpl.kt

@@ -4,6 +4,7 @@ import com.github.yusufugurozbek.testcontainers.port.updater.DatasourceUrlExtrac
 import com.github.yusufugurozbek.testcontainers.port.updater.api.DatasourceUpdater
 import com.github.yusufugurozbek.testcontainers.port.updater.common.TpuNotifier
 import com.github.yusufugurozbek.testcontainers.port.updater.common.equalsIgnoringPort
+import com.github.yusufugurozbek.testcontainers.port.updater.common.hasPort
 import com.github.yusufugurozbek.testcontainers.port.updater.settings.TpuSettingsState
 import com.intellij.database.dataSource.LocalDataSource
 import com.intellij.database.psi.DbPsiFacade
@@ -18,6 +19,8 @@ class DatasourceUpdaterImpl(var project: Project) : DatasourceUpdater {
         urlExtractor.extract(logEntryText)?.let { newUrl ->
             DbPsiFacade.getInstance(project).dataSources
                 .mapNotNull { DbImplUtil.getMaybeLocalDataSource(it) }
+                .filter { it.url != newUrl }
+                .filter { it.url?.hasPort() == true && newUrl.hasPort() }
                 .filter { it.url?.equalsIgnoringPort(newUrl) ?: false }
                 .forEach { update(it, newUrl) }
         }

src/test/kotlin/com/github/yusufugurozbek/testcontainers/port/updater/common/StringUtilsKtTest.kt

@@ -21,4 +21,14 @@ internal class StringUtilsKtTest : BasePlatformTestCase() {
         val jdbcStringB = "jdbc:sqlserver://localhost:55001/test"
         assertFalse(jdbcStringA.equalsIgnoringPort(jdbcStringB))
     }
+
+    fun `test hasPort successfully detects the port`() {
+        val jdbcString = "jdbc:postgresql://localhost:55001/test"
+        assertTrue(jdbcString.hasPort())
+    }
+
+    fun `test hasPort successfully detects no port`() {
+        val jdbcString = "jdbc:postgresql://localhost/test"
+        assertFalse(jdbcString.hasPort())
+    }
 }