remove-version-for-maven-deps Closes #2014 (#2018)

remove-version-for-maven-deps

Author: shalom938

jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/deps/ModulesDepsService.kt

@@ -259,7 +259,7 @@ class ModulesDepsService(private val project: Project) : Disposable {
     private val timer = Timer()
 
     @NotNull
-    private var mapName2Module: ConcurrentMap<String, ModuleExt> = ConcurrentHashMap<String, ModuleExt>()
+    private var mapName2Module: ConcurrentMap<String, ModuleExt> = ConcurrentHashMap()
 
     init {
         //todo: change to coroutines
@@ -297,7 +297,7 @@ class ModulesDepsService(private val project: Project) : Disposable {
         moduleManager.modules.forEach { module ->
             val modName = module.name
             val moduleMetadata = buildMetadata(module)
-            theMap.put(modName, ModuleExt(module, moduleMetadata))
+            theMap[modName] = ModuleExt(module, moduleMetadata)
         }
         return theMap
     }
@@ -332,7 +332,7 @@ class ModulesDepsService(private val project: Project) : Disposable {
     }
 
     fun getModuleExt(moduleName: String): ModuleExt? {
-        var mExt = mapName2Module.get(moduleName)
+        var mExt = mapName2Module[moduleName]
         if (mExt == null) {
 //            println("DBG: module '${moduleName}' - metadata not built yet, building it...")
             //try to build MD for this entry
@@ -345,14 +345,11 @@ class ModulesDepsService(private val project: Project) : Disposable {
 
     private fun tryBuildAndStoreModuleExt(moduleName: String): ModuleExt? {
         val moduleManager = ModuleManager.getInstance(project)
-        val module = moduleManager.findModuleByName(moduleName)
-        if (module == null) {
-            return null
-        }
+        val module = moduleManager.findModuleByName(moduleName) ?: return null
 
         val moduleMetadata = buildMetadata(module)
         val moduleExt = ModuleExt(module, moduleMetadata)
-        mapName2Module.put(moduleName, moduleExt)
+        mapName2Module[moduleName] = moduleExt
 //        println("DBG: module '${moduleName}' - built moduleExt = $moduleExt")
         return moduleExt
     }

jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/frameworks/SpringBootMicrometerConfigureDepsService.kt

@@ -66,35 +66,29 @@ class SpringBootMicrometerConfigureDepsService(private val project: Project) : D
             return buildUnifiedDependency(libCoordinates, javaBuildSystem)
         }
 
-        fun buildUnifiedDependency(libCoordinates: UnifiedCoordinates, javaBuildSystem: BuildSystem): UnifiedDependency {
-            return buildUnifiedDependency(libCoordinates, javaBuildSystem, true)
-        }
-
         fun buildUnifiedDependency(
             libCoordinates: UnifiedCoordinates,
             javaBuildSystem: BuildSystem,
-            removeVersionIfCan: Boolean,
+            removeVersion: Boolean = true,
         ): UnifiedDependency {
-            val dep: UnifiedDependency =
-                when (javaBuildSystem) {
-                    BuildSystem.MAVEN -> UnifiedDependency(libCoordinates, null)
-                    BuildSystem.GRADLE -> {
-                        val newLibCoordinates =
-                            if (!removeVersionIfCan) {
-                                libCoordinates
-                            } else {
-                                coordsWithoutVersion(libCoordinates)
-                            }
-                        return UnifiedDependency(newLibCoordinates, "implementation")
-                    }
 
-                    else -> UnifiedDependency(libCoordinates, "compile")
+            val coordinatesWithoutVersionIfNecessary =
+                if (removeVersion) {
+                    coordinatesWithoutVersion(libCoordinates)
+                } else {
+                    libCoordinates
                 }
 
-            return dep
+            return when (javaBuildSystem) {
+                BuildSystem.MAVEN -> UnifiedDependency(coordinatesWithoutVersionIfNecessary, null)
+                BuildSystem.GRADLE -> UnifiedDependency(coordinatesWithoutVersionIfNecessary, "implementation")
+                //if not maven or gradle always add with version, probably not so relevant coz we will not get here
+                // if it's not maven or gradle
+                else -> UnifiedDependency(libCoordinates, "compile")
+            }
         }
 
-        private fun coordsWithoutVersion(orig: UnifiedCoordinates): UnifiedCoordinates {
+        private fun coordinatesWithoutVersion(orig: UnifiedCoordinates): UnifiedCoordinates {
             // version as empty string works well, while null value throws exception (both for maven and gradle)
             return UnifiedCoordinates(orig.groupId, orig.artifactId, "")
         }