Merge branch 'private-release/v1.2.5-221' into private-release/v1.2.5-223

Author: KUGDev

src/main/kotlin/eu/ibagroup/formainframe/config/ConfigDeclaration.kt

@@ -23,16 +23,15 @@ import eu.ibagroup.formainframe.config.connect.ZOSMFConnectionConfigDeclaration
 interface ConfigDeclarationFactory {
 
   /** Creates instance of [ConfigDeclaration]. */
-  fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*>
+  fun buildConfigDeclaration(): ConfigDeclaration<*>
 }
 
 /**
  * Declares config class, that will be stored in persisted state [ConfigService].
  * @param T template parameter that specifies config class.
- * @property crudable instance of [Crudable] through which to work with config data.
  * @author Valiantsin Krus
  */
-abstract class ConfigDeclaration<T: Any>(val crudable: Crudable) {
+abstract class ConfigDeclaration<T: Any> {
 
   /** Instance of connection config class */
   abstract val clazz: Class<out T>
@@ -75,8 +74,11 @@ abstract class ConfigDeclaration<T: Any>(val crudable: Crudable) {
   }
 
 
-  /** Provider decider in for config class. */
-  abstract fun getDecider(): ConfigDecider<T>
+  /**
+   * Provider decider in for config class.
+   * @param crudable instance of [Crudable] through which to work with config data.
+   * */
+  abstract fun getDecider(crudable: Crudable): ConfigDecider<T>
 
   /** Builds configurable that will be displayed in settings. */
   open fun getConfigurable(): BoundSearchableConfigurable? = null

src/main/kotlin/eu/ibagroup/formainframe/config/ConfigServiceImpl.kt

@@ -77,7 +77,7 @@ class ConfigServiceImpl : ConfigService {
   /** List of registered config declarations */
   private val configDeclarations: List<ConfigDeclaration<out Any>> by lazy {
     ConfigDeclaration.EP.extensionList.map {
-      it.buildConfigDeclaration(crudable)
+      it.buildConfigDeclaration()
     }
   }
 
@@ -201,15 +201,17 @@ internal fun makeCrudableWithoutListeners(
   credentialsGetter: () -> MutableList<Credentials> = { mutableListOf() },
   stateGetter: () -> ConfigStateV2,
 ): Crudable {
+  lateinit var crudable: Crudable
+
   val crudableLists = CrudableLists(
-    addFilter = object: AddFilter {
+    addFilter = object : AddFilter {
       override operator fun <T : Any> invoke(clazz: Class<out T>, addingRow: T): Boolean {
-        return ConfigService.instance.getConfigDeclaration(clazz).getDecider().canAdd(addingRow)
+        return ConfigService.instance.getConfigDeclaration(clazz).getDecider(crudable).canAdd(addingRow)
       }
     },
-    updateFilter = object: UpdateFilter {
-      override operator fun <T: Any> invoke(clazz: Class<out T>, currentRow: T, updatingRow: T): Boolean {
-        return ConfigService.instance.getConfigDeclaration(clazz).getDecider().canUpdate(currentRow, updatingRow)
+    updateFilter = object : UpdateFilter {
+      override operator fun <T : Any> invoke(clazz: Class<out T>, currentRow: T, updatingRow: T): Boolean {
+        return ConfigService.instance.getConfigDeclaration(clazz).getDecider(crudable).canUpdate(currentRow, updatingRow)
       }
     },
     nextUuidProvider = { UUID.randomUUID().toString() },
@@ -223,5 +225,7 @@ internal fun makeCrudableWithoutListeners(
       }
     }
   )
-  return ConcurrentCrudable(crudableLists, SimpleReadWriteAdapter())
+
+  crudable = ConcurrentCrudable(crudableLists, SimpleReadWriteAdapter())
+  return crudable
 }

src/main/kotlin/eu/ibagroup/formainframe/config/connect/ConnectionConfigDeclaration.kt

@@ -12,16 +12,13 @@ package eu.ibagroup.formainframe.config.connect
 import com.intellij.openapi.options.BoundSearchableConfigurable
 import eu.ibagroup.formainframe.config.ConfigDeclaration
 import eu.ibagroup.formainframe.config.connect.ui.CollectedConfigurable
-import eu.ibagroup.formainframe.utils.crudable.Crudable
 
 /**
  * Abstract class to declare connection configs.
  * @param Connection The system (such as zosmf, cics etc.) connection class to work with (see [ConnectionConfigBase]).
- * @param crudable [Crudable] instance to get data from.
  * @author Valiantsin Krus
  */
-abstract class ConnectionConfigDeclaration<Connection: ConnectionConfigBase>(crudable: Crudable)
-  : ConfigDeclaration<Connection>(crudable) {
+abstract class ConnectionConfigDeclaration<Connection : ConnectionConfigBase> : ConfigDeclaration<Connection>() {
 
   companion object {
     /** list of available connection configurables. */

src/main/kotlin/eu/ibagroup/formainframe/config/connect/CredentialsConfigDeclaration.kt

@@ -18,25 +18,24 @@ import eu.ibagroup.formainframe.utils.crudable.Crudable
  * Factory to create instance of [CredentialsConfigDeclaration].
  * @author Valiantsin Krus
  */
-class CredentialsConfigDeclarationFactory: ConfigDeclarationFactory {
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return CredentialsConfigDeclaration(crudable)
+class CredentialsConfigDeclarationFactory : ConfigDeclarationFactory {
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return CredentialsConfigDeclaration()
   }
 }
 
 /**
  * Declares config to work with credentials. It is the only class that is necessary to declare without
  * any logical load. All the logic of storing credentials securely is described in [CredentialService].
- * @param crudable instance of [Crudable] (not used in this class).
  * @author Valiantsin Krus
  */
-class CredentialsConfigDeclaration(crudable: Crudable): ConfigDeclaration<Credentials>(crudable) {
+class CredentialsConfigDeclaration : ConfigDeclaration<Credentials>() {
 
   override val clazz = Credentials::class.java
   override val configPriority = -100.0
 
-  override fun getDecider(): ConfigDecider<Credentials> {
-    return object: ConfigDecider<Credentials>() {
+  override fun getDecider(crudable: Crudable): ConfigDecider<Credentials> {
+    return object : ConfigDecider<Credentials>() {
       override fun canUpdate(currentRow: Credentials, updatingRow: Credentials) = true
       override fun canAdd(row: Credentials) = true
     }

src/main/kotlin/eu/ibagroup/formainframe/config/connect/ZOSMFConnectionConfigDeclaration.kt

@@ -22,24 +22,22 @@ import eu.ibagroup.formainframe.utils.crudable.getByColumnLambda
  * @author Valiantsin Krus
  */
 class ConnectionConfigDeclarationFactory : ConfigDeclarationFactory {
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return ZOSMFConnectionConfigDeclaration(crudable)
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return ZOSMFConnectionConfigDeclaration()
   }
 }
 
 /**
  * Declares connection config that will represent connection to zosmf.
- * @param crudable instance of [Crudable] through which to work with config data.
  * @author Valiantsin Krus
  */
-class ZOSMFConnectionConfigDeclaration(crudable: Crudable) :
-  ConnectionConfigDeclaration<ConnectionConfig>(crudable) {
+class ZOSMFConnectionConfigDeclaration : ConnectionConfigDeclaration<ConnectionConfig>() {
 
   override val clazz = ConnectionConfig::class.java
   override val useCredentials = true
   override val configPriority = 1.0
 
-  override fun getDecider(): ConfigDecider<ConnectionConfig> {
+  override fun getDecider(crudable: Crudable): ConfigDecider<ConnectionConfig> {
     return object : ConfigDecider<ConnectionConfig>() {
       /**
        * Enables to add connection config only if no existing connection with such name found.

src/main/kotlin/eu/ibagroup/formainframe/config/ws/WorkingSetConfigDeclaration.kt

@@ -22,8 +22,8 @@ import eu.ibagroup.formainframe.utils.crudable.Crudable
  */
 class FilesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
 
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return object : WorkingSetConfigDeclaration<FilesWorkingSetConfig>(crudable, FilesWorkingSetConfig::class.java) {
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return object : WorkingSetConfigDeclaration<FilesWorkingSetConfig>(FilesWorkingSetConfig::class.java) {
       override val configPriority = 3.0
       override fun getConfigurable() = FilesWSConfigurable()
     }
@@ -36,8 +36,8 @@ class FilesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
  * @author Valiantsin Krus
  */
 class JesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
-  override fun buildConfigDeclaration(crudable: Crudable): ConfigDeclaration<*> {
-    return object : WorkingSetConfigDeclaration<JesWorkingSetConfig>(crudable, JesWorkingSetConfig::class.java) {
+  override fun buildConfigDeclaration(): ConfigDeclaration<*> {
+    return object : WorkingSetConfigDeclaration<JesWorkingSetConfig>(JesWorkingSetConfig::class.java) {
       override val configPriority = 2.0
       override fun getConfigurable() = JesWsConfigurable()
     }
@@ -46,16 +46,14 @@ class JesWorkingSetConfigDeclarationFactory : ConfigDeclarationFactory {
 
 /**
  * Abstract class with wrapped logic of working with working sets configs.
- * @param crudable instance of [Crudable] through which to work with config data.
  * @param clazz instance of class that implements [WorkingSetConfig].
  * @author Valiantsin Krus.
  */
 abstract class WorkingSetConfigDeclaration<WS : WorkingSetConfig>(
-  crudable: Crudable,
   override val clazz: Class<out WS>
-) : ConfigDeclaration<WS>(crudable) {
+) : ConfigDeclaration<WS>() {
 
-  override fun getDecider(): ConfigDecider<WS> {
+  override fun getDecider(crudable: Crudable): ConfigDecider<WS> {
     return object : ConfigDecider<WS>() {
 
       /**

src/test/kotlin/eu/ibagroup/formainframe/config/ConfigTestSpec.kt

@@ -61,10 +61,10 @@ class ConfigTestSpec : WithApplicationShouldSpec({
         val mockConfigServiceInstance = mockk<ConfigService>()
         every {
           mockConfigServiceInstance.getConfigDeclaration(ConnectionConfig::class.java)
-        } returns ZOSMFConnectionConfigDeclaration(crudable)
+        } returns ZOSMFConnectionConfigDeclaration()
         every {
           mockConfigServiceInstance.getConfigDeclaration(Credentials::class.java)
-        } returns CredentialsConfigDeclaration(crudable)
+        } returns CredentialsConfigDeclaration()
 
         mockkObject(ConfigService)
         every { ConfigService.instance } returns mockConfigServiceInstance