- solr client

mlytvyn · mlytvyn · commit 032bc64834ba · 2025-08-15T23:26:34.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -220,12 +220,6 @@ dependencies {
     implementation(libs.jsoup)
     implementation(libs.dtdparser)
     implementation(libs.maven.model)
-    implementation(libs.solr.solrj) {
-        exclude("org.slf4j", "slf4j-api")
-        exclude("org.apache.httpcomponents", "httpclient")
-        exclude("org.apache.httpcomponents", "httpcore")
-        exclude("org.apache.httpcomponents", "httpmime")
-    }
     testImplementation(kotlin("test"))
     testRuntimeOnly("junit:junit:4.13.2")
 
diff --git a/modules/ant/src/sap/commerce/toolset/ant/ui/AntUpdateMavenDependenciesNotificationProvider.kt b/modules/ant/src/sap/commerce/toolset/ant/ui/AntUpdateMavenDependenciesNotificationProvider.kt
@@ -64,7 +64,7 @@ class AntUpdateMavenDependenciesNotificationProvider : EditorNotificationProvide
                             EditorNotifications.getInstance(project).removeNotificationsForProvider(this)
                             file.removeUserData(HybrisConstants.KEY_ANT_UPDATE_MAVEN_DEPENDENCIES)
                         }
-                        ToolWindowManager.Companion.getInstance(project).activateEditorComponent()
+                        ToolWindowManager.getInstance(project).activateEditorComponent()
                     }
             }
             panel
diff --git a/modules/groovy/remote/src/sap/commerce/toolset/groovy/remote/execution/GroovyExecutionClient.kt b/modules/groovy/remote/src/sap/commerce/toolset/groovy/remote/execution/GroovyExecutionClient.kt
@@ -70,7 +70,7 @@ class GroovyExecutionClient(project: Project, coroutineScope: CoroutineScope) :
         try {
             val document = Jsoup.parse(response.entity.content, StandardCharsets.UTF_8.name(), "")
             val jsonAsString = document.getElementsByTag("body").text()
-            val json = Json.Default.parseToJsonElement(jsonAsString)
+            val json = Json.parseToJsonElement(jsonAsString)
 
             json.jsonObject["stacktraceText"]
 
diff --git a/modules/impex/remote/src/sap/commerce/toolset/impex/remote/execution/ImpExExecutionClient.kt b/modules/impex/remote/src/sap/commerce/toolset/impex/remote/execution/ImpExExecutionClient.kt
@@ -41,7 +41,7 @@ import java.nio.charset.StandardCharsets
 class ImpExExecutionClient(project: Project, coroutineScope: CoroutineScope) : DefaultExecutionClient<ImpExExecutionContext>(project, coroutineScope) {
 
     override suspend fun execute(context: ImpExExecutionContext): DefaultExecutionResult {
-        val settings = RemoteConnectionService.Companion.getInstance(project).getActiveRemoteConnectionSettings(RemoteConnectionType.Hybris)
+        val settings = RemoteConnectionService.getInstance(project).getActiveRemoteConnectionSettings(RemoteConnectionType.Hybris)
         val actionUrl = when (context.executionMode) {
             ImpExExecutionContext.ExecutionMode.IMPORT -> settings.generatedURL + "/console/impex/import"
             ImpExExecutionContext.ExecutionMode.VALIDATE -> settings.generatedURL + "/console/impex/import/validate"
diff --git a/modules/logging/remote/src/sap/commerce/toolset/logging/CxLoggerModel.kt b/modules/logging/remote/src/sap/commerce/toolset/logging/CxLoggerModel.kt
@@ -31,7 +31,7 @@ data class CxLoggerModel(
     val parentName: String?,
     val inherited: Boolean,
     val icon: Icon,
-    val level: LogLevel = LogLevel.Companion.of(effectiveLevel),
+    val level: LogLevel = LogLevel.of(effectiveLevel),
     val psiElementPointer: SmartPsiElementPointer<PsiElement>? = null
 ) {
     val resolved: Boolean
diff --git a/modules/project/core/src/sap/commerce/toolset/project/PropertyService.kt b/modules/project/core/src/sap/commerce/toolset/project/PropertyService.kt
@@ -306,11 +306,11 @@ class PropertyService(private val project: Project) {
         return envPropertiesScope.or(advancedPropertiesScope).or(localPropertiesScope).or(projectPropertiesScope)
     }
 
-    private fun obtainConfigModule() = ModuleManager.Companion.getInstance(project)
+    private fun obtainConfigModule() = ModuleManager.getInstance(project)
         .modules
         .firstOrNull { it.yExtensionName() == HybrisConstants.EXTENSION_NAME_CONFIG }
 
-    private fun obtainPlatformModule() = ModuleManager.Companion.getInstance(project)
+    private fun obtainPlatformModule() = ModuleManager.getInstance(project)
         .modules
         .firstOrNull { it.yExtensionName() == HybrisConstants.EXTENSION_NAME_PLATFORM }
 
diff --git a/modules/project/core/src/sap/commerce/toolset/project/Util.kt b/modules/project/core/src/sap/commerce/toolset/project/Util.kt
@@ -30,7 +30,7 @@ import sap.commerce.toolset.project.facet.YFacet
 import sap.commerce.toolset.project.facet.YFacetConstants
 import java.nio.file.Path
 
-fun Module.yExtensionName(): String = YFacet.Companion.get(this)
+fun Module.yExtensionName(): String = YFacet.get(this)
     ?.configuration
     ?.state
     ?.name
@@ -41,7 +41,7 @@ fun Module.root(): Path? = this
     .firstOrNull()
     ?.toNioPathOrNull()
 
-fun findPlatformRootDirectory(project: Project): VirtualFile? = ModuleManager.Companion.getInstance(project)
+fun findPlatformRootDirectory(project: Project): VirtualFile? = ModuleManager.getInstance(project)
     .modules
     .firstOrNull { YFacetConstants.getModuleSettings(it).type == ModuleDescriptorType.PLATFORM }
     ?.let { ModuleRootManager.getInstance(it) }
diff --git a/modules/project/core/src/sap/commerce/toolset/project/facet/YFacet.kt b/modules/project/core/src/sap/commerce/toolset/project/facet/YFacet.kt
@@ -29,7 +29,7 @@ class YFacet(
     name: String,
     configuration: YFacetConfiguration,
     underlyingFacet: Facet<*>?
-) : com.intellij.facet.Facet<YFacetConfiguration>(facetType, module, name, configuration, underlyingFacet) {
+) : Facet<YFacetConfiguration>(facetType, module, name, configuration, underlyingFacet) {
 
     companion object {
         @Serial
diff --git a/modules/project/core/src/sap/commerce/toolset/project/facet/YFacetEditorTab.kt b/modules/project/core/src/sap/commerce/toolset/project/facet/YFacetEditorTab.kt
@@ -67,7 +67,7 @@ class YFacetEditorTab(
 
         if (state.subModuleType == SubModuleDescriptorType.ADDON && state.installedIntoExtensions.isNotEmpty()) {
             group("Installed Into Extensions") {
-                ModuleManager.Companion.getInstance(editorContext.project)
+                ModuleManager.getInstance(editorContext.project)
                     .modules
                     .mapNotNull { YFacet.getState(it) }
                     .filter { state.installedIntoExtensions.contains(it.name) }
diff --git a/modules/remote/core/src/sap/commerce/toolset/remote/RemoteConnectionService.kt b/modules/remote/core/src/sap/commerce/toolset/remote/RemoteConnectionService.kt
@@ -46,7 +46,7 @@ class RemoteConnectionService(private val project: Project) {
             ?: instances.first()
     }
 
-    fun getActiveRemoteConnectionId(type: RemoteConnectionType) = RemoteDeveloperSettings.Companion.getInstance(project)
+    fun getActiveRemoteConnectionId(type: RemoteConnectionType) = RemoteDeveloperSettings.getInstance(project)
         .let {
             when (type) {
                 RemoteConnectionType.Hybris -> it.activeRemoteConnectionID
@@ -93,14 +93,14 @@ class RemoteConnectionService(private val project: Project) {
 
         when (settings.scope) {
             RemoteConnectionScope.PROJECT_PERSONAL -> {
-                val developerSettings = RemoteDeveloperSettings.Companion.getInstance(project)
+                val developerSettings = RemoteDeveloperSettings.getInstance(project)
                 val mutableList = developerSettings.remoteConnectionSettingsList.toMutableList()
                 mutableList.add(settings)
                 developerSettings.remoteConnectionSettingsList = mutableList.toImmutableList()
             }
 
             RemoteConnectionScope.PROJECT -> {
-                with(RemoteProjectSettings.Companion.getInstance(project)) {
+                with(RemoteProjectSettings.getInstance(project)) {
                     remoteConnectionSettingsList = remoteConnectionSettingsList.toMutableList()
                         .apply { add(settings) }
                 }
@@ -109,12 +109,12 @@ class RemoteConnectionService(private val project: Project) {
     }
 
     fun saveRemoteConnections(type: RemoteConnectionType, settings: Collection<RemoteConnectionSettingsState>) {
-        with(RemoteProjectSettings.Companion.getInstance(project)) {
+        with(RemoteProjectSettings.getInstance(project)) {
             remoteConnectionSettingsList = remoteConnectionSettingsList.toMutableList()
                 .apply { removeIf { it.type == type } }
         }
 
-        val developerSettings = RemoteDeveloperSettings.Companion.getInstance(project)
+        val developerSettings = RemoteDeveloperSettings.getInstance(project)
         val mutableList = developerSettings.remoteConnectionSettingsList.toMutableList()
         mutableList.removeIf { it.type == type }
         developerSettings.remoteConnectionSettingsList = mutableList.toImmutableList()
@@ -124,32 +124,32 @@ class RemoteConnectionService(private val project: Project) {
     }
 
     fun setActiveRemoteConnectionSettings(settings: RemoteConnectionSettingsState) {
-        val developerSettings = RemoteDeveloperSettings.Companion.getInstance(project)
+        val developerSettings = RemoteDeveloperSettings.getInstance(project)
 
         when (settings.type) {
             RemoteConnectionType.Hybris -> {
                 developerSettings.activeRemoteConnectionID = settings.uuid
-                project.messageBus.syncPublisher(RemoteConnectionListener.Companion.TOPIC).onActiveHybrisConnectionChanged(settings)
+                project.messageBus.syncPublisher(RemoteConnectionListener.TOPIC).onActiveHybrisConnectionChanged(settings)
             }
 
             RemoteConnectionType.SOLR -> {
                 developerSettings.activeSolrConnectionID = settings.uuid
-                project.messageBus.syncPublisher(RemoteConnectionListener.Companion.TOPIC).onActiveHybrisConnectionChanged(settings)
+                project.messageBus.syncPublisher(RemoteConnectionListener.TOPIC).onActiveHybrisConnectionChanged(settings)
             }
         }
     }
 
     fun changeRemoteConnectionScope(settings: RemoteConnectionSettingsState, originalScope: RemoteConnectionScope) {
         when (originalScope) {
             RemoteConnectionScope.PROJECT_PERSONAL -> {
-                val developerSettings = RemoteDeveloperSettings.Companion.getInstance(project)
+                val developerSettings = RemoteDeveloperSettings.getInstance(project)
                 val mutableList = developerSettings.remoteConnectionSettingsList.toMutableList()
                 mutableList.remove(settings)
                 developerSettings.remoteConnectionSettingsList = mutableList.toImmutableList()
             }
 
             RemoteConnectionScope.PROJECT -> {
-                with(RemoteProjectSettings.Companion.getInstance(project)) {
+                with(RemoteProjectSettings.getInstance(project)) {
                     remoteConnectionSettingsList = remoteConnectionSettingsList.toMutableList()
                         .apply { remove(settings) }
                 }
@@ -162,13 +162,13 @@ class RemoteConnectionService(private val project: Project) {
     private fun getProjectPersonalLevelSettings(type: RemoteConnectionType) = getRemoteConnectionSettings(
         type,
         RemoteConnectionScope.PROJECT_PERSONAL,
-        RemoteDeveloperSettings.Companion.getInstance(project).remoteConnectionSettingsList
+        RemoteDeveloperSettings.getInstance(project).remoteConnectionSettingsList
     )
 
     private fun getProjectLevelSettings(type: RemoteConnectionType) = getRemoteConnectionSettings(
         type,
         RemoteConnectionScope.PROJECT,
-        RemoteProjectSettings.Companion.getInstance(project).remoteConnectionSettingsList
+        RemoteProjectSettings.getInstance(project).remoteConnectionSettingsList
     )
 
     private fun getRemoteConnectionSettings(
@@ -180,7 +180,7 @@ class RemoteConnectionService(private val project: Project) {
         .filter { it.uuid?.isNotBlank() ?: false }
         .onEach { it.scope = scope }
 
-    private fun getPropertyOrDefault(project: Project, key: String, fallback: String) = PropertyService.Companion.getInstance(project)
+    private fun getPropertyOrDefault(project: Project, key: String, fallback: String) = PropertyService.getInstance(project)
         .findProperty(key)
         ?: fallback
 
diff --git a/modules/remote/core/src/sap/commerce/toolset/remote/settings/state/RemoteConnectionSettingsState.kt b/modules/remote/core/src/sap/commerce/toolset/remote/settings/state/RemoteConnectionSettingsState.kt
@@ -54,13 +54,13 @@ class RemoteConnectionSettingsState : BaseState(), Comparable<RemoteConnectionSe
 
     val username: String
         get() = credentials?.userName
-            ?: PasswordSafe.Companion.instance.get(CredentialAttributes("SAP CX - $uuid"))
+            ?: PasswordSafe.instance.get(CredentialAttributes("SAP CX - $uuid"))
                 ?.userName
             ?: if (type == RemoteConnectionType.Hybris) "admin"
             else "solrserver"
     val password: String
         get() = credentials?.getPasswordAsString()
-            ?: PasswordSafe.Companion.instance.get(CredentialAttributes("SAP CX - $uuid"))
+            ?: PasswordSafe.instance.get(CredentialAttributes("SAP CX - $uuid"))
                 ?.getPasswordAsString()
             ?: if (type == RemoteConnectionType.Hybris) "nimda"
             else "server123"
diff --git a/modules/shared/src/sap/commerce/toolset/HybrisConstants.kt b/modules/shared/src/sap/commerce/toolset/HybrisConstants.kt
@@ -688,7 +688,7 @@ object HybrisConstants {
 
     val KEY_ANT_UPDATE_MAVEN_DEPENDENCIES = Key.create<Boolean>("notification_update_external-dependencies.xml")
 
-    val DATA_KEY_LOGGER_IDENTIFIER = DataKey.Companion.create<String>("sap.cx.logger.identifier")
+    val DATA_KEY_LOGGER_IDENTIFIER = DataKey.create<String>("sap.cx.logger.identifier")
 
     val CHARS_UPPERCASE_REGEX = "[A-Z]".toRegex()
     val CHARS_LOWERCASE_REGEX = "[a-z]".toRegex()
diff --git a/modules/solr/remote/build.gradle.kts b/modules/solr/remote/build.gradle.kts
@@ -35,6 +35,12 @@ sourceSets {
 
 dependencies {
     implementation(libs.jsoup)
+    implementation(libs.solr.solrj) {
+        exclude("org.slf4j", "slf4j-api")
+        exclude("org.apache.httpcomponents", "httpclient")
+        exclude("org.apache.httpcomponents", "httpcore")
+        exclude("org.apache.httpcomponents", "httpmime")
+    }
     implementation(project(":shared"))
     implementation(project(":remote-core"))
 
diff --git a/modules/solr/remote/src/com/intellij/idea/plugin/hybris/tools/remote/execution/solr/SolrCoreData.kt b/modules/solr/remote/src/com/intellij/idea/plugin/hybris/tools/remote/execution/solr/SolrCoreData.kt
diff --git a/modules/solr/remote/src/com/intellij/idea/plugin/hybris/tools/remote/execution/solr/SolrExecutionClient.kt b/modules/solr/remote/src/com/intellij/idea/plugin/hybris/tools/remote/execution/solr/SolrExecutionClient.kt
diff --git a/modules/solr/remote/src/com/intellij/idea/plugin/hybris/tools/remote/execution/solr/SolrQueryExecutionContext.kt b/modules/solr/remote/src/com/intellij/idea/plugin/hybris/tools/remote/execution/solr/SolrQueryExecutionContext.kt
@@ -1,6 +1,5 @@
 /*
  * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
- * Copyright (C) 2014-2016 Alexander Bartash <AlexanderBartash@gmail.com>
  * Copyright (C) 2019-2025 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class AntUpdateMavenDependenciesNotificationProvider : EditorNotificationProvide`
`64`	`64`	`EditorNotifications.getInstance(project).removeNotificationsForProvider(this)`
`65`	`65`	`file.removeUserData(HybrisConstants.KEY_ANT_UPDATE_MAVEN_DEPENDENCIES)`
`66`	`66`	`}`
`67`		`- ToolWindowManager.Companion.getInstance(project).activateEditorComponent()`
	`67`	`+ ToolWindowManager.getInstance(project).activateEditorComponent()`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`panel`