Able to create screens and entity listeners for embeddable entities #74

Author: alexander-shustanov

src/main/kotlin/com/haulmont/cuba/cli/cubaplugin/entitylistener/CreateEntityListenerCommand.kt

@@ -29,6 +29,7 @@ import com.haulmont.cuba.cli.kodein
 import com.haulmont.cuba.cli.prompting.Answers
 import com.haulmont.cuba.cli.prompting.QuestionsList
 import org.kodein.di.generic.instance
+import java.io.PrintWriter
 
 @Parameters(commandDescription = "Creates new entity listener")
 class CreateEntityListenerCommand : GeneratorCommand<EntityListenerModel>() {
@@ -38,6 +39,8 @@ class CreateEntityListenerCommand : GeneratorCommand<EntityListenerModel>() {
 
     private val entitySearch: EntitySearch by cubaKodein.instance()
 
+    private val printWriter: PrintWriter by cubaKodein.instance()
+
     override fun getModelName(): String = EntityListenerModel.MODEL_NAME
 
     override fun preExecute() = checkProjectExistence()
@@ -47,8 +50,10 @@ class CreateEntityListenerCommand : GeneratorCommand<EntityListenerModel>() {
                 .filter { !it.embeddable }
                 .map { it.fqn }
 
-        if (entitiesList.isEmpty())
-            fail("Project does not have any suitable entities.")
+        if (entitiesList.isEmpty()) {
+            printWriter.println("Project does not have any suitable entities.")
+            abort()
+        }
 
         question("className", "Listener name") {
             validate {

src/main/kotlin/com/haulmont/cuba/cli/cubaplugin/screen/entityscreen/EntityScreenCommandBase.kt

@@ -18,13 +18,18 @@ package com.haulmont.cuba.cli.cubaplugin.screen.entityscreen
 
 import com.haulmont.cuba.cli.Resources
 import com.haulmont.cuba.cli.commands.NonInteractiveInfo
+import com.haulmont.cuba.cli.cubaplugin.di.cubaKodein
 import com.haulmont.cuba.cli.cubaplugin.screen.ScreenCommandBase
 import com.haulmont.cuba.cli.prompting.QuestionsList
+import org.kodein.di.generic.instance
+import java.io.PrintWriter
 
 abstract class EntityScreenCommandBase<out T : EntityScreenModel> : ScreenCommandBase<T>(), NonInteractiveInfo {
 
     protected val resources by Resources.fromMyPlugin()
 
+    protected val printWriter: PrintWriter by cubaKodein.instance()
+
     override fun getNonInteractiveParameters(): Map<String, String> = mapOf(
             "entityName" to "Fully qualified entity name",
             "packageName" to "Package name",
@@ -41,8 +46,10 @@ abstract class EntityScreenCommandBase<out T : EntityScreenModel> : ScreenComman
         val entitiesList = entitySearch.getAllEntities()
                 .filter { !it.embeddable }
                 .map { it.fqn }
-        if (entitiesList.isEmpty())
-            fail("Project does not have any suitable entities.")
+        if (entitiesList.isEmpty()) {
+            printWriter.println("Project does not have any suitable entities.")
+            abort()
+        }
 
         options("entityName", "Choose entity", entitiesList)