save

README.md

@@ -331,7 +331,12 @@ class ActionViewComponent(
         exampleService.addItemToList(actionFormDTO.item)
         return render()
     }
-
+
+    @DeleteViewAction
+    fun deleteItem(id: Int): ViewContext {
+        exampleService.deleteItem(id)
+        return render()
+    }
     @PutViewAction
     fun savePersonPut(person: Person): ViewContext {
         this.person = person

core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActions.kt

@@ -33,8 +33,6 @@ annotation class DeleteViewAction(
 
 object ViewActionConstant {
     val attributeName = "view:action"
-    val nestedViewComponentAttributeName = "data-nested-view-component"
-
 }
 
 

core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextAsyncHandlerMethodReturnValueHandler.kt → core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextMonoHandler.kt

@@ -11,7 +11,7 @@ import org.springframework.web.method.support.ModelAndViewContainer
 import reactor.core.publisher.Mono
 
 @Component
-class ViewContextAsyncHandlerMethodReturnValueHandler() : AsyncHandlerMethodReturnValueHandler {
+class ViewContextMonoHandler : AsyncHandlerMethodReturnValueHandler {
     override fun supportsReturnType(returnType: MethodParameter): Boolean {
         return Mono::class.java.isAssignableFrom(returnType.parameterType)
     }

core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/Processor.kt

@@ -1,7 +1,9 @@
 package de.tschuehly.spring.viewcomponent.core.processor
 
 import de.tschuehly.spring.viewcomponent.core.action.*
+import java.io.File
 import java.nio.file.FileSystems
+import java.nio.file.Path
 import javax.annotation.processing.AbstractProcessor
 import javax.annotation.processing.RoundEnvironment
 import javax.annotation.processing.SupportedAnnotationTypes
@@ -11,6 +13,7 @@ import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
 import javax.tools.Diagnostic
 import kotlin.io.path.createDirectories
+import kotlin.io.path.exists
 
 @SupportedAnnotationTypes("de.tschuehly.spring.viewcomponent.core.component.ViewComponent")
 @SupportedSourceVersion(SourceVersion.RELEASE_17)
@@ -26,15 +29,19 @@ class Processor : AbstractProcessor() {
                     val seperator = FileSystems.getDefault().separator
                     val rootDir = filePath.split("build")[0].split(seperator)
                     val directoryPath = "${element.enclosingElement}".replace(".", seperator)
-                    val elementPath = "${element.simpleName}".replace(".", seperator)
                     val srcDirPath = FileSystems.getDefault()
-                            .getPath("", *rootDir.toTypedArray(), "src", "main", "kotlin", directoryPath)
-                    val srcHtmlFile = srcDirPath.resolve("$elementPath.html").toFile()
+                        .getPath("", *rootDir.toTypedArray(), "src", "main", "kotlin", directoryPath)
+
+
+                    val (srcHtmlFile, fileName) = srcDirPath.resolveFileOrNull(element.simpleName.toString()) ?: let {
+                        val msg = "No Template File found for ${srcDirPath.toAbsolutePath()}$seperator${element.simpleName}"
+                        processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, msg)
+                        throw Exception(msg)
+                    }
                     val resourceDir = FileSystems.getDefault()
-                            .getPath("", *rootDir.toTypedArray(), "build", "resources", "main", directoryPath)
+                        .getPath("", *rootDir.toTypedArray(), "build", "resources", "main", directoryPath)
                     resourceDir.createDirectories()
-                    val resourceHtmlFile = resourceDir.resolve("$elementPath.html").toFile()
-
+                    val resourceHtmlFile = resourceDir.resolve(fileName).toFile()
                     if (resourceHtmlFile.exists()) {
                         resourceHtmlFile.delete()
                     }
@@ -43,23 +50,9 @@ class Processor : AbstractProcessor() {
 
                     val viewComponentName = element.simpleName.toString().lowercase()
                     srcHtmlFile.forEachLine { htmlLine ->
-
                         if (htmlLine.contains("view:action")) {
-                            val beforeViewAction = htmlLine.split("view:action=\"")[0]
-                            val viewActionAttrVal = htmlLine.split("view:action=\"")[1].split("\"")[0]
-                            val afterViewActionAttrVal = htmlLine.split("view:action=\"")[1].split("\"")[1]
-                            val methodName = if (viewActionAttrVal.startsWith("|") &&
-                                    viewActionAttrVal.contains("?")) {
-                                viewActionAttrVal.substring(1,viewActionAttrVal.indexOf("?")).lowercase()
-                            } else {
-                                viewActionAttrVal.lowercase()
-                            }
-                            val method = element.enclosedElements.find { it.simpleName.toString().lowercase() == methodName }
-                                    ?: throw RuntimeException("viewAction method $methodName does not exist")
-
-                            val (htmxAttr, path) = getHtmxAttribute(element, method, methodName)
-                            val htmxAttrVal = viewActionAttrVal.replace(methodName,path,true)
-                            val newLine = "$beforeViewAction$htmxAttr\"$htmxAttrVal\" hx-target=\"#$viewComponentName\"$afterViewActionAttrVal"
+                            val newLine =
+                                createViewAction(htmlLine, element, viewComponentName)
 
                             resourceFileWriter.write(newLine)
                             resourceFileWriter.println()
@@ -83,6 +76,42 @@ class Processor : AbstractProcessor() {
         return true
     }
 
+    private fun Path.resolveFileOrNull(fileName: String): Pair<File, String>? {
+        val fileEndings = arrayOf(".html", ".jte")
+        fileEndings.forEach { fileEnding ->
+            if (this.resolve("$fileName$fileEnding").exists()) {
+                return this.resolve("$fileName$fileEnding").toFile() to  "$fileName$fileEnding"
+            }
+        }
+        return null
+    }
+
+    private fun createViewAction(
+        htmlLine: String,
+        element: Element,
+        viewComponentName: String
+    ): String {
+        val beforeViewAction = htmlLine.split("view:action=\"")[0]
+        val viewActionAttrVal = htmlLine.split("view:action=\"")[1].split("\"")[0]
+        val afterViewActionAttrVal = htmlLine.split("view:action=\"")[1].split("\"")[1]
+        val methodName = if (viewActionAttrVal.startsWith("|") &&
+            viewActionAttrVal.contains("?")
+        ) {
+            viewActionAttrVal.substring(1, viewActionAttrVal.indexOf("?")).lowercase()
+        } else {
+            viewActionAttrVal.lowercase()
+        }
+        val method =
+            element.enclosedElements.find { it.simpleName.toString().lowercase() == methodName }
+                ?: throw RuntimeException("viewAction method $methodName does not exist")
+
+        val (htmxAttr, path) = getHtmxAttribute(element, method, methodName)
+        val htmxAttrVal = viewActionAttrVal.replace(methodName, path, true)
+        val newLine =
+            "$beforeViewAction$htmxAttr\"$htmxAttrVal\" hx-target=\"#$viewComponentName\"$afterViewActionAttrVal"
+        return newLine
+    }
+
     private fun getHtmxAttribute(element: Element, method: Element, methodName: String): Pair<String, String> {
         method.getAnnotation(GetViewAction::class.java)?.let {
             val action = if (it.path == "") "/${element.simpleName}/$methodName" else it.path

examples/jte-demo/build.gradle.kts → examples/jte-example/build.gradle.kts

@@ -3,8 +3,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("org.springframework.boot") version "3.0.6"
     id("io.spring.dependency-management") version "1.1.2"
-    kotlin("jvm") version "1.7.22"
-    kotlin("plugin.spring") version "1.7.22"
+    kotlin("jvm") version "1.8.21"
+    kotlin("plugin.spring") version "1.8.21"
+
+    kotlin("kapt") version "1.8.21"
 }
 
 group = "de.tschuehly"
@@ -18,8 +20,8 @@ repositories {
 
 dependencies {
     implementation("de.tschuehly:spring-view-component-jte:0.6.1-SNAPSHOT")
-//    implementation("de.tschuehly:spring-view-component-jte")
 
+    kapt("de.tschuehly:spring-view-component-core:0.6.1-SNAPSHOT")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

examples/jte-example/settings.gradle.kts

@@ -0,0 +1,12 @@
+rootProject.name = "jte-example"
+
+includeBuild("..\\..\\jte"){
+    dependencySubstitution {
+        substitute(module("de.tschuehly:spring-view-component-jte")).using(project(":"))
+    }
+}
+includeBuild("..\\..\\core"){
+    dependencySubstitution {
+        substitute(module("de.tschuehly:spring-view-component-core")).using(project(":"))
+    }
+}

examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt

@@ -0,0 +1,25 @@
+package de.tschuehly.jteviewcomponentdemo.core
+
+import org.springframework.stereotype.Service
+import java.util.NoSuchElementException
+
+@Service
+class ExampleService {
+    var dataIndex = 0
+    val itemList = mutableMapOf<Int, String>()
+
+    fun getHelloWorld(): String {
+        return "Hello World"
+    }
+
+    fun addItemToList(item: String){
+        itemList[dataIndex] = item
+        dataIndex += 1
+    }
+
+    fun deleteItem(id: Int) {
+        itemList.remove(id) ?: throw NoSuchElementException("No Element with Id: $id found")
+    }
+
+
+}

examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.kt → examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.kt

@@ -1,7 +1,7 @@
 package de.tschuehly.jteviewcomponentdemo.web.example
 
 import de.tschuehly.jteviewcomponentdemo.core.ExampleService
-import de.tschuehly.spring.viewcomponent.core.ViewComponent
+import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
 import de.tschuehly.spring.viewcomponent.core.toProperty
 import de.tschuehly.spring.viewcomponent.jte.ViewContext
 

examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte → examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte

@@ -2,7 +2,6 @@
 @import de.tschuehly.jteviewcomponentdemo.web.index.IndexViewComponent
 @import de.tschuehly.spring.viewcomponent.jte.ViewContext
 
-
 @param IndexViewComponent.ExampleFormDTO exampleFormDTO
 @param ExampleViewComponent exampleViewComponent
 @param ViewContext parameterViewComponent

examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt → examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt

@@ -2,7 +2,7 @@ package de.tschuehly.jteviewcomponentdemo.web.index
 
 import de.tschuehly.jteviewcomponentdemo.web.example.ExampleViewComponent
 import de.tschuehly.jteviewcomponentdemo.web.para.ParameterViewComponent
-import de.tschuehly.spring.viewcomponent.core.ViewComponent
+import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
 import de.tschuehly.spring.viewcomponent.core.toProperty
 import de.tschuehly.spring.viewcomponent.jte.ViewContext
 

examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.kt → examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.kt

@@ -1,6 +1,6 @@
 package de.tschuehly.jteviewcomponentdemo.web.para
 
-import de.tschuehly.spring.viewcomponent.core.ViewComponent
+import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
 import de.tschuehly.spring.viewcomponent.core.toProperty
 import de.tschuehly.spring.viewcomponent.jte.ViewContext
 

examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt

@@ -6,19 +6,19 @@ import java.util.NoSuchElementException
 @Service
 class ExampleService {
     var dataIndex = 0
-    val someData = mutableMapOf<Int, String>()
+    val itemList = mutableMapOf<Int, String>()
 
     fun getHelloWorld(): String {
         return "Hello World"
     }
 
     fun addItemToList(item: String){
-        someData[dataIndex] = item
+        itemList[dataIndex] = item
         dataIndex += 1
     }
 
     fun deleteItem(id: Int) {
-        someData.remove(id) ?: throw NoSuchElementException("No Element with Id: $id found")
+        itemList.remove(id) ?: throw NoSuchElementException("No Element with Id: $id found")
     }
 
 

examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html

@@ -1,9 +1,5 @@
 <html>
-<head>
-  <script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
-</head>
 <body>
-
 <h2>ViewAction Get CountUp</h2>
 
 <button view:action="countUp">Default ViewAction [GET]</button>
@@ -45,4 +41,5 @@ <h2>ViewAction Put/Patch Person Form</h2>
   <button type="submit" view:action="savePersonPatch">Save Changes using Patch</button>
 </form>
 </body>
+
 </html>

examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt

@@ -12,7 +12,7 @@ class ActionViewComponent(
 ) {
 
     fun render() = ViewContext(
-        "itemList" toProperty exampleService.someData,
+        "itemList" toProperty exampleService.itemList,
         "counter" toProperty counter,
         "person" toProperty person
     )

jte/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-aop")
 
+    implementation("gg.jte:jte:3.0.0")
     implementation("gg.jte:jte:3.0.0")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     testImplementation("org.springframework.boot:spring-boot-starter-actuator")

thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentProcessor.kt

@@ -72,7 +72,6 @@ class ThymeleafViewComponentProcessor(dialectPrefix: String) :
         )
 
         structureHandler.setAttribute("id", viewComponentName)
-        structureHandler.setAttribute(ViewActionConstant.nestedViewComponentAttributeName, "")
         structureHandler.removeAttribute("view:component")
         structureHandler.setBody(viewComponentBody, true)
     }