From d448d89c49f16126744ab2cb5273d7d518aea9f4 Mon Sep 17 00:00:00 2001 From: Thomas Schuehly Date: Thu, 31 Aug 2023 21:11:58 +0200 Subject: [PATCH] save --- .github/workflows/release.yml | 39 ++- README.md | 146 +++------ core/build.gradle.kts | 7 +- core/settings.gradle.kts | 2 +- .../spring/viewcomponent/core/IViewContext.kt | 19 +- .../core/ViewComponentAutoConfiguration.kt | 69 ++-- .../core/action/CapturingResponseWrapper.kt | 84 ----- .../core/action/ViewActionConfiguration.kt | 5 +- .../core/action/ViewActionFilter.kt | 29 -- .../core/action/ViewActionMethod.kt | 8 + .../core/action/ViewActionParser.kt | 102 ------ .../core/action/ViewActionRegistry.kt | 4 + .../viewcomponent/core/action/ViewActions.kt | 14 +- .../core/component/ViewComponentAspect.kt | 16 +- .../component/ViewComponentChangeListener.kt | 24 -- .../core/component/ViewComponentException.kt | 4 + .../core/component/ViewComponentProperties.kt | 2 +- ...extAsyncHandlerMethodReturnValueHandler.kt | 4 +- .../core/component/ViewContextContainer.kt | 4 - .../ViewContextMethodReturnValueHandler.kt | 22 +- .../processor/ViewComponentChangeListener.kt | 65 ++++ .../core/processor/ViewComponentCompiler.kt | 7 + .../core/processor/ViewComponentParser.kt | 155 +++++++++ .../ViewComponentProcessingException.kt | 2 +- .../core/processor/ViewComponentProcessor.kt | 179 ++++++++++ .../javax.annotation.processing.Processor | 1 + .../parsed/ViewActionHtmlStructure.html | 8 + .../fixtures/parsed/nestedViewComponent.html | 31 ++ .../unparsed/ViewActionHtmlStructure.html | 8 + .../unparsed/nestedViewComponent.html | 31 ++ examples/jte-demo/settings.gradle.kts | 12 - .../core/ExampleService.kt | 8 - .../jteviewcomponentdemo/web/Router.kt | 17 - .../web/example/ExampleViewComponent.jte | 8 - .../web/example/ExampleViewComponent.kt | 15 - .../web/index/IndexViewComponent.jte | 19 -- .../web/index/IndexViewComponent.kt | 25 -- .../web/para/ParameterViewComponent.jte | 4 - .../web/para/ParameterViewComponent.kt | 12 - .../src/main/resources/application.yaml | 6 - .../application/JteTestApplication.kt | 16 - .../application/web/Router.kt | 17 - .../web/index/IndexTestViewComponent.jte | 13 - .../web/index/IndexTestViewComponent.kt | 15 - .../src/test/resources/application.yaml | 3 - examples/{jte-demo => jte-example}/.gitignore | 0 .../build.gradle.kts | 21 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 examples/{jte-demo => jte-example}/gradlew | 0 .../{jte-demo => jte-example}/gradlew.bat | 0 examples/jte-example/settings.gradle.kts | 12 + .../src/main/jte}/ActionViewComponent.jte | 2 +- .../JteViewComponentDemoApplication.kt | 0 .../core/ExampleService.kt | 8 +- .../web/TestController.kt | 36 +- .../web/action/ActionViewComponent.jte | 50 +++ .../web/action/ActionViewComponent.kt | 27 +- .../web/index/IndexViewComponent.jte | 0 .../web/index/IndexViewComponent.kt | 8 + .../web/layout/LayoutViewComponent.jte | 1 - .../web/layout/LayoutViewComponent.kt | 12 + .../web/simple/SimpleViewComponent.jte | 0 .../web/simple/SimpleViewComponent.kt | 15 +- .../src/main/resources/application.yaml | 7 + .../JteIntegrationTest.kt | 6 +- .../src/test/resources/application.yaml | 0 .../src/test/resources/static/favicon.ico | 0 .../thymeleaf-example/settings.gradle.kts | 1 - .../application/web/TestController.kt | 43 --- .../web/header/HeaderViewComponent.html | 7 - .../web/header/HeaderViewComponent.kt | 13 - .../web/layout/LayoutViewComponent.kt | 12 - .../web/simple/SimpleViewComponent.kt | 21 -- .../src/main/resources/application.properties | 1 - .../thymeleaf/IntegrationTest.kt | 88 ----- examples/thymeleaf-java-example/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 62547 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + examples/thymeleaf-java-example/mvnw | 308 ++++++++++++++++++ examples/thymeleaf-java-example/mvnw.cmd | 205 ++++++++++++ examples/thymeleaf-java-example/pom.xml | 77 +++++ .../ThymeleafJavaExampleApplication.java | 13 + .../application/core/ExampleService.java | 29 ++ .../application/web/TestController.java | 61 ++++ .../web/action/ActionViewComponent.html | 49 +++ .../web/action/ActionViewComponent.java | 76 +++++ .../web/index/IndexViewComponent.html | 10 + .../web/index/IndexViewComponent.java | 13 + .../web/layout/LayoutViewComponent.html | 11 +- .../web/layout/LayoutViewComponent.java | 15 + .../web/simple/SimpleViewComponent.html | 0 .../web/simple/SimpleViewComponent.java | 20 ++ .../src/main/resources/application.properties | 2 + .../resources/templates/template-test.html | 1 + .../ThymeleafJavaIntegrationTest.java | 213 ++++++++++++ .../.gitignore | 0 .../README.md | 0 .../build.gradle.kts | 21 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../settings.gradle.kts | 12 + .../ThymeleafKotlinExampleApplication.kt} | 4 +- .../application/core/ExampleService.kt | 6 +- .../application/web/TestController.kt | 27 +- .../web/action/ActionViewComponent.html | 2 +- .../web/action/ActionViewComponent.kt | 23 +- .../web/index/IndexViewComponent.html | 0 .../web/index/IndexViewComponent.kt | 4 +- .../web/layout/LayoutViewComponent.html | 12 +- .../web/layout/LayoutViewComponent.kt | 12 + .../web/simple/SimpleViewComponent.html | 0 .../web/simple/SimpleViewComponent.kt | 11 +- .../src/main/resources/application.properties | 2 + .../resources/templates/template-test.html | 1 + .../ThymeleafKotlinIntegrationTest.kt | 196 +++++++++++ jte/build.gradle.kts | 8 +- .../jte/JteViewComponentAutoConfiguration.kt | 13 +- .../jte/JteViewComponentCompiler.kt | 24 ++ .../viewcomponent/jte/JteViewContextAspect.kt | 5 +- .../spring/viewcomponent/jte/ViewContext.kt | 18 +- jte/src/main/resources/application.properties | 2 +- .../jte/application/JteTestApplication.kt | 17 - .../jte/application/core/ExampleService.kt | 24 -- .../web/action/ActionViewComponent.kt | 68 ---- .../web/header/HeaderViewComponent.jte | 8 - .../web/header/HeaderViewComponent.kt | 13 - .../web/index/IndexViewComponent.kt | 9 - .../web/layout/LayoutViewComponent.kt | 12 - settings.gradle.kts | 2 +- thymeleaf/build.gradle.kts | 9 +- ...ThymeleafViewComponentAutoConfiguration.kt | 11 +- .../ThymeleafViewComponentDialect.kt | 2 +- ... => ThymeleafViewComponentTagProcessor.kt} | 59 ++-- ...ontextContainerMethodReturnValueHandler.kt | 43 --- .../ViewComponentExpressionException.kt | 5 + .../viewcomponent/thymeleaf/ViewContext.kt | 29 +- .../src/main/resources/application.properties | 2 - .../src/main/resources/templates/test.html | 3 + .../thymeleaf/IntegrationTest.kt | 80 ----- .../application/ThymeleafTestApplication.kt | 18 - .../web/action/ActionViewComponent.html | 43 --- .../web/header/HeaderViewComponent.html | 7 - .../web/header/HeaderViewComponent.kt | 13 - .../web/index/IndexViewComponent.html | 12 - .../web/index/IndexViewComponent.kt | 10 - .../web/layout/LayoutViewComponent.kt | 12 - thymeleaf/src/test/resources/application.yaml | 11 - .../src/test/resources/static/favicon.ico | 0 151 files changed, 2306 insertions(+), 1429 deletions(-) delete mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/CapturingResponseWrapper.kt delete mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionFilter.kt create mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionMethod.kt delete mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionParser.kt delete mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentChangeListener.kt create mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentException.kt create mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentChangeListener.kt create mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentCompiler.kt create mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentParser.kt rename core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/{component => processor}/ViewComponentProcessingException.kt (65%) create mode 100644 core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessor.kt create mode 100644 core/src/main/resources/META-INF/services/javax.annotation.processing.Processor create mode 100644 core/src/test/resources/fixtures/parsed/ViewActionHtmlStructure.html create mode 100644 core/src/test/resources/fixtures/parsed/nestedViewComponent.html create mode 100644 core/src/test/resources/fixtures/unparsed/ViewActionHtmlStructure.html create mode 100644 core/src/test/resources/fixtures/unparsed/nestedViewComponent.html delete mode 100644 examples/jte-demo/settings.gradle.kts delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/Router.kt delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.jte delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.kt delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.jte delete mode 100644 examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.kt delete mode 100644 examples/jte-demo/src/main/resources/application.yaml delete mode 100644 examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/JteTestApplication.kt delete mode 100644 examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/Router.kt delete mode 100644 examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.jte delete mode 100644 examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.kt delete mode 100644 examples/jte-demo/src/test/resources/application.yaml rename examples/{jte-demo => jte-example}/.gitignore (100%) rename examples/{jte-demo => jte-example}/build.gradle.kts (69%) rename examples/{jte-demo => jte-example}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{jte-demo => jte-example}/gradle/wrapper/gradle-wrapper.properties (100%) rename examples/{jte-demo => jte-example}/gradlew (100%) rename examples/{jte-demo => jte-example}/gradlew.bat (100%) create mode 100644 examples/jte-example/settings.gradle.kts rename {jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action => examples/jte-example/src/main/jte}/ActionViewComponent.jte (93%) rename examples/{jte-demo => jte-example}/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/JteViewComponentDemoApplication.kt (100%) rename examples/{thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application => jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/core/ExampleService.kt (61%) rename {jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application => examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/web/TestController.kt (53%) create mode 100644 examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte rename examples/{thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application => jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/web/action/ActionViewComponent.kt (58%) rename {jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application => examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/web/index/IndexViewComponent.jte (100%) create mode 100644 examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt rename {jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application => examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/web/layout/LayoutViewComponent.jte (99%) create mode 100644 examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt rename {jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application => examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/web/simple/SimpleViewComponent.jte (100%) rename {jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application => examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo}/web/simple/SimpleViewComponent.kt (50%) create mode 100644 examples/jte-example/src/main/resources/application.yaml rename jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/JteTest.kt => examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt (96%) rename {jte => examples/jte-example}/src/test/resources/application.yaml (100%) rename {jte => examples/jte-example}/src/test/resources/static/favicon.ico (100%) delete mode 100644 examples/thymeleaf-example/settings.gradle.kts delete mode 100644 examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt delete mode 100644 examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html delete mode 100644 examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt delete mode 100644 examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt delete mode 100644 examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt delete mode 100644 examples/thymeleaf-example/src/main/resources/application.properties delete mode 100644 examples/thymeleaf-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt create mode 100644 examples/thymeleaf-java-example/.gitignore create mode 100644 examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.jar create mode 100644 examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.properties create mode 100644 examples/thymeleaf-java-example/mvnw create mode 100644 examples/thymeleaf-java-example/mvnw.cmd create mode 100644 examples/thymeleaf-java-example/pom.xml create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaExampleApplication.java create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.java create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.java create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.java create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java rename examples/{thymeleaf-example/src/main/kotlin => thymeleaf-java-example/src/main/java}/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html (86%) create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.java rename examples/{thymeleaf-example/src/main/kotlin => thymeleaf-java-example/src/main/java}/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html (100%) create mode 100644 examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.java create mode 100644 examples/thymeleaf-java-example/src/main/resources/application.properties create mode 100644 examples/thymeleaf-java-example/src/main/resources/templates/template-test.html create mode 100644 examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/.gitignore (100%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/README.md (100%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/build.gradle.kts (79%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/gradle/wrapper/gradle-wrapper.jar (100%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/gradle/wrapper/gradle-wrapper.properties (100%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/gradlew (100%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/gradlew.bat (100%) create mode 100644 examples/thymeleaf-kotlin-example/settings.gradle.kts rename examples/{thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafComponentDemoApplication.kt => thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinExampleApplication.kt} (69%) rename {thymeleaf/src/test => examples/thymeleaf-kotlin-example/src/main}/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt (74%) rename {thymeleaf/src/test => examples/thymeleaf-kotlin-example/src/main}/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt (70%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html (94%) rename {thymeleaf/src/test => examples/thymeleaf-kotlin-example/src/main}/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt (67%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html (100%) rename examples/{thymeleaf-example => thymeleaf-kotlin-example}/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt (66%) rename {thymeleaf/src/test => examples/thymeleaf-kotlin-example/src/main}/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html (86%) create mode 100644 examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt rename {thymeleaf/src/test => examples/thymeleaf-kotlin-example/src/main}/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html (100%) rename {thymeleaf/src/test => examples/thymeleaf-kotlin-example/src/main}/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt (62%) create mode 100644 examples/thymeleaf-kotlin-example/src/main/resources/application.properties create mode 100644 examples/thymeleaf-kotlin-example/src/main/resources/templates/template-test.html create mode 100644 examples/thymeleaf-kotlin-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinIntegrationTest.kt create mode 100644 jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentCompiler.kt delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/JteTestApplication.kt delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/core/ExampleService.kt delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.kt delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.jte delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.kt delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/index/IndexViewComponent.kt delete mode 100644 jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.kt rename thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/{ThymeleafViewComponentProcessor.kt => ThymeleafViewComponentTagProcessor.kt} (57%) delete mode 100644 thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewContextContainerMethodReturnValueHandler.kt create mode 100644 thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewComponentExpressionException.kt delete mode 100644 thymeleaf/src/main/resources/application.properties create mode 100644 thymeleaf/src/main/resources/templates/test.html delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/ThymeleafTestApplication.kt delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt delete mode 100644 thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt delete mode 100644 thymeleaf/src/test/resources/application.yaml delete mode 100644 thymeleaf/src/test/resources/static/favicon.ico diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd22d14..01c1704 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,13 +2,40 @@ name: Publish package to the Maven Central Repository on: push: branches: - - '**-snapshot' + - '**-SNAPSHOT' tags: - v* pull_request: branches: [ main ] jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Java + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Run chmod to make gradlew executable + run: chmod +x ./gradlew + - name: publish local + run: | + ./gradlew :core:publishToMavenLocal + ./gradlew :thymeleaf:publishToMavenLocal + ./gradlew :jte:publishToMavenLocal + - name: run thymeleaf kotlin tests + run: | + cd ./examples/thymeleaf-kotlin-example + chmod +x ./gradlew + ./gradlew test + - name: run thymeleaf java tests + run: | + cd ./examples/thymeleaf-java-example + chmod +x ./mvnw + ./mvnw test publish: + needs: test runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -20,7 +47,7 @@ jobs: - name: Run chmod to make gradlew executable run: chmod +x ./gradlew - name: Publish thymeleaf package to staging - run: ./gradlew :thymeleaf:publish --stacktrace + run: ./gradlew :thymeleaf:publish - name: Publish thymeleaf package to maven central env: JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }} @@ -29,9 +56,9 @@ jobs: JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }} JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./gradlew :thymeleaf:jreleaserDeploy -DaltDeploymentRepository=local::file:./thymeleaf/build/staging-deploy --stacktrace + run: ./gradlew :thymeleaf:jreleaserDeploy -DaltDeploymentRepository=local::file:./thymeleaf/build/staging-deploy - name: Publish jte package to staging - run: ./gradlew :jte:publish --stacktrace + run: ./gradlew :jte:publish - name: Publish jte package to maven central env: JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }} @@ -40,7 +67,7 @@ jobs: JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }} JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./gradlew :jte:jreleaserDeploy -DaltDeploymentRepository=local::file:./jte/build/staging-deploy --stacktrace + run: ./gradlew :jte:jreleaserDeploy -DaltDeploymentRepository=local::file:./jte/build/staging-deploy - name: Publish core package to staging run: ./gradlew :core:publish - name: Publish core package to maven central @@ -51,4 +78,4 @@ jobs: JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }} JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./gradlew :core:jreleaserDeploy -DaltDeploymentRepository=local::file:./core/build/staging-deploy --stacktrace \ No newline at end of file + run: ./gradlew :core:jreleaserDeploy -DaltDeploymentRepository=local::file:./core/build/staging-deploy --stacktrace diff --git a/README.md b/README.md index e5f8ea7..92a1889 100644 --- a/README.md +++ b/README.md @@ -242,16 +242,16 @@ class Router( } ``` -## ViewAction: Interactivity with HTMX - -With ViewActions you can create interactive ViewComponents based on [htmx](https://htmx.org/) without having to reload the page. +## Local Development -ViewAction integration needs to enable in your application.properties: -``` -spring.view-component.view-action.enabled=true +You can enable hot-reloading of the templates in development: +```properties +spring.view-component.local-development=true ``` -Here you can see a ViewComponent with a ViewAction that increments a counter. +## ViewAction: Interactivity with HTMX + +With ViewActions you can create interactive ViewComponents based on [htmx](https://htmx.org/) without having to reload the page. You define a ViewAction inside your HTML template with the `view:action` attribute. A ViewAction enabled ViewComponent always needs to have one root element. @@ -293,14 +293,14 @@ The hx-get attribute will create a http get request to the `/actionviewcomponent The `/actionviewcomponent/countup` endpoint will return the re-rendered ActionViewComponent template. -The `hx-target="#actionviewcomponent"` and the `hx-swap="outerHTML"` attributes will then swap the returned HTML to the div with the `id="actionviewcomponent"` that is automatically added to the root div. +The `hx-target="#actionviewcomponent"` attribute will swap the returned HTML to the div with the `id="actionviewcomponent"` that is automatically added to the root div. ```html

ViewAction Get CountUp

-
@@ -308,7 +308,7 @@ The `hx-target="#actionviewcomponent"` and the `hx-swap="outerHTML"` attributes You can also pass a custom path as annotation parameter: `@PostViewAction("/customPath/addItemAction")` -You can use different ViewAction Annotations that map to the corresponding htmx ajax methods: https://htmx.org/docs/#ajax +You can use different ViewAction Annotations that map to the corresponding [htmx ajax methods](https://htmx.org/docs/#ajax): - `@GetViewAction` - `@PostViewAction` @@ -401,28 +401,7 @@ class HomeViewComponent( ) } ``` -## Gradle Installation - -Add this snippet to your build.gradle.kts: -```kotlin -// build.gradle.kts -sourceSets { - test { - resources { - srcDir("src/test/kotlin") - exclude("**/*.kt") - } - } - main { - resources { - srcDir("src/main/kotlin") - exclude("**/*.kt") - } - } -} - -``` ### Thymeleaf Dependency [LATEST_VERSION](https://central.sonatype.com/artifact/de.tschuehly/spring-view-component-thymeleaf) on Maven Central @@ -431,6 +410,7 @@ sourceSets { // build.gradle.kts dependencies { implementation("de.tschuehly:spring-view-component-thymeleaf:LATEST_VERSION") + kapt("de.tschuehly:spring-view-component-core:LATEST_VERSION") } ``` ### JTE Dependency @@ -459,16 +439,12 @@ dependencies { // HomeViewComponent.java @ViewComponent public class HomeViewComponent { - private final ExampleService exampleService; - - public HomeViewComponent(ExampleService exampleService) { - this.exampleService = exampleService; - } - + @Autowired + private ExampleService exampleService; + public ViewContext render() { - return new ViewContext( - ViewProperty.of("helloWorld", "Hello World"), - ViewProperty.of("coffee", exampleService.getCoffee()) + return ViewContext.of( + ViewProperty.of("helloWorld", "Hello World") ); } } @@ -480,11 +456,8 @@ public class HomeViewComponent { // Router.java @Controller public class Router { - private final HomeViewComponent homeViewComponent; - - public Router(HomeViewComponent homeViewComponent) { - this.HomeViewComponent = homeViewComponent; - } + @Autowired + private HomeViewComponent homeViewComponent; @GetMapping("/") ViewContext homeView() { @@ -496,19 +469,17 @@ public class Router { ## Parameter components with Java ```java - @ViewComponent public class ParameterViewComponent { public ViewContext render(String parameter) throws Exception { if (parameter == null) { throw new Exception("You need to pass in a parameter"); } - return new ViewContext( + return ViewContext.of( ViewProperty.of("office", parameter) ); } } - ``` @@ -516,17 +487,12 @@ public class ParameterViewComponent { // HomeViewComponent.java @ViewComponent public class HomeViewComponent { - private final ExampleService exampleService; - - public HomeViewComponent(ExampleService exampleService) { - this.exampleService = exampleService; - } + @Autowired + private ExampleService exampleService; public ViewContext render() { - return new ViewContext( - ViewProperty.of("helloWorld", "Hello World"), - ViewProperty.of("coffee", exampleService.getCoffee()), - ViewProperty.of("office", exampleService.getOfficeHours()) + return ViewContext.of( + ViewProperty.of("helloWorld", "Hello World") ); } } @@ -539,17 +505,14 @@ public class HomeViewComponent { // Router.java @Controller public class Router { - private final NavigationViewComponent navigationViewComponent; - private final TableViewComponent tableViewComponent; - - public Router(NavigationViewComponent navigationViewComponent, TableViewComponent tableViewComponent) { - this.navigationViewComponent = navigationViewComponent; - this.tableViewComponent = tableViewComponent; - } - + @Autowired + private NavigationViewComponent navigationViewComponent; + @Autowired + private TableViewComponent tableViewComponent; + @GetMapping("/multi-component") ViewContextContainer multipleComponent() { - return new ViewContextContainer( + return ViewContextContainer.of( this.navigationViewComponent.render(), this.tableViewComponent.render() ); @@ -563,18 +526,13 @@ public class Router { // HomeViewComponent.java @ViewComponent public class HomeViewComponent implements Supplier { - private final ExampleService exampleService; - - public HomeViewComponent(ExampleService exampleService) { - this.exampleService = exampleService; - } + @Autowired + private ExampleService exampleService; @Override public ViewContext get() { - return new ViewContext( - ViewProperty.of("helloWorld", "Hello World"), - ViewProperty.of("coffee", exampleService.getCoffee()), - ViewProperty.of("office", exampleService.getOfficeHours()) + return ViewContext.of( + ViewProperty.of("helloWorld", "Hello World") ); } } @@ -588,19 +546,22 @@ Add this to your pom.xml: - - - src/main/java - - **/*.html - **/*.jte - - - - maven-resources-plugin5 - 3.3.0 + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + de.tschuehly + spring-view-component-core + ${de.tschuehly.version} + + + @@ -627,15 +588,4 @@ Add this to your pom.xml: spring-view-component-jte LATEST_VERSION -``` - -# General Configuration - - -## Local Development - -To enable live reload of the components on each save without rebuilding the application add this configuration: - -```properties -spring.view-component.localDevelopment=true -``` +``` \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 08052be..bc4884e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jreleaser.model.Active plugins { - id("org.springframework.boot") version "3.1.0" - id("io.spring.dependency-management") version "1.1.0" + id("org.springframework.boot") version "3.1.2" + id("io.spring.dependency-management") version "1.1.2" kotlin("jvm") version "1.8.21" kotlin("plugin.spring") version "1.8.21" @@ -13,7 +13,7 @@ plugins { } group = "de.tschuehly" -version = "0.6.0" +version = "0.6.2-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { @@ -28,6 +28,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("it.skrape:skrapeit-html-parser:1.2.2") testImplementation("org.springframework.boot:spring-boot-starter-test") implementation("org.jsoup:jsoup:1.16.1") } diff --git a/core/settings.gradle.kts b/core/settings.gradle.kts index 8eaa81a..67f981e 100644 --- a/core/settings.gradle.kts +++ b/core/settings.gradle.kts @@ -1 +1 @@ -rootProject.name = "spring-view-component-core" +rootProject.name = "spring-view-component-core" \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt index a15a455..928f591 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt @@ -1,7 +1,18 @@ package de.tschuehly.spring.viewcomponent.core interface IViewContext { - var componentBean: Any? - var componentTemplate: String? - val contextAttributes: Array -} \ No newline at end of file + companion object { + var componentBean: Any? = null + var componentTemplate: String? = null + fun getAttributes(context: IViewContext): Map { + return context::class.java.declaredFields.map { field -> + context::class.java.getDeclaredField(field.name).let { + it.isAccessible = true + field.name to it[context] + } + }.toMap() + } + } +} + +class EmptyViewContext() : IViewContext \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/ViewComponentAutoConfiguration.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/ViewComponentAutoConfiguration.kt index e2134cb..756d09b 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/ViewComponentAutoConfiguration.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/ViewComponentAutoConfiguration.kt @@ -1,7 +1,10 @@ package de.tschuehly.spring.viewcomponent.core -import de.tschuehly.spring.viewcomponent.core.component.ViewComponentChangeListener -import jakarta.annotation.PostConstruct +import de.tschuehly.spring.viewcomponent.core.processor.ViewComponentChangeListener +import de.tschuehly.spring.viewcomponent.core.processor.ViewComponentParser.BuildType +import de.tschuehly.spring.viewcomponent.core.processor.ViewComponentProcessingException +import org.slf4j.LoggerFactory +import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.boot.devtools.filewatch.FileSystemWatcher import org.springframework.context.ApplicationContext @@ -12,38 +15,46 @@ import java.io.File import java.time.Duration @Configuration -@ComponentScan("de.tschuehly.spring.viewcomponent.core.component") -class ViewComponentAutoConfiguration( -) { +@ComponentScan("de.tschuehly.spring.viewcomponent.core") +class ViewComponentAutoConfiguration { - - @ConditionalOnProperty("spring.view-component.view-action.enabled", havingValue = "true") - @ComponentScan("de.tschuehly.spring.viewcomponent.core.action") - class ViewActionConfiguration {} - - @Bean + @Configuration @ConditionalOnProperty("spring.view-component.local-development") - fun viewComponentFileSystemWatcher(applicationContext: ApplicationContext): FileSystemWatcher { - val fileSystemWatcher = FileSystemWatcher(true, Duration.ofMillis(500), Duration.ofMillis(300)) - if (File("src/main/kotlin").isDirectory) { - fileSystemWatcher.addSourceDirectory(File("src/main/kotlin/")) - } - if (File("src/main/java").isDirectory) { - fileSystemWatcher.addSourceDirectory(File("src/main/java/")) - } - fileSystemWatcher.addListener(ViewComponentChangeListener(applicationContext)) - return fileSystemWatcher - } + class LocalDevConfig { + val gradleKotlinBuildDir = "build/classes/kotlin/main/" + val javaMavenBuildDir = "target/classes/" + private val logger = LoggerFactory.getLogger(LocalDevConfig::class.java) - @Configuration - @ConditionalOnProperty("viewcomponent.localDevelopment") - class StartWatcherConfiguration( - val fileSystemWatcher: FileSystemWatcher - ) { - @PostConstruct - fun startWatcher() { + @Bean + fun viewComponentFileSystemWatcher(applicationContext: ApplicationContext): FileSystemWatcher { + val fileSystemWatcher = FileSystemWatcher(true, Duration.ofMillis(300), Duration.ofMillis(200)) + val classPath = + applicationContext.getBeansWithAnnotation(SpringBootApplication::class.java).values.first().javaClass.protectionDomain.codeSource.location.path + val (srcDir, buildType) = getSrcDir(classPath) + logger.info("Registering fileSystemWatcher: ${srcDir.path}") + fileSystemWatcher.addSourceDirectory(srcDir) + fileSystemWatcher.addListener(ViewComponentChangeListener(applicationContext, buildType)) fileSystemWatcher.start() + return fileSystemWatcher } + private fun getSrcDir(classPath: String): Pair { + if (classPath.endsWith(gradleKotlinBuildDir)) { + val srcDir = classPath.split(gradleKotlinBuildDir)[0] + "/src/main/kotlin" + val file = File(srcDir) + if (file.exists()) { + return file to BuildType.GRADLE + } + } + if (classPath.endsWith(javaMavenBuildDir)) { + val srcDir = classPath.split(javaMavenBuildDir)[0] + "src/main/java" + val file = File(srcDir) + if (file.exists()) { + return file to BuildType.MAVEN + } + } + throw ViewComponentProcessingException("No srcDir found", null) + } } + } \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/CapturingResponseWrapper.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/CapturingResponseWrapper.kt deleted file mode 100644 index 198f2e1..0000000 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/CapturingResponseWrapper.kt +++ /dev/null @@ -1,84 +0,0 @@ -package de.tschuehly.spring.viewcomponent.core.action - -import jakarta.servlet.ServletOutputStream -import jakarta.servlet.WriteListener -import jakarta.servlet.http.HttpServletResponse -import jakarta.servlet.http.HttpServletResponseWrapper -import java.io.ByteArrayOutputStream -import java.io.IOException -import java.io.OutputStreamWriter -import java.io.PrintWriter - -internal class CapturingResponseWrapper(response: HttpServletResponse) : HttpServletResponseWrapper(response) { - private val capture: ByteArrayOutputStream - private var output: ServletOutputStream? = null - private var writer: PrintWriter? = null - var viewComponentBean: Any? = null - - init { - capture = ByteArrayOutputStream(response.bufferSize) - } - - override fun getOutputStream(): ServletOutputStream { - check(writer == null) { "getWriter() has already been called on this response." } - if (output == null) { - output = object : ServletOutputStream() { - override fun isReady(): Boolean { - return true - } - - override fun setWriteListener(writeListener: WriteListener) {} - - @Throws(IOException::class) - override fun write(b: Int) { - capture.write(b) - } - - @Throws(IOException::class) - override fun flush() { - capture.flush() - } - - @Throws(IOException::class) - override fun close() { - capture.close() - } - } - } - return output!! - } - - @Throws(IOException::class) - override fun getWriter(): PrintWriter { - check(output == null) { "getOutputStream() has already been called on this response." } - if (writer == null) { - writer = PrintWriter(OutputStreamWriter(capture, characterEncoding)) - } - return writer!! - } - - @Throws(IOException::class) - override fun flushBuffer() { - super.flushBuffer() - if (writer != null) { - writer!!.flush() - } else if (output != null) { - output!!.flush() - } - } - - @get:Throws(IOException::class) - val captureAsBytes: ByteArray - get() { - if (writer != null) { - writer!!.close() - } else if (output != null) { - output!!.close() - } - return capture.toByteArray() - } - - @get:Throws(IOException::class) - val captureAsString: String - get() = String(captureAsBytes, charset(characterEncoding)) -} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionConfiguration.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionConfiguration.kt index 7f984cb..cf11454 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionConfiguration.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionConfiguration.kt @@ -11,6 +11,8 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl import org.springframework.web.util.pattern.PathPatternParser import java.lang.reflect.Method import de.tschuehly.spring.viewcomponent.core.action.ViewActionRegistry.PathMapping +import org.slf4j.LoggerFactory + @Configuration class ViewActionConfiguration( val context: ApplicationContext, @@ -23,8 +25,9 @@ class ViewActionConfiguration( fun registerViewActionEndpoints() { val viewComponentBeans = context.getBeansWithAnnotation(ViewComponent::class.java) - viewComponentBeans.forEach { (viewComponentName, viewComponentBean) -> + viewComponentBeans.forEach { (_, viewComponentBean) -> val beanType = ClassUtils.getUserClass(viewComponentBean.javaClass) + val viewComponentName = beanType.simpleName val viewComponentMethods = beanType.methods processViewComponentBean(viewComponentMethods, viewComponentName, viewComponentBean) } diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionFilter.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionFilter.kt deleted file mode 100644 index d997f2d..0000000 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionFilter.kt +++ /dev/null @@ -1,29 +0,0 @@ -package de.tschuehly.spring.viewcomponent.core.action - -import jakarta.servlet.Filter -import jakarta.servlet.FilterChain -import jakarta.servlet.ServletRequest -import jakarta.servlet.ServletResponse -import jakarta.servlet.http.HttpServletResponse -import org.springframework.core.Ordered -import org.springframework.core.annotation.Order -import org.springframework.stereotype.Component - -@Component -@Order(Ordered.HIGHEST_PRECEDENCE) -class ViewActionFilter( - private val viewActionParser: ViewActionParser -) : Filter { - override fun doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) { - val capturingResponseWrapper = CapturingResponseWrapper(response as HttpServletResponse) - chain.doFilter(request,capturingResponseWrapper) - val viewComponentName = capturingResponseWrapper.viewComponentBean?.javaClass?.simpleName?.lowercase() - val htmlString = capturingResponseWrapper.captureAsString - if(viewComponentName == null){ - response.writer.write(htmlString) - return - } - val parsedHTML = viewActionParser.parseViewComponent(viewComponentName, htmlString) - response.writer.write(parsedHTML) - } -} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionMethod.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionMethod.kt new file mode 100644 index 0000000..221b6c2 --- /dev/null +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionMethod.kt @@ -0,0 +1,8 @@ +package de.tschuehly.spring.viewcomponent.core.action + +class ViewActionMethod( + val name: String, + + val path: String, + val clazz: Class<*> +) \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionParser.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionParser.kt deleted file mode 100644 index d7c0c04..0000000 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionParser.kt +++ /dev/null @@ -1,102 +0,0 @@ -package de.tschuehly.spring.viewcomponent.core.action - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponentProcessingException -import org.jsoup.Jsoup -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element -import org.jsoup.parser.Parser -import org.springframework.stereotype.Service -import org.springframework.web.bind.annotation.RequestMethod - -@Service -class ViewActionParser( - val viewActionRegistry: ViewActionRegistry -) { - fun parseViewComponent(viewComponentName: String, htmlString: String): String { - val document = Jsoup.parse(htmlString, "", Parser.xmlParser()) - addHtmxAttrForNestedViewComponents(document) - processRootElementViewComponent(document, viewComponentName) - return document.outerHtml() - } - - private fun processRootElementViewComponent(document: Document, viewComponentName: String) { - - if (document.getElementsByAttribute(ViewActionConstant.attributeName).size == 0) { - // No view:actions in root viewcomponent to process - return - } - val childElement = getSingleChildElement(document) - - if (childElement.nodeName() == "html") { - // set id on body if it is a whole page that is returned, because htmx cannot swap html element itself - val bodyElement = document.selectFirst("body") - ?: throw ViewComponentProcessingException( - "No body tag in the root ViewComponent found, this is required", - null - ) - bodyElement.attr("id", viewComponentName) - replaceViewActionAttrWithHtmxAttr(bodyElement) - } else { - childElement.attr("id", viewComponentName) - replaceViewActionAttrWithHtmxAttr(childElement) - } - } - - private fun getSingleChildElement(document: Document): Element { - val firstChild = document.firstElementChild() - if (document.lastElementChild() != firstChild || firstChild == null) throw ViewComponentProcessingException( - "ViewComponent need to have one root html node", - null - ) - return firstChild - } - - private fun addHtmxAttrForNestedViewComponents(document: Element) { - val nestedViewComponents = document.getElementsByAttribute(ViewActionConstant.nestedViewComponentAttributeName) - nestedViewComponents.forEach { viewComponentElement -> - replaceViewActionAttrWithHtmxAttr(viewComponentElement) - } - } - - private fun replaceViewActionAttrWithHtmxAttr( - viewComponentElement: Element, - ) { - val viewComponentName = viewComponentElement.id() - if (viewComponentName == "") throw ViewComponentProcessingException( - "Id with name of viewcomponent is needed on the viewcomponent element, this should be set " + - "by the templating engine when processing nested viewcomponents", null - ) - val postViewActions = viewComponentElement.getElementsByAttribute(ViewActionConstant.attributeName) - postViewActions.forEach { el -> - val splitMethodAttribute = el.attr(ViewActionConstant.attributeName).split("?") - val methodName = splitMethodAttribute[0] - el.removeAttr(ViewActionConstant.attributeName) - val viewActionMapping = viewActionRegistry.getMapping(viewComponentName,methodName) - val path = splitMethodAttribute.getOrNull(1)?.let { pathAttributeString -> - "${viewActionMapping.path}?$pathAttributeString" - } ?: viewActionMapping.path - - el.attr( - getHXAttr(viewActionMapping.requestMethod), - path - ) - if (el.attr("hx-target") == "") { - el.attr("hx-target", "#$viewComponentName") - } - if (el.attr("hx-swap") == "") { - el.attr("hx-swap", "outerHTML") - } - } - } - - fun getHXAttr(requestMethod: RequestMethod): String { - return when (requestMethod) { - RequestMethod.GET -> "hx-get" - RequestMethod.POST -> "hx-post" - RequestMethod.PUT -> "hx-put" - RequestMethod.PATCH -> "hx-patch" - RequestMethod.DELETE -> "hx-delete" - else -> throw ViewComponentProcessingException("RequestMethod: ${requestMethod.name} not supported", null) - } - } -} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionRegistry.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionRegistry.kt index bd94314..db76976 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionRegistry.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActionRegistry.kt @@ -1,5 +1,6 @@ package de.tschuehly.spring.viewcomponent.core.action +import org.slf4j.LoggerFactory import org.springframework.stereotype.Component import org.springframework.web.bind.annotation.RequestMethod import java.lang.reflect.Method @@ -8,11 +9,14 @@ import java.lang.reflect.Method class ViewActionRegistry { private val viewActionMapping = mutableMapOf() + private val logger = LoggerFactory.getLogger(ViewActionRegistry::class.java) + fun registerMapping(viewComponentName: String, mapping: PathMapping) { val key = viewActionKey(viewComponentName, mapping.method.name) if (viewActionMapping.containsKey(key)) { throw ViewActionRegistryException("Cannot register duplicate path mapping") } + logger.info("Registered endpoint ${mapping.path} to $viewComponentName::${mapping.method.name}") viewActionMapping[key] = mapping } diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActions.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActions.kt index 470ea82..fca8f5a 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActions.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/action/ViewActions.kt @@ -2,38 +2,38 @@ package de.tschuehly.spring.viewcomponent.core.action @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) -annotation class PostViewAction( - val path: String = "" +annotation class PostViewAction ( + val path: String = "" ) @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) annotation class GetViewAction( - val path: String = "" + val path: String = "" ) @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) annotation class PutViewAction( - val path: String = "" + val path: String = "" ) @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) annotation class PatchViewAction( - val path: String = "" + val path: String = "" ) @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) annotation class DeleteViewAction( - val path: String = "" + val path: String = "" ) object ViewActionConstant { val attributeName = "view:action" - val nestedViewComponentAttributeName = "nestedviewcomponent" + val nestedViewComponentAttributeName = "data-nested-view-component" } diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentAspect.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentAspect.kt index 2f3fd99..1b8fe10 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentAspect.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentAspect.kt @@ -18,16 +18,16 @@ class ViewComponentAspect { @Around("isViewComponent() && execution(* *(..))") fun renderInject(joinPoint: ProceedingJoinPoint): IViewContext { - val returnValue = joinPoint.proceed() - if (returnValue::class.isSubclassOf(IViewContext::class)) { + val viewContext = if(IViewContext::class.java.isAssignableFrom(returnValue.javaClass)){ returnValue as IViewContext - val componentName = joinPoint.`this`.javaClass.simpleName.substringBefore("$$") - val componentPackage = joinPoint.`this`.javaClass.`package`.name.replace(".", "/") + "/" - returnValue.componentTemplate = "$componentPackage$componentName" - returnValue.componentBean = joinPoint.target - return returnValue + }else{ + throw ViewComponentException("${returnValue.javaClass} needs to implement ViewContext abstract class") } - throw Error("render() method does not return ViewContext") + val componentName = joinPoint.`this`.javaClass.simpleName.substringBefore("$$") + val componentPackage = joinPoint.`this`.javaClass.`package`.name.replace(".", "/") + "/" + IViewContext.componentBean = joinPoint.target + IViewContext.componentTemplate = "$componentPackage$componentName" + return viewContext } } \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentChangeListener.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentChangeListener.kt deleted file mode 100644 index 46073e8..0000000 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentChangeListener.kt +++ /dev/null @@ -1,24 +0,0 @@ -package de.tschuehly.spring.viewcomponent.core.component - -import org.springframework.boot.devtools.classpath.ClassPathChangedEvent -import org.springframework.boot.devtools.filewatch.ChangedFiles -import org.springframework.boot.devtools.filewatch.FileChangeListener -import org.springframework.context.ApplicationEventPublisher - -class ViewComponentChangeListener( - private val eventPublisher: ApplicationEventPublisher -) : FileChangeListener { - override fun onChange(changeSet: MutableSet) { - if (changeSet.any { changedFiles -> - changedFiles.files.any { - it.relativeName.endsWith(".html") || it.relativeName.endsWith(".jte") - } - }) { - publishEvent(ClassPathChangedEvent(this, changeSet, false)) - } - } - - private fun publishEvent(event: ClassPathChangedEvent) { - this.eventPublisher.publishEvent(event) - } -} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentException.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentException.kt new file mode 100644 index 0000000..8f78c2a --- /dev/null +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentException.kt @@ -0,0 +1,4 @@ +package de.tschuehly.spring.viewcomponent.core.component + +class ViewComponentException(override val message: String): RuntimeException() { +} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProperties.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProperties.kt index 973a922..73b63b2 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProperties.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProperties.kt @@ -3,6 +3,6 @@ package de.tschuehly.spring.viewcomponent.core.component import org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties("spring.view-component") -class ViewComponentProperties( +data class ViewComponentProperties( val localDevelopment: Boolean = false ) \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextAsyncHandlerMethodReturnValueHandler.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextAsyncHandlerMethodReturnValueHandler.kt index b74e48e..5d00bea 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextAsyncHandlerMethodReturnValueHandler.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextAsyncHandlerMethodReturnValueHandler.kt @@ -34,8 +34,8 @@ class ViewContextAsyncHandlerMethodReturnValueHandler() : AsyncHandlerMethodRetu val viewContext = responseEntity.body?.takeIf { IViewContext::class.java.isAssignableFrom(it.javaClass) } as IViewContext - mavContainer.view = viewContext.componentTemplate - mavContainer.addAllAttributes(viewContext.contextAttributes.toMap()) + mavContainer.view = IViewContext.componentTemplate +// mavContainer.addAllAttributes(viewContext.contextAttributes.toMap()) } override fun isAsyncReturnValue(returnValue: Any?, returnType: MethodParameter): Boolean { diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextContainer.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextContainer.kt index e3139cb..61a0c68 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextContainer.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextContainer.kt @@ -1,7 +1,3 @@ package de.tschuehly.spring.viewcomponent.core.component import de.tschuehly.spring.viewcomponent.core.IViewContext - -class ViewContextContainer( - vararg val viewContexts: IViewContext -) \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextMethodReturnValueHandler.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextMethodReturnValueHandler.kt index a37af54..55d9c82 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextMethodReturnValueHandler.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewContextMethodReturnValueHandler.kt @@ -1,9 +1,6 @@ package de.tschuehly.spring.viewcomponent.core.component import de.tschuehly.spring.viewcomponent.core.IViewContext -import de.tschuehly.spring.viewcomponent.core.action.CapturingResponseWrapper -import de.tschuehly.spring.viewcomponent.core.toMap -import jakarta.servlet.http.HttpServletResponseWrapper import org.springframework.core.MethodParameter import org.springframework.stereotype.Component import org.springframework.web.context.request.NativeWebRequest @@ -26,23 +23,8 @@ class ViewContextMethodReturnValueHandler : HandlerMethodReturnValueHandler { val viewContext = returnValue?.takeIf { (IViewContext::class.java.isAssignableFrom(it.javaClass)) } as IViewContext - mavContainer.view = viewContext.componentTemplate - mavContainer.addAllAttributes(viewContext.contextAttributes.toMap()) - val response = webRequest.nativeResponse - if (response is HttpServletResponseWrapper) { - setResponseBean(response,viewContext) - } + mavContainer.view = IViewContext.componentTemplate + mavContainer.addAllAttributes(IViewContext.getAttributes(viewContext)) } - - private fun setResponseBean(wrapper: HttpServletResponseWrapper, viewContext: IViewContext) { - if (wrapper is CapturingResponseWrapper) { - wrapper.viewComponentBean = viewContext.componentBean - return - } - val response = wrapper.response - if(response is HttpServletResponseWrapper){ - setResponseBean(response, viewContext) - } - } } \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentChangeListener.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentChangeListener.kt new file mode 100644 index 0000000..5acafa2 --- /dev/null +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentChangeListener.kt @@ -0,0 +1,65 @@ +package de.tschuehly.spring.viewcomponent.core.processor + +import de.tschuehly.spring.viewcomponent.core.action.* +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent +import org.slf4j.LoggerFactory +import org.springframework.aop.framework.Advised +import org.springframework.aop.support.AopUtils +import org.springframework.boot.devtools.filewatch.ChangedFiles +import org.springframework.boot.devtools.filewatch.FileChangeListener +import org.springframework.context.ApplicationContext + + +class ViewComponentChangeListener( + private val applicationContext: ApplicationContext, + private val buildType: ViewComponentParser.BuildType +) : FileChangeListener { + private val logger = LoggerFactory.getLogger(ViewComponentChangeListener::class.java) + override fun onChange(changeSet: MutableSet) { + if ( + changeSet.any { changedFiles -> + changedFiles.files.any { + it.relativeName.endsWith(".html") || + it.relativeName.endsWith(".th") || + it.relativeName.endsWith(".jte") || + it.relativeName.endsWith(".kte") + } + } + ) { + val srcFile = changeSet.first().files.first().file + val bean = applicationContext.getBeansWithAnnotation(ViewComponent::class.java).filter { + it.key.lowercase() == srcFile.nameWithoutExtension.lowercase() + }.values.first() + val javaClass = if (AopUtils.isAopProxy(bean) && bean is Advised) { + bean.targetSource.target!!.javaClass + } else bean.javaClass + val methodList = javaClass.declaredMethods.mapNotNull { method -> + if (method.getAnnotation(GetViewAction::class.java) != null) { + val get = (method.getAnnotation(GetViewAction::class.java) as GetViewAction) + return@mapNotNull ViewActionMethod(method.name.toString(), get.path, GetViewAction::class.java) + } + if (method.getAnnotation(PostViewAction::class.java) != null) { + val get = (method.getAnnotation(PostViewAction::class.java) as PostViewAction) + return@mapNotNull ViewActionMethod(method.name.toString(), get.path, PostViewAction::class.java) + } + if (method.getAnnotation(PutViewAction::class.java) != null) { + val get = (method.getAnnotation(PutViewAction::class.java) as PutViewAction) + return@mapNotNull ViewActionMethod(method.name.toString(), get.path, PutViewAction::class.java) + } + if (method.getAnnotation(PatchViewAction::class.java) != null) { + val get = (method.getAnnotation(PatchViewAction::class.java) as PatchViewAction) + return@mapNotNull ViewActionMethod(method.name.toString(), get.path, PatchViewAction::class.java) + } + if (method.getAnnotation(DeleteViewAction::class.java) != null) { + val get = (method.getAnnotation(DeleteViewAction::class.java) as DeleteViewAction) + return@mapNotNull ViewActionMethod(method.name.toString(), get.path, DeleteViewAction::class.java) + } + return@mapNotNull null + } + logger.debug("Detected Change to {}", srcFile.absoluteFile) + val parser = ViewComponentParser(srcFile,buildType,methodList,javaClass.simpleName.lowercase()) + parser.parseFile() + } + } + +} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentCompiler.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentCompiler.kt new file mode 100644 index 0000000..e9be1b3 --- /dev/null +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentCompiler.kt @@ -0,0 +1,7 @@ +package de.tschuehly.spring.viewcomponent.core.processor + +import java.nio.file.Path + +fun interface ViewComponentCompiler { + fun compile(rootDir: Path, names: String, classDirectory: Path): String +} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentParser.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentParser.kt new file mode 100644 index 0000000..5d9cc46 --- /dev/null +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentParser.kt @@ -0,0 +1,155 @@ +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.Messager +import javax.tools.Diagnostic +import kotlin.io.path.createDirectories + +class ViewComponentParser( + private val srcFile: File, + private val buildType: BuildType, + private val methodList: List, + private val viewComponentName: String, + private val messager: Messager? = null +) { + + + enum class BuildType { + MAVEN, GRADLE + } + + fun parseFile() { + val parsedHtml = parseSrcHtmlFile() + val (rootDir, packagePath) = getRootDirAndPackagePath(srcFile, messager) + val resourceDirPath = getResourceDirPath(rootDir, packagePath) + val resourceHtmlFile = getResourceFile(resourceDirPath) + resourceHtmlFile.writeAll(parsedHtml) + + try { + val clazz = Class.forName("de.tschuehly.spring.viewcomponent.jte.JteViewComponentCompiler") + val compiler = (clazz.getConstructor().newInstance() as ViewComponentCompiler) + + val classDir = getClassDirPath(rootDir) + compiler.compile( + rootDir = resourceDirPath.toAbsolutePath(), + names = srcFile.name, + classDirectory = classDir + ) + } catch (e: ClassNotFoundException) { + messager?.printMessage( + Diagnostic.Kind.NOTE, + "If you don't use JTE this message can be ignored: JteViewComponentCompiler not found" + ) + } + } + + private fun File.writeAll( + parsedHtml: List + ) { + val writer = this.printWriter() + parsedHtml.forEach { + writer.println(it) + } + writer.flush() + writer.close() + } + + private fun getResourceDirPath(rootDir: String, packagePath: String): Path = if (buildType == BuildType.GRADLE) { + FileSystems.getDefault() + .getPath(rootDir, "build", "resources", "main", packagePath) + } else { + FileSystems.getDefault() + .getPath(rootDir, "target", "classes", packagePath) + } + + private fun getClassDirPath(rootDir: String): Path = if (buildType == BuildType.GRADLE) { + FileSystems.getDefault() + .getPath(rootDir, "build", "generated") + } else { + FileSystems.getDefault() + .getPath(rootDir, "target", "classes") + } + + private fun getResourceFile(resourceDir: Path): File { + resourceDir.createDirectories() + val resourceHtmlFile = resourceDir.resolve(srcFile.name).toFile() + if (resourceHtmlFile.exists()) { + resourceHtmlFile.delete() + } + resourceHtmlFile.createNewFile() + return resourceHtmlFile + } + + private fun getRootDirAndPackagePath(srcFile: File, messager: Messager?): Pair { + val seperator = FileSystems.getDefault().separator + val srcMain = "src${seperator}main${seperator}" + val list = if (srcFile.path.contains("${srcMain}kotlin")) { + srcFile.path.split("${srcMain}kotlin") + } else if (srcFile.path.contains("${srcMain}java")) { + srcFile.path.split(("${srcMain}java")) + } else { + messager?.printMessage(Diagnostic.Kind.ERROR, "No src main found") + throw ViewComponentProcessingException("No src main found", null) + } + return list[0] to list[1].split(srcFile.name)[0] + } + + private fun parseSrcHtmlFile(): List = srcFile.readLines().map { htmlLine -> + if (htmlLine.contains(" { + val action = if (method.path == "") "/$viewComponentName/${method.name}" else method.path + return when (method.clazz) { + GetViewAction::class.java -> Pair("hx-get=", action.lowercase()) + PostViewAction::class.java -> Pair("hx-post=", action.lowercase()) + PutViewAction::class.java -> Pair("hx-put=", action.lowercase()) + PatchViewAction::class.java -> Pair("hx-patch=", action.lowercase()) + DeleteViewAction::class.java -> Pair("hx-delete=", action.lowercase()) + else -> let { + messager?.printMessage(Diagnostic.Kind.ERROR, "No annotation found on $viewComponentName") + throw ViewComponentProcessingException("No annotation found on $viewComponentName", null) + } + } + } +} \ No newline at end of file diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProcessingException.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessingException.kt similarity index 65% rename from core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProcessingException.kt rename to core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessingException.kt index fcc0323..c833434 100644 --- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/component/ViewComponentProcessingException.kt +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessingException.kt @@ -1,4 +1,4 @@ -package de.tschuehly.spring.viewcomponent.core.component +package de.tschuehly.spring.viewcomponent.core.processor class ViewComponentProcessingException(message: String?, cause: Throwable?) : Exception(message, cause) { diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessor.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessor.kt new file mode 100644 index 0000000..fa0024a --- /dev/null +++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/processor/ViewComponentProcessor.kt @@ -0,0 +1,179 @@ +package de.tschuehly.spring.viewcomponent.core.processor + +import de.tschuehly.spring.viewcomponent.core.action.* +import de.tschuehly.spring.viewcomponent.core.processor.ViewComponentParser.BuildType +import java.io.File +import java.io.IOException +import java.nio.file.FileSystems +import java.nio.file.Path +import java.nio.file.Paths +import java.util.* +import javax.annotation.processing.* +import javax.lang.model.SourceVersion +import javax.lang.model.element.Element +import javax.lang.model.element.ElementKind +import javax.lang.model.element.Name +import javax.lang.model.element.TypeElement +import javax.lang.model.type.TypeVisitor +import javax.lang.model.util.SimpleTypeVisitor14 +import javax.tools.Diagnostic +import kotlin.io.path.absolute +import kotlin.io.path.absolutePathString +import kotlin.io.path.exists + + +@SupportedAnnotationTypes("de.tschuehly.spring.viewcomponent.core.component.ViewComponent") +@SupportedSourceVersion(SourceVersion.RELEASE_17) +class ViewComponentProcessor : AbstractProcessor() { + + override fun process(annotations: Set, roundEnv: RoundEnvironment): Boolean { + + for (annotation in annotations) { + for (element in roundEnv.getElementsAnnotatedWith(annotation)) { + val messager = processingEnv.messager + val (rootDir, buildType) = processingEnv.getRootDirAndBuildType() + + val separator = FileSystems.getDefault().separator + val packagePath = "${element.enclosingElement}".replace(".", separator) + val srcDir = getSrcDir(rootDir, messager) + val viewComponentDir = FileSystems.getDefault().getPath(srcDir.toString(), packagePath) + messager.printMessage(Diagnostic.Kind.NOTE, "SrcDirPath: " + viewComponentDir.absolutePathString()) + + val srcHtmlFile = getSrcHtmlFile(viewComponentDir, element.simpleName, messager) + val methodList = getViewActionMethods(element) + + val viewComponentName = element.simpleName.toString().lowercase() + verifyRenderMethodExists(element, messager) + + val viewComponentParser = ViewComponentParser( + srcHtmlFile, + buildType = buildType, + methodList = methodList, + viewComponentName = viewComponentName, + messager = messager, + ) + viewComponentParser.parseFile() + } + } + return true + } + + + private fun getSrcDir(rootDir: String, messager: Messager?): Path { + val mainPath = FileSystems.getDefault() + .getPath(rootDir, "src", "main") + if (mainPath.resolve("kotlin").exists()) { + return mainPath.resolve("kotlin") + } + if (mainPath.resolve("java").exists()) { + return mainPath.resolve("java") + } + messager?.printMessage(Diagnostic.Kind.ERROR, "No src main found") + throw ViewComponentProcessingException("$mainPath/src/main/[java,kotlin] not found", null) + } + + private fun ProcessingEnvironment.getJavaRootDir(): String { + try { + val sourceFile = this.filer.createClassFile("gen_${Date().toInstant().toEpochMilli()}.java") + val srcDirPath = Paths.get(sourceFile.toUri()).toString() + return srcDirPath + } catch (e: IOException) { + processingEnv.messager.printMessage(Diagnostic.Kind.WARNING, "Unable to determine source file path!") + } + this.messager.printMessage(Diagnostic.Kind.ERROR, "Could not get create class file") + throw ViewComponentProcessingException("Could not get create class file", null) + } + + private fun ProcessingEnvironment.getKotlinRootDir(): String? { + this.options["kapt.kotlin.generated"]?.let { filePath -> + return filePath + } + return null + } + + private fun ProcessingEnvironment.getRootDirAndBuildType(): Pair { + val filePath = this.getKotlinRootDir() ?: this.getJavaRootDir() + if (filePath.contains("target")) { + return filePath.split("target")[0] to BuildType.MAVEN + } + if (filePath.contains("build")) { + return filePath.split("build")[0] to BuildType.GRADLE + } + this.messager.printMessage(Diagnostic.Kind.ERROR, "No build or target folder found") + throw ViewComponentProcessingException("No build or target folder found", null) + + } + + private fun verifyRenderMethodExists(element: Element, messager: Messager) { + val renderReturnType = element.enclosedElements.filter { it.kind == ElementKind.METHOD } + .find { it.simpleName.toString() == "render" } + ?.asType() + ?: let { + messager.printMessage( + Diagnostic.Kind.ERROR, + "You need to define a render method in the $element that returns a ViewContext" + ) + throw ViewComponentProcessingException( + "You need to define a render method in the $element that returns a ViewContext", + null + ) + } + +// if (!renderReturnType.toString().contains("ViewContext")) { +// messager.printMessage( +// Diagnostic.Kind.ERROR, +// "Your render method in the $element needs to return a ViewContext" +// ) +// throw ViewComponentProcessingException( +// "Your render method in the $element needs to return a ViewContext", +// null +// ) +// } + } + + private fun getSrcHtmlFile(srcDirPath: Path, viewComponentName: Name, messager: Messager): File { + val fileEndings = listOf(".html", ".jte", ".kte", ".th") + fileEndings.forEach { fileEnding -> + val file = srcDirPath.absolute().resolve("$viewComponentName$fileEnding").toFile() + if (file.exists()) { + messager.printMessage(Diagnostic.Kind.NOTE, "Found file at ${file.path}") + return file + } + messager.printMessage(Diagnostic.Kind.NOTE, "Didn't find file at ${file.path}") + } + messager.printMessage( + Diagnostic.Kind.ERROR, + "Couldn't find a file at $srcDirPath" + ) + throw ViewComponentProcessingException("Couldn't find a file at $srcDirPath", null) + } + + private fun getViewActionMethods(element: Element): List { + val methodList = element.enclosedElements.filter { it.kind == ElementKind.METHOD }.mapNotNull { method -> + if (method.getAnnotation(GetViewAction::class.java) != null) { + val get = (method.getAnnotation(GetViewAction::class.java) as GetViewAction) + return@mapNotNull ViewActionMethod(method.simpleName.toString(), get.path, GetViewAction::class.java) + } + if (method.getAnnotation(PostViewAction::class.java) != null) { + val get = (method.getAnnotation(PostViewAction::class.java) as PostViewAction) + return@mapNotNull ViewActionMethod(method.simpleName.toString(), get.path, PostViewAction::class.java) + } + if (method.getAnnotation(PutViewAction::class.java) != null) { + val get = (method.getAnnotation(PutViewAction::class.java) as PutViewAction) + return@mapNotNull ViewActionMethod(method.simpleName.toString(), get.path, PutViewAction::class.java) + } + if (method.getAnnotation(PatchViewAction::class.java) != null) { + val get = (method.getAnnotation(PatchViewAction::class.java) as PatchViewAction) + return@mapNotNull ViewActionMethod(method.simpleName.toString(), get.path, PatchViewAction::class.java) + } + if (method.getAnnotation(DeleteViewAction::class.java) != null) { + val get = (method.getAnnotation(DeleteViewAction::class.java) as DeleteViewAction) + return@mapNotNull ViewActionMethod(method.simpleName.toString(), get.path, DeleteViewAction::class.java) + } + return@mapNotNull null + } + return methodList + } + + +} diff --git a/core/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/core/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000..0effe98 --- /dev/null +++ b/core/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +de.tschuehly.spring.viewcomponent.core.processor.ViewComponentProcessor \ No newline at end of file diff --git a/core/src/test/resources/fixtures/parsed/ViewActionHtmlStructure.html b/core/src/test/resources/fixtures/parsed/ViewActionHtmlStructure.html new file mode 100644 index 0000000..fc9861a --- /dev/null +++ b/core/src/test/resources/fixtures/parsed/ViewActionHtmlStructure.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/core/src/test/resources/fixtures/parsed/nestedViewComponent.html b/core/src/test/resources/fixtures/parsed/nestedViewComponent.html new file mode 100644 index 0000000..17f3fbc --- /dev/null +++ b/core/src/test/resources/fixtures/parsed/nestedViewComponent.html @@ -0,0 +1,31 @@ + + + + + +
+ +

ViewAction Get CountUp

+ + +

0

+ +

ViewAction Post AddItem

+
+ + +
+ + + + + +
ItemAction
+
+ +
+ This is a footer +
+ \ No newline at end of file diff --git a/core/src/test/resources/fixtures/unparsed/ViewActionHtmlStructure.html b/core/src/test/resources/fixtures/unparsed/ViewActionHtmlStructure.html new file mode 100644 index 0000000..7c52f53 --- /dev/null +++ b/core/src/test/resources/fixtures/unparsed/ViewActionHtmlStructure.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/core/src/test/resources/fixtures/unparsed/nestedViewComponent.html b/core/src/test/resources/fixtures/unparsed/nestedViewComponent.html new file mode 100644 index 0000000..17f3fbc --- /dev/null +++ b/core/src/test/resources/fixtures/unparsed/nestedViewComponent.html @@ -0,0 +1,31 @@ + + + + + +
+ +

ViewAction Get CountUp

+ + +

0

+ +

ViewAction Post AddItem

+
+ + +
+ + + + + +
ItemAction
+
+ +
+ This is a footer +
+ \ No newline at end of file diff --git a/examples/jte-demo/settings.gradle.kts b/examples/jte-demo/settings.gradle.kts deleted file mode 100644 index bee95e4..0000000 --- a/examples/jte-demo/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -rootProject.name = "jte-demo" - -//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(":")) -// } -//} \ No newline at end of file diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt deleted file mode 100644 index 59b49f8..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt +++ /dev/null @@ -1,8 +0,0 @@ -package de.tschuehly.jteviewcomponentdemo.core - -import org.springframework.stereotype.Service - -@Service -class ExampleService { - fun getSomeData() = "Hey everyone JTE Templating works!" -} \ No newline at end of file diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/Router.kt b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/Router.kt deleted file mode 100644 index 7932180..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/Router.kt +++ /dev/null @@ -1,17 +0,0 @@ -package de.tschuehly.jteviewcomponentdemo.web - -import de.tschuehly.jteviewcomponentdemo.web.index.IndexViewComponent -import de.tschuehly.spring.viewcomponent.jte.ViewContext -import org.springframework.stereotype.Controller -import org.springframework.web.bind.annotation.GetMapping - -@Controller -class Router( - private val indexViewComponent: IndexViewComponent -) { - @GetMapping("/") - fun index(): ViewContext { - return indexViewComponent.render() - } - -} diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.jte b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.jte deleted file mode 100644 index 8601fe4..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.jte +++ /dev/null @@ -1,8 +0,0 @@ -@param de.tschuehly.jteviewcomponentdemo.core.ExampleService exampleService - -@param String helloWorld - -

Nested ExampleViewComponent

- - ${exampleService.getSomeData()} - \ No newline at end of file diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.kt b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.kt deleted file mode 100644 index 7290a2d..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/example/ExampleViewComponent.kt +++ /dev/null @@ -1,15 +0,0 @@ -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.toProperty -import de.tschuehly.spring.viewcomponent.jte.ViewContext - -@ViewComponent -class ExampleViewComponent( - private val exampleService: ExampleService -) { - fun render() = ViewContext( - "exampleService" toProperty exampleService - ) -} \ No newline at end of file diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte deleted file mode 100644 index 1db7f6b..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte +++ /dev/null @@ -1,19 +0,0 @@ -@import de.tschuehly.jteviewcomponentdemo.web.example.ExampleViewComponent -@import de.tschuehly.jteviewcomponentdemo.web.index.IndexViewComponent -@import de.tschuehly.spring.viewcomponent.jte.ViewContext - - -@param IndexViewComponent.ExampleFormDTO exampleFormDTO -@param ExampleViewComponent exampleViewComponent -@param ViewContext parameterViewComponent - - - -

Index ViewComponent

- -

Say hello to ${exampleFormDTO.getExampleProp()}

- - -${exampleViewComponent.render()} -
-${parameterViewComponent} \ No newline at end of file diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt deleted file mode 100644 index 75556c4..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt +++ /dev/null @@ -1,25 +0,0 @@ -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.toProperty -import de.tschuehly.spring.viewcomponent.jte.ViewContext - -@ViewComponent -class IndexViewComponent( - private val exampleViewComponent: ExampleViewComponent, - private val parameterViewComponent: ParameterViewComponent -) { - - fun render() = ViewContext( - "exampleFormDTO" toProperty ExampleFormDTO("Spring ViewComponent"), - "exampleViewComponent" toProperty exampleViewComponent, - "parameterViewComponent" toProperty parameterViewComponent.render("Hello World") - ) - - class ExampleFormDTO( - val exampleProp: String - ) { - } -} \ No newline at end of file diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.jte b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.jte deleted file mode 100644 index 68656e3..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.jte +++ /dev/null @@ -1,4 +0,0 @@ -@param String parameter1 - -ParameterViewComponent -${parameter1} diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.kt b/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.kt deleted file mode 100644 index 535abe3..0000000 --- a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/para/ParameterViewComponent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package de.tschuehly.jteviewcomponentdemo.web.para - -import de.tschuehly.spring.viewcomponent.core.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.jte.ViewContext - -@ViewComponent -class ParameterViewComponent { - fun render(parameter1: String) = ViewContext( - "parameter1" toProperty parameter1 - ) -} \ No newline at end of file diff --git a/examples/jte-demo/src/main/resources/application.yaml b/examples/jte-demo/src/main/resources/application.yaml deleted file mode 100644 index fa57868..0000000 --- a/examples/jte-demo/src/main/resources/application.yaml +++ /dev/null @@ -1,6 +0,0 @@ -gg.jte.templateLocation: src/main/kotlin -logging: - level: - org.springframework.web: TRACE -server: - port: 8081 \ No newline at end of file diff --git a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/JteTestApplication.kt b/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/JteTestApplication.kt deleted file mode 100644 index b66e0ea..0000000 --- a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/JteTestApplication.kt +++ /dev/null @@ -1,16 +0,0 @@ -package de.tschuehly.jteviewcomponentdemo.application - -import de.tschuehly.spring.viewcomponent.core.ViewComponentAutoConfiguration -import gg.jte.springframework.boot.autoconfigure.JteAutoConfiguration -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication -import org.springframework.context.annotation.Import - -@SpringBootApplication -@Import(ViewComponentAutoConfiguration::class, JteAutoConfiguration::class) -class JteTestApplication - -fun main(args: Array) { - runApplication(*args) -} - diff --git a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/Router.kt b/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/Router.kt deleted file mode 100644 index 3f7ea51..0000000 --- a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/Router.kt +++ /dev/null @@ -1,17 +0,0 @@ -package de.tschuehly.jteviewcomponentdemo.application.web - -import de.tschuehly.jteviewcomponentdemo.application.web.index.IndexTestViewComponent -import de.tschuehly.spring.viewcomponent.jte.ViewContext -import org.springframework.stereotype.Controller -import org.springframework.web.bind.annotation.GetMapping - -@Controller -class Router( - private val indexTestViewComponent: IndexTestViewComponent -) { - @GetMapping("/") - fun index(): ViewContext { - return indexTestViewComponent.render() - } - -} diff --git a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.jte b/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.jte deleted file mode 100644 index 4d3fa72..0000000 --- a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.jte +++ /dev/null @@ -1,13 +0,0 @@ -@import de.tschuehly.jteviewcomponentdemo.web.example.ExampleViewComponent -@import de.tschuehly.jteviewcomponentdemo.web.index.IndexViewComponent -@import de.tschuehly.spring.viewcomponent.jte.ViewContext - - -@param String test - - - -

Index ViewComponent

- -

${test}

- diff --git a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.kt b/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.kt deleted file mode 100644 index 3ed66f9..0000000 --- a/examples/jte-demo/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/application/web/index/IndexTestViewComponent.kt +++ /dev/null @@ -1,15 +0,0 @@ -package de.tschuehly.jteviewcomponentdemo.application.web.index - -import de.tschuehly.spring.viewcomponent.core.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.jte.ViewContext - -@ViewComponent -class IndexTestViewComponent( -) { - - fun render() = ViewContext( - "test" toProperty "Hello World" - ) - -} \ No newline at end of file diff --git a/examples/jte-demo/src/test/resources/application.yaml b/examples/jte-demo/src/test/resources/application.yaml deleted file mode 100644 index 1163b96..0000000 --- a/examples/jte-demo/src/test/resources/application.yaml +++ /dev/null @@ -1,3 +0,0 @@ -server: - port: 8083 -gg.jte.templateLocation: src/test/kotlin \ No newline at end of file diff --git a/examples/jte-demo/.gitignore b/examples/jte-example/.gitignore similarity index 100% rename from examples/jte-demo/.gitignore rename to examples/jte-example/.gitignore diff --git a/examples/jte-demo/build.gradle.kts b/examples/jte-example/build.gradle.kts similarity index 69% rename from examples/jte-demo/build.gradle.kts rename to examples/jte-example/build.gradle.kts index 54e6438..af4757c 100644 --- a/examples/jte-demo/build.gradle.kts +++ b/examples/jte-example/build.gradle.kts @@ -1,10 +1,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "3.0.6" - id("io.spring.dependency-management") version "1.1.0" - kotlin("jvm") version "1.7.22" - kotlin("plugin.spring") version "1.7.22" + id("org.springframework.boot") version "3.1.2" + id("io.spring.dependency-management") version "1.1.2" + kotlin("jvm") version "1.8.21" + kotlin("plugin.spring") version "1.8.21" + kotlin("kapt") version "1.8.21" + id("gg.jte.gradle") version("3.0.2") } group = "de.tschuehly" @@ -16,15 +18,19 @@ repositories { maven("https://jitpack.io") } +jte { + precompile() +} dependencies { - implementation("de.tschuehly:spring-view-component-jte:0.6.0") -// implementation("de.tschuehly:spring-view-component-jte") + implementation("de.tschuehly:spring-view-component-jte:0.6.2-SNAPSHOT") +// kapt("de.tschuehly:spring-view-component-core:0.6.2-SNAPSHOT") implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-devtools") + implementation("gg.jte:jte:3.0.0") implementation("org.jetbrains.kotlin:kotlin-reflect") testImplementation("org.springframework.boot:spring-boot-starter-test") } @@ -39,7 +45,6 @@ tasks.withType { tasks.withType { useJUnitPlatform() } - sourceSets { main { resources { @@ -53,4 +58,4 @@ sourceSets { exclude("**/*.kt") } } -} \ No newline at end of file +} diff --git a/examples/jte-demo/gradle/wrapper/gradle-wrapper.jar b/examples/jte-example/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/jte-demo/gradle/wrapper/gradle-wrapper.jar rename to examples/jte-example/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/jte-demo/gradle/wrapper/gradle-wrapper.properties b/examples/jte-example/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/jte-demo/gradle/wrapper/gradle-wrapper.properties rename to examples/jte-example/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/jte-demo/gradlew b/examples/jte-example/gradlew similarity index 100% rename from examples/jte-demo/gradlew rename to examples/jte-example/gradlew diff --git a/examples/jte-demo/gradlew.bat b/examples/jte-example/gradlew.bat similarity index 100% rename from examples/jte-demo/gradlew.bat rename to examples/jte-example/gradlew.bat diff --git a/examples/jte-example/settings.gradle.kts b/examples/jte-example/settings.gradle.kts new file mode 100644 index 0000000..2a20424 --- /dev/null +++ b/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(":")) + } +} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.jte b/examples/jte-example/src/main/jte/ActionViewComponent.jte similarity index 93% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.jte rename to examples/jte-example/src/main/jte/ActionViewComponent.jte index f221c7b..9b34ab1 100644 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.jte +++ b/examples/jte-example/src/main/jte/ActionViewComponent.jte @@ -1,4 +1,4 @@ -@param de.tschuehly.spring.viewcomponent.jte.application.web.action.ActionViewComponent.Person person +@param de.tschuehly.jteviewcomponentdemo.web.action.ActionViewComponent.Person person @param java.util.HashMap itemList @param Integer counter diff --git a/examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/JteViewComponentDemoApplication.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/JteViewComponentDemoApplication.kt similarity index 100% rename from examples/jte-demo/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/JteViewComponentDemoApplication.kt rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/JteViewComponentDemoApplication.kt diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt similarity index 61% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt index a02ddb3..37872a9 100644 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/core/ExampleService.kt @@ -1,4 +1,4 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.core +package de.tschuehly.jteviewcomponentdemo.core import org.springframework.stereotype.Service import java.util.NoSuchElementException @@ -6,19 +6,19 @@ import java.util.NoSuchElementException @Service class ExampleService { var dataIndex = 0 - val someData = mutableMapOf() + val itemList = mutableMapOf() 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") } diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/TestController.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/TestController.kt similarity index 53% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/TestController.kt rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/TestController.kt index 4bb0e3c..ef4cc08 100644 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/TestController.kt +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/TestController.kt @@ -1,11 +1,9 @@ -package de.tschuehly.spring.viewcomponent.jte.application.web - -import de.tschuehly.spring.viewcomponent.core.component.ViewContextContainer -import de.tschuehly.spring.viewcomponent.jte.application.web.action.ActionViewComponent -import de.tschuehly.spring.viewcomponent.jte.application.web.header.HeaderViewComponent -import de.tschuehly.spring.viewcomponent.jte.application.web.index.IndexViewComponent -import de.tschuehly.spring.viewcomponent.jte.application.web.layout.LayoutViewComponent -import de.tschuehly.spring.viewcomponent.jte.application.web.simple.SimpleViewComponent +package de.tschuehly.jteviewcomponentdemo.web + +import de.tschuehly.jteviewcomponentdemo.web.action.ActionViewComponent +import de.tschuehly.jteviewcomponentdemo.web.index.IndexViewComponent +import de.tschuehly.jteviewcomponentdemo.web.layout.LayoutViewComponent +import de.tschuehly.jteviewcomponentdemo.web.simple.SimpleViewComponent import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.ModelAttribute @@ -15,31 +13,27 @@ class TestController( private val simpleViewComponent: SimpleViewComponent, private val indexViewComponent: IndexViewComponent, private val layoutViewComponent: LayoutViewComponent, - private val headerViewComponent: HeaderViewComponent, private val actionViewComponent: ActionViewComponent ) { @GetMapping("/") fun indexComponent() = indexViewComponent.render() + @GetMapping("/simple") + fun simpleComponent() = simpleViewComponent.render() + + @GetMapping("/layout") + fun layoutComponent() = layoutViewComponent.render(simpleViewComponent.render()) + @GetMapping("/action") fun actionComponent() = actionViewComponent.render() @GetMapping("/nested-action") fun nestedActionComponent() = layoutViewComponent.render(actionViewComponent.render()) - @GetMapping("/simple") - fun simpleComponent() = simpleViewComponent.render() - - @GetMapping("/layout") - fun layoutComponent() = layoutViewComponent.render(simpleViewComponent.render()) - - @GetMapping("/header") - fun header(): String { - return "test" + @GetMapping("/resource-template") + fun templateTest(): String { + return "template-test" } - - @ModelAttribute("header") - fun headerComponent() = headerViewComponent.render("TestTitle") } \ No newline at end of file diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte new file mode 100644 index 0000000..9b34ab1 --- /dev/null +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte @@ -0,0 +1,50 @@ +@param de.tschuehly.jteviewcomponentdemo.web.action.ActionViewComponent.Person person +@param java.util.HashMap itemList +@param Integer counter + +
+ +

ViewAction Get CountUp

+ + +

${counter}

+ + +

ViewAction Post AddItem

+
+ + +
+ + + + + + @for(var item: itemList.entrySet()) + + + + + @endfor +
ItemAction
+ ${item.getValue()} + + +
+ +

ViewAction Put/Patch Person Form

+ +
+ + + + + +
+
\ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt similarity index 58% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt index db7a54f..09cb8ba 100644 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt @@ -1,26 +1,22 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.action +package de.tschuehly.jteviewcomponentdemo.web.action -import de.tschuehly.spring.viewcomponent.core.* +import de.tschuehly.jteviewcomponentdemo.core.ExampleService +import de.tschuehly.spring.viewcomponent.core.IViewContext import de.tschuehly.spring.viewcomponent.core.action.* import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext -import de.tschuehly.spring.viewcomponent.thymeleaf.application.core.ExampleService @ViewComponent class ActionViewComponent( val exampleService: ExampleService ) { + data class ActionView(val itemList: MutableMap, val counter: Int, val person: Person) : IViewContext - fun render() = ViewContext( - "itemList" toProperty exampleService.someData, - "counter" toProperty counter, - "person" toProperty person - ) + fun render() = ActionView(exampleService.itemList, counter, person) var counter: Int = 0 @GetViewAction("/customPath/countUp") - fun countUp(): ViewContext{ + fun countUp(): IViewContext { counter += 1 return render() } @@ -29,15 +25,16 @@ class ActionViewComponent( class ActionFormDTO( val item: String ) + @PostViewAction - fun addItem(actionFormDTO: ActionFormDTO): ViewContext { + fun addItem(actionFormDTO: ActionFormDTO): IViewContext { exampleService.addItemToList(actionFormDTO.item) return render() } @DeleteViewAction - fun deleteItem(id: Int): ViewContext{ + fun deleteItem(id: Int): IViewContext { exampleService.deleteItem(id) return render() } @@ -48,15 +45,17 @@ class ActionViewComponent( ) @PatchViewAction - fun savePersonPatch(person: Person): ViewContext { + fun savePersonPatch(person: Person): IViewContext { this.person = person return render() } + @PutViewAction - fun savePersonPut(person: Person): ViewContext { + fun savePersonPut(person: Person): IViewContext { this.person = person return render() } + class Person( val name: String, val age: Int, diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/index/IndexViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte similarity index 100% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/index/IndexViewComponent.jte rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt new file mode 100644 index 0000000..eaffc5d --- /dev/null +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt @@ -0,0 +1,8 @@ +package de.tschuehly.jteviewcomponentdemo.web.index + +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent + +@ViewComponent +class IndexViewComponent { + fun render() = de.tschuehly.spring.viewcomponent.core.EmptyViewContext() +} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte similarity index 99% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.jte rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte index 9e9a1f5..d30b716 100644 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.jte +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte @@ -1,5 +1,4 @@ @import de.tschuehly.spring.viewcomponent.jte.ViewContext - @param ViewContext nestedViewComponent diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt new file mode 100644 index 0000000..ecc1ab6 --- /dev/null +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt @@ -0,0 +1,12 @@ +package de.tschuehly.jteviewcomponentdemo.web.layout + +import de.tschuehly.spring.viewcomponent.core.IViewContext +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent + +@ViewComponent +class LayoutViewComponent { + data class LayoutView(val nestedViewComponent: IViewContext) : IViewContext + + fun render(nestedViewComponent: IViewContext) = LayoutView(nestedViewComponent) + +} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/simple/SimpleViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.jte similarity index 100% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/simple/SimpleViewComponent.jte rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.jte diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/simple/SimpleViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt similarity index 50% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/simple/SimpleViewComponent.kt rename to examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt index 48c8cd9..1a535a9 100644 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/simple/SimpleViewComponent.kt +++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt @@ -1,21 +1,24 @@ -package de.tschuehly.spring.viewcomponent.jte.application.web.simple +package de.tschuehly.jteviewcomponentdemo.web.simple +import de.tschuehly.jteviewcomponentdemo.core.ExampleService +import de.tschuehly.spring.viewcomponent.core.IViewContext import de.tschuehly.spring.viewcomponent.core.action.PostViewAction import de.tschuehly.spring.viewcomponent.core.component.ViewComponent import de.tschuehly.spring.viewcomponent.core.toProperty import de.tschuehly.spring.viewcomponent.jte.ViewContext -import de.tschuehly.spring.viewcomponent.jte.application.core.ExampleService @ViewComponent class SimpleViewComponent( val exampleService: ExampleService ) { - fun render() = ViewContext( - "helloWorld" toProperty exampleService.getHelloWorld() - ) + fun render(): IViewContext { + return HelloWorldView(exampleService.getHelloWorld()) + } + + data class HelloWorldView(val helloWorld: String) : IViewContext @PostViewAction - fun testAction(): ViewContext { + fun testAction(): IViewContext { return render() } } \ No newline at end of file diff --git a/examples/jte-example/src/main/resources/application.yaml b/examples/jte-example/src/main/resources/application.yaml new file mode 100644 index 0000000..6810b35 --- /dev/null +++ b/examples/jte-example/src/main/resources/application.yaml @@ -0,0 +1,7 @@ +spring.view-component.local-development: false +gg.jte.templateLocation: examples/jte-example/src/main/kotlin +logging: + level: + org.springframework.web: TRACE +server: + port: 8081 \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/JteTest.kt b/examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt similarity index 96% rename from jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/JteTest.kt rename to examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt index 1d0f70b..198a09f 100644 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/JteTest.kt +++ b/examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt @@ -1,7 +1,6 @@ -package de.tschuehly.spring.viewcomponent.jte +package de.tschuehly.jteviewcomponentdemo -import de.tschuehly.spring.viewcomponent.jte.application.JteTestApplication import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test @@ -14,11 +13,10 @@ import org.springframework.http.ResponseEntity @SpringBootTest( - classes = [JteTestApplication::class], webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT ) @Disabled -class JteTest( +class JteIntegrationTest( @Autowired val testRestTemplate: TestRestTemplate ) { @Test diff --git a/jte/src/test/resources/application.yaml b/examples/jte-example/src/test/resources/application.yaml similarity index 100% rename from jte/src/test/resources/application.yaml rename to examples/jte-example/src/test/resources/application.yaml diff --git a/jte/src/test/resources/static/favicon.ico b/examples/jte-example/src/test/resources/static/favicon.ico similarity index 100% rename from jte/src/test/resources/static/favicon.ico rename to examples/jte-example/src/test/resources/static/favicon.ico diff --git a/examples/thymeleaf-example/settings.gradle.kts b/examples/thymeleaf-example/settings.gradle.kts deleted file mode 100644 index e19fb31..0000000 --- a/examples/thymeleaf-example/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "thymeleaf-example" \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt b/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt deleted file mode 100644 index 8653ef8..0000000 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt +++ /dev/null @@ -1,43 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web - -import de.tschuehly.spring.viewcomponent.core.component.ViewContextContainer -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.action.ActionViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.header.HeaderViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index.IndexViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout.LayoutViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.simple.SimpleViewComponent -import org.springframework.stereotype.Controller -import org.springframework.web.bind.annotation.GetMapping -import org.springframework.web.bind.annotation.ModelAttribute - -@Controller -class TestController( - private val simpleViewComponent: SimpleViewComponent, - private val indexViewComponent: IndexViewComponent, - private val layoutViewComponent: LayoutViewComponent, - private val headerViewComponent: HeaderViewComponent, - private val actionViewComponent: ActionViewComponent -) { - @GetMapping("/") - fun indexComponent() = indexViewComponent.render() - - @GetMapping("/action") - fun actionComponent() = actionViewComponent.render() - - @GetMapping("/nested-action") - fun nestedActionComponent() = layoutViewComponent.render(actionViewComponent.render()) - - @GetMapping("/simple") - fun simpleComponent() = simpleViewComponent.render() - - - @GetMapping("/layout") - fun layoutComponent() = layoutViewComponent.render(simpleViewComponent.render()) - - @GetMapping("/multi") - fun multiComponent() = - ViewContextContainer(simpleViewComponent.render(), layoutViewComponent.render(simpleViewComponent.render())) - - @ModelAttribute("header") - fun headerComponent() = headerViewComponent.render("TestTitle") -} \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html b/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html deleted file mode 100644 index 598e7f9..0000000 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt b/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt deleted file mode 100644 index 5e69669..0000000 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt +++ /dev/null @@ -1,13 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.header - - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext - -@ViewComponent -class HeaderViewComponent{ - fun render(title: String) = ViewContext( - "title" toProperty title - ) -} \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt b/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt deleted file mode 100644 index 4c5b977..0000000 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext - -@ViewComponent -class LayoutViewComponent { - fun render(nestedViewComponent: ViewContext) = ViewContext( - "nestedViewComponent" toProperty nestedViewComponent - ) -} \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt b/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt deleted file mode 100644 index 6291d85..0000000 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt +++ /dev/null @@ -1,21 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.simple - -import de.tschuehly.spring.viewcomponent.core.action.PostViewAction -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext -import de.tschuehly.spring.viewcomponent.thymeleaf.application.core.ExampleService - -@ViewComponent -class SimpleViewComponent( - val exampleService: ExampleService -) { - fun render() = ViewContext( - "helloWorld" toProperty exampleService.getHelloWorld() - ) - - @PostViewAction - fun testAction(): ViewContext { - return render() - } -} \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/resources/application.properties b/examples/thymeleaf-example/src/main/resources/application.properties deleted file mode 100644 index 676437e..0000000 --- a/examples/thymeleaf-example/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.view-component.view-action.enabled=true \ No newline at end of file diff --git a/examples/thymeleaf-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt b/examples/thymeleaf-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt deleted file mode 100644 index f0dd5cd..0000000 --- a/examples/thymeleaf-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt +++ /dev/null @@ -1,88 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf - -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.web.client.TestRestTemplate -import org.springframework.http.HttpMethod -import org.springframework.http.HttpStatus -import org.springframework.http.ResponseEntity -import org.springframework.util.Assert -import org.springframework.util.StringUtils - - -@SpringBootTest( - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT -) -class IntegrationTest( - @Autowired val testRestTemplate: TestRestTemplate -) { - @Test - fun testIndexComponent() { - val expectedHtml = - """

This is the IndexViewComponent

IndexViewComponent
SimpleViewComponent
LayoutViewComponent
ActionViewComponent
NestedActionViewComponent





""" - assertEndpointReturns("/", expectedHtml) - } - - @Test - fun testSimpleComponent() { - val expectedHtml = """

This is the SimpleViewComponent

Hello World
""" - assertEndpointReturns("/simple", expectedHtml) - } - - @Test - fun testActionComponent() { - assertEndpointReturns( - "/action", - """

ViewAction Get CountUp

0

ViewAction Post AddItem

ItemAction

ViewAction Put/Patch Person Form

""" - ) - } - - @Test - fun testNestedActionComponent() { - val expectedHtml = - """

ViewAction Get CountUp

0

ViewAction Post AddItem

ItemAction

ViewAction Put/Patch Person Form

This is a footer
""" - assertEndpointReturns("/nested-action", expectedHtml) - } - - @Test - fun testLayoutComponent() { - val expectedHtml = - """

This is the SimpleViewComponent

Hello World
This is a footer
""" - assertEndpointReturns("/layout", expectedHtml) - } - - @Test - fun testMultiComponent() { - val expectedHtml = - """

This is the SimpleViewComponent

Hello World

This is the SimpleViewComponent

Hello World
This is a footer
""" - assertEndpointReturns("/multi", expectedHtml) - - } - - fun assertEndpointReturns(url: String, expectedHtml: String) { - val response: ResponseEntity = this.testRestTemplate - .exchange(url, HttpMethod.GET, null, String::class.java) - assertThat(response.statusCode) - .isEqualTo(HttpStatus.OK) - Assertions.assertEquals( - expectedHtml,response.body?.rmWhitespaceBetweenHtmlTags() - ) - } - - fun String.rmWhitespaceBetweenHtmlTags(): String { - // Replace whitespace between > and word - return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(), "").run { - // Replace whitespace between word and < - this.replace("(?<=\\w)(\\s*)(?=<)".toRegex(), "") - }.run { - // Replace whitespace between > and < - this.replace("(?<=>)(\\s*)(?=<)".toRegex(), "") - } - } - - fun String.rmWhite() = StringUtils.trimAllWhitespace(this) - -} \ No newline at end of file diff --git a/examples/thymeleaf-java-example/.gitignore b/examples/thymeleaf-java-example/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/examples/thymeleaf-java-example/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.jar b/examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..cb28b0e37c7d206feb564310fdeec0927af4123a GIT binary patch literal 62547 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 A?*IS* literal 0 HcmV?d00001 diff --git a/examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.properties b/examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..2e76e18 --- /dev/null +++ b/examples/thymeleaf-java-example/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/examples/thymeleaf-java-example/mvnw b/examples/thymeleaf-java-example/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/examples/thymeleaf-java-example/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/examples/thymeleaf-java-example/mvnw.cmd b/examples/thymeleaf-java-example/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/examples/thymeleaf-java-example/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/examples/thymeleaf-java-example/pom.xml b/examples/thymeleaf-java-example/pom.xml new file mode 100644 index 0000000..bbd9a7e --- /dev/null +++ b/examples/thymeleaf-java-example/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.1.3 + + + de.tschuehly + spring.viewcomponent.thymeleaf + 0.0.1-SNAPSHOT + thymeleaf-java-example + Thymeleaf Java Example + + 17 + 0.6.2-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-web + + + + de.tschuehly + spring-view-component-thymeleaf + ${de.tschuehly.version} + + + de.tschuehly + spring-view-component-core + ${de.tschuehly.version} + + + org.webjars.npm + htmx.org + 1.6.1 + + + org.webjars + webjars-locator-core + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + de.tschuehly + spring-view-component-core + ${de.tschuehly.version} + + + + + + + + diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaExampleApplication.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaExampleApplication.java new file mode 100644 index 0000000..be4db9a --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaExampleApplication.java @@ -0,0 +1,13 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ThymeleafJavaExampleApplication { + + public static void main(String[] args) { + SpringApplication.run(ThymeleafJavaExampleApplication.class, args); + } + +} diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.java new file mode 100644 index 0000000..9c6fbca --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.java @@ -0,0 +1,29 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.core; + +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.NoSuchElementException; + +@Service +public class ExampleService { + Integer dataIndex = 0; + public HashMap itemList = new HashMap<>(); + + public String getHelloWorld() { + return "Hello World"; + } + + public void addItemToList(String item) { + itemList.put(dataIndex, item); + dataIndex += 1; + } + + public void deleteItem(Integer id) { + if (itemList.get(id) == null) { + throw new NoSuchElementException("No Element with Id: " + id + " found"); + } + itemList.remove(id); + } + +} diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.java new file mode 100644 index 0000000..5605154 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.java @@ -0,0 +1,61 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.web; + +import de.tschuehly.spring.viewcomponent.core.IViewContext; +import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.action.ActionViewComponent; +import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index.IndexViewComponent; +import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout.LayoutViewComponent; +import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.simple.SimpleViewComponent; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class TestController { + private final SimpleViewComponent simpleViewComponent; + private final IndexViewComponent indexViewComponent; + private final ActionViewComponent actionViewComponent; + private final LayoutViewComponent layoutViewComponent; + + + public TestController( + SimpleViewComponent simpleViewComponent, + IndexViewComponent indexViewComponent, + ActionViewComponent actionViewComponent, + LayoutViewComponent layoutViewComponent + ) { + this.simpleViewComponent = simpleViewComponent; + this.indexViewComponent = indexViewComponent; + this.actionViewComponent = actionViewComponent; + this.layoutViewComponent = layoutViewComponent; + } + + @GetMapping("/") + IViewContext indexComponent() { + return indexViewComponent.render(); + } + + @GetMapping("/simple") + IViewContext simple() { + return simpleViewComponent.render(); + } + + @GetMapping("/layout") + IViewContext layoutComponent() { + return layoutViewComponent.render(simpleViewComponent.render()); + } + + @GetMapping("/action") + IViewContext actionComponent() { + return actionViewComponent.render(); + } + + @GetMapping("/nested-action") + IViewContext nestedActionComponent() { + return layoutViewComponent.render(actionViewComponent.render()); + } + + + @GetMapping("/resource-template") + String templateTest() { + return "template-test"; + } +} diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html new file mode 100644 index 0000000..4c8fcb3 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html @@ -0,0 +1,49 @@ + + + + + + +

ViewAction Get CountUp

+ + +

+ +

ViewAction Post AddItem

+
+ + +
+ + + + + + + + + +
ItemAction
+ + + +
+ +

ViewAction Put/Patch Person Form

+ +
+ + + + + +
+ + \ No newline at end of file diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.java new file mode 100644 index 0000000..7218cf8 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.java @@ -0,0 +1,76 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.action; + +import de.tschuehly.spring.viewcomponent.core.IViewContext; +import de.tschuehly.spring.viewcomponent.core.action.*; +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent; +import de.tschuehly.spring.viewcomponent.thymeleaf.application.core.ExampleService; + +import java.util.Map; + +@ViewComponent +public class ActionViewComponent { + private final ExampleService exampleService; + + public ActionViewComponent(ExampleService exampleService) { + this.exampleService = exampleService; + } + + private record ActionView(Integer counter, Map itemList, Person person) implements IViewContext { } + + Integer counter = 0; + + public IViewContext render() { + return new ActionView(counter, exampleService.itemList, person); + } + + @GetViewAction(path = "/customPath/countUp") + public IViewContext countUp() { + counter += 1; + return render(); + } + + + record ActionFormDTO( + String item + ) { + } + + @PostViewAction + public IViewContext addItem(ActionFormDTO actionFormDTO) { + exampleService.addItemToList(actionFormDTO.item); + return render(); + } + + + @DeleteViewAction + public IViewContext deleteItem(Integer id) { + exampleService.deleteItem(id); + return render(); + } + + + Person person = new Person( + "Thomas", 23, "Ludwigsburg" + ); + + @PatchViewAction + public IViewContext savePersonPatch(Person person) { + this.person = person; + return render(); + } + + @PutViewAction + public IViewContext savePersonPut(Person person) { + this.person = person; + return render(); + } + + record Person( + String name, + Integer age, + String location + ) { + } + + +} diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html new file mode 100644 index 0000000..c61b54f --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html @@ -0,0 +1,10 @@ + +
+

This is the IndexViewComponent

+
+ IndexViewComponent
+ SimpleViewComponent
+ LayoutViewComponent
+ ActionViewComponent
+ NestedActionViewComponent
+ \ No newline at end of file diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java new file mode 100644 index 0000000..59cba6a --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java @@ -0,0 +1,13 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index; + +import de.tschuehly.spring.viewcomponent.core.EmptyViewContext; +import de.tschuehly.spring.viewcomponent.core.IViewContext; +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent; + +@ViewComponent +public class IndexViewComponent { + public IViewContext render() { + return new EmptyViewContext(); + } +} + diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html similarity index 86% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html rename to examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html index 5b7ad25..1269937 100644 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html @@ -1,16 +1,15 @@ + - -
- - -
This is a footer
+ + + \ No newline at end of file diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.java new file mode 100644 index 0000000..a29d795 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.java @@ -0,0 +1,15 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout; + +import de.tschuehly.spring.viewcomponent.core.IViewContext; +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent; + +@ViewComponent +public +class LayoutViewComponent { + + private record LayoutView(IViewContext nestedViewComponent) implements IViewContext{} + + public IViewContext render(IViewContext nestedViewComponent) { + return new LayoutView(nestedViewComponent); + } +} \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html similarity index 100% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html rename to examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.java new file mode 100644 index 0000000..af14314 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.java @@ -0,0 +1,20 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.simple; + +import de.tschuehly.spring.viewcomponent.core.IViewContext; +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent; +import de.tschuehly.spring.viewcomponent.thymeleaf.application.core.ExampleService; + +@ViewComponent +public class SimpleViewComponent { + final ExampleService exampleService; + + public SimpleViewComponent(ExampleService exampleService) { + this.exampleService = exampleService; + } + + record SimpleView(String helloWorld)implements IViewContext{} + + public SimpleView render() { + return new SimpleView(exampleService.getHelloWorld()); + } +} diff --git a/examples/thymeleaf-java-example/src/main/resources/application.properties b/examples/thymeleaf-java-example/src/main/resources/application.properties new file mode 100644 index 0000000..9991428 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.view-component.local-development=true +server.port=8082 \ No newline at end of file diff --git a/examples/thymeleaf-java-example/src/main/resources/templates/template-test.html b/examples/thymeleaf-java-example/src/main/resources/templates/template-test.html new file mode 100644 index 0000000..5e1c309 --- /dev/null +++ b/examples/thymeleaf-java-example/src/main/resources/templates/template-test.html @@ -0,0 +1 @@ +Hello World \ No newline at end of file diff --git a/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java b/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java new file mode 100644 index 0000000..174e50f --- /dev/null +++ b/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java @@ -0,0 +1,213 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; + +@SpringBootTest( + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT +) +class ThymeleafJavaIntegrationTest { + @Autowired + private TestRestTemplate testRestTemplate; + + @Test + void testIndexComponent() { + var expectedHtml = + //language=html + """ + +
+

This is the IndexViewComponent

+
+ IndexViewComponent
+ SimpleViewComponent
+ LayoutViewComponent
+ ActionViewComponent
+ NestedActionViewComponent
+ + """.stripIndent(); + assertEndpointReturns("/", expectedHtml); + } + + @Test + void testSimpleComponent() { + //language=html + var expectedHtml = "
\n" + + "

This is the SimpleViewComponent

\n" + + "
Hello World
\n" + + "
"; + assertEndpointReturns("/simple", expectedHtml); + } + + @Test + void testActionComponent() { + var expectedHtml = + //language=HTML + """ + + + + + + +

ViewAction Get CountUp

+ + +

0

+ +

ViewAction Post AddItem

+
+ + +
+ + + + + + \s +
ItemAction
+ +

ViewAction Put/Patch Person Form

+ +
+ + + + + +
+ + + """; + assertEndpointReturns( + "/action", + expectedHtml + ); + } + + @Test + void testNestedActionComponent() { + var expectedHtml = + //language=html + """ + + + +
+ + + + + +

ViewAction Get CountUp

+ + +

0

+ +

ViewAction Post AddItem

+
+ + +
+ + + + + + \s +
ItemAction
+ +

ViewAction Put/Patch Person Form

+ +
+ + + + + +
+ +
+ +
+ This is a footer +
+ + + + + """; + assertEndpointReturns("/nested-action", expectedHtml); + } + + @Test + void testLayoutComponent() { + //language=html + var expectedHtml = + """ + + + +
+

This is the SimpleViewComponent

+
Hello World
+
+
+ This is a footer +
+ + + """.stripIndent(); + assertEndpointReturns("/layout", expectedHtml); + } + + + @Test + void testResourceTemplate() { + var expectedHtml = "Hello World"; + assertEndpointReturns("/resource-template", expectedHtml); + } + + private void assertEndpointReturns(String url, String expectedHtml) { + var response = this.testRestTemplate.exchange( + url, HttpMethod.GET, null, String.class); + Assertions.assertEquals( + HttpStatus.OK, response.getStatusCode() + ); + Assertions.assertNotNull(response.getBody()); + Assertions.assertEquals( + expectedHtml, + response.getBody() + ); + } + + String rmWhitespaceBetweenHtmlTags(String html) { + return html.replace("(?<=>)(\\s*)(?=\\w)", "") + .replace("(?<=\\w)(\\s*)(?=<)", "") + .replace("(?<=>)(\\s*)(?=<)", "") + .replace("\n", "") + .trim(); + } +} diff --git a/examples/thymeleaf-example/.gitignore b/examples/thymeleaf-kotlin-example/.gitignore similarity index 100% rename from examples/thymeleaf-example/.gitignore rename to examples/thymeleaf-kotlin-example/.gitignore diff --git a/examples/thymeleaf-example/README.md b/examples/thymeleaf-kotlin-example/README.md similarity index 100% rename from examples/thymeleaf-example/README.md rename to examples/thymeleaf-kotlin-example/README.md diff --git a/examples/thymeleaf-example/build.gradle.kts b/examples/thymeleaf-kotlin-example/build.gradle.kts similarity index 79% rename from examples/thymeleaf-example/build.gradle.kts rename to examples/thymeleaf-kotlin-example/build.gradle.kts index bc52bcc..00a6e31 100644 --- a/examples/thymeleaf-example/build.gradle.kts +++ b/examples/thymeleaf-kotlin-example/build.gradle.kts @@ -1,10 +1,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "3.1.0" - id("io.spring.dependency-management") version "1.1.0" + id("org.springframework.boot") version "3.1.2" + id("io.spring.dependency-management") version "1.1.2" kotlin("jvm") version "1.8.21" kotlin("plugin.spring") version "1.8.21" + kotlin("kapt") version "1.8.21" + //id("com.google.devtools.ksp") version "1.8.21-1.0.11" } group = "de.tschuehly" @@ -23,7 +25,8 @@ repositories { } dependencies { - implementation("de.tschuehly:spring-view-component-thymeleaf:0.6.0") + implementation("de.tschuehly:spring-view-component-thymeleaf:0.6.2-SNAPSHOT") + kapt("de.tschuehly:spring-view-component-core:0.6.2-SNAPSHOT") implementation("org.webjars.npm:htmx.org:1.9.2") implementation("org.webjars:webjars-locator:0.47") @@ -48,15 +51,7 @@ tasks.withType { tasks.withType { useJUnitPlatform() -} - - - -sourceSets { - main { - resources { - srcDir("src/main/kotlin") - exclude("**/*.kt") - } + testLogging { + events("passed", "skipped", "failed") } } \ No newline at end of file diff --git a/examples/thymeleaf-example/gradle/wrapper/gradle-wrapper.jar b/examples/thymeleaf-kotlin-example/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/thymeleaf-example/gradle/wrapper/gradle-wrapper.jar rename to examples/thymeleaf-kotlin-example/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/thymeleaf-example/gradle/wrapper/gradle-wrapper.properties b/examples/thymeleaf-kotlin-example/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/thymeleaf-example/gradle/wrapper/gradle-wrapper.properties rename to examples/thymeleaf-kotlin-example/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/thymeleaf-example/gradlew b/examples/thymeleaf-kotlin-example/gradlew similarity index 100% rename from examples/thymeleaf-example/gradlew rename to examples/thymeleaf-kotlin-example/gradlew diff --git a/examples/thymeleaf-example/gradlew.bat b/examples/thymeleaf-kotlin-example/gradlew.bat similarity index 100% rename from examples/thymeleaf-example/gradlew.bat rename to examples/thymeleaf-kotlin-example/gradlew.bat diff --git a/examples/thymeleaf-kotlin-example/settings.gradle.kts b/examples/thymeleaf-kotlin-example/settings.gradle.kts new file mode 100644 index 0000000..2eec29d --- /dev/null +++ b/examples/thymeleaf-kotlin-example/settings.gradle.kts @@ -0,0 +1,12 @@ +rootProject.name = "thymeleaf-kotlin-example" + +includeBuild("..\\..\\thymeleaf"){ + dependencySubstitution { + substitute(module("de.tschuehly:spring-view-component-thymeleaf")).using(project(":")) + } +} +includeBuild("..\\..\\core"){ + dependencySubstitution { + substitute(module("de.tschuehly:spring-view-component-core")).using(project(":")) + } +} \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafComponentDemoApplication.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinExampleApplication.kt similarity index 69% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafComponentDemoApplication.kt rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinExampleApplication.kt index 009d77f..97ae648 100644 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafComponentDemoApplication.kt +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinExampleApplication.kt @@ -4,8 +4,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication @SpringBootApplication -class ThymeleafComponentDemoApplication +class ThymeleafKotlinExampleApplication fun main(args: Array) { - runApplication(*args) + runApplication(*args) } diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt similarity index 74% rename from thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt index a02ddb3..5d20f67 100644 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/core/ExampleService.kt +++ b/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() + val itemList = mutableMapOf() 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") } diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt similarity index 70% rename from thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt index 8653ef8..e74f4ac 100644 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/TestController.kt @@ -1,43 +1,38 @@ package de.tschuehly.spring.viewcomponent.thymeleaf.application.web -import de.tschuehly.spring.viewcomponent.core.component.ViewContextContainer import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.action.ActionViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.header.HeaderViewComponent import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index.IndexViewComponent import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout.LayoutViewComponent import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.simple.SimpleViewComponent import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.GetMapping -import org.springframework.web.bind.annotation.ModelAttribute @Controller class TestController( private val simpleViewComponent: SimpleViewComponent, private val indexViewComponent: IndexViewComponent, private val layoutViewComponent: LayoutViewComponent, - private val headerViewComponent: HeaderViewComponent, private val actionViewComponent: ActionViewComponent ) { + @GetMapping("/") fun indexComponent() = indexViewComponent.render() - @GetMapping("/action") - fun actionComponent() = actionViewComponent.render() - - @GetMapping("/nested-action") - fun nestedActionComponent() = layoutViewComponent.render(actionViewComponent.render()) - @GetMapping("/simple") fun simpleComponent() = simpleViewComponent.render() - @GetMapping("/layout") fun layoutComponent() = layoutViewComponent.render(simpleViewComponent.render()) - @GetMapping("/multi") - fun multiComponent() = - ViewContextContainer(simpleViewComponent.render(), layoutViewComponent.render(simpleViewComponent.render())) + @GetMapping("/action") + fun actionComponent() = actionViewComponent.render() + + @GetMapping("/nested-action") + fun nestedActionComponent() = layoutViewComponent.render(actionViewComponent.render()) + - @ModelAttribute("header") - fun headerComponent() = headerViewComponent.render("TestTitle") + @GetMapping("/resource-template") + fun templateTest(): String { + return "template-test" + } } \ No newline at end of file diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html similarity index 94% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html index 1929fb3..43975ee 100644 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html @@ -1,9 +1,9 @@ + -

ViewAction Get CountUp

diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt similarity index 67% rename from thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt index db7a54f..83c317d 100644 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.kt @@ -1,26 +1,22 @@ package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.action -import de.tschuehly.spring.viewcomponent.core.* +import de.tschuehly.spring.viewcomponent.core.IViewContext import de.tschuehly.spring.viewcomponent.core.action.* import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext import de.tschuehly.spring.viewcomponent.thymeleaf.application.core.ExampleService @ViewComponent class ActionViewComponent( val exampleService: ExampleService ) { + data class ActionView(val itemList: MutableMap, val counter: Int, val person: Person) : IViewContext - fun render() = ViewContext( - "itemList" toProperty exampleService.someData, - "counter" toProperty counter, - "person" toProperty person - ) + fun render() = ActionView(exampleService.itemList, counter, person) var counter: Int = 0 @GetViewAction("/customPath/countUp") - fun countUp(): ViewContext{ + fun countUp(): IViewContext { counter += 1 return render() } @@ -29,15 +25,16 @@ class ActionViewComponent( class ActionFormDTO( val item: String ) + @PostViewAction - fun addItem(actionFormDTO: ActionFormDTO): ViewContext { + fun addItem(actionFormDTO: ActionFormDTO): IViewContext { exampleService.addItemToList(actionFormDTO.item) return render() } @DeleteViewAction - fun deleteItem(id: Int): ViewContext{ + fun deleteItem(id: Int): IViewContext { exampleService.deleteItem(id) return render() } @@ -48,15 +45,17 @@ class ActionViewComponent( ) @PatchViewAction - fun savePersonPatch(person: Person): ViewContext { + fun savePersonPatch(person: Person): IViewContext { this.person = person return render() } + @PutViewAction - fun savePersonPut(person: Person): ViewContext { + fun savePersonPut(person: Person): IViewContext { this.person = person return render() } + class Person( val name: String, val age: Int, diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html similarity index 100% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html diff --git a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt similarity index 66% rename from examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt index 358d3b9..52edef1 100644 --- a/examples/thymeleaf-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt @@ -1,10 +1,8 @@ package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext @ViewComponent class IndexViewComponent { - - fun render() = ViewContext() + fun render() = de.tschuehly.spring.viewcomponent.core.EmptyViewContext() } \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html similarity index 86% rename from thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html index 5b7ad25..99b2232 100644 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.html @@ -1,16 +1,14 @@ - + - -
- - -
This is a footer
+ + + \ No newline at end of file diff --git a/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt new file mode 100644 index 0000000..4cae871 --- /dev/null +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt @@ -0,0 +1,12 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout + +import de.tschuehly.spring.viewcomponent.core.IViewContext +import de.tschuehly.spring.viewcomponent.core.component.ViewComponent + +@ViewComponent +class LayoutViewComponent { + data class LayoutView(val nestedViewComponent: IViewContext) : IViewContext + + fun render(nestedViewComponent: IViewContext) = LayoutView(nestedViewComponent) + +} \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html similarity index 100% rename from thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.html diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt similarity index 62% rename from thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt rename to examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt index 6291d85..d89bc71 100644 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt +++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/simple/SimpleViewComponent.kt @@ -1,21 +1,20 @@ package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.simple +import de.tschuehly.spring.viewcomponent.core.IViewContext import de.tschuehly.spring.viewcomponent.core.action.PostViewAction import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext import de.tschuehly.spring.viewcomponent.thymeleaf.application.core.ExampleService @ViewComponent class SimpleViewComponent( val exampleService: ExampleService ) { - fun render() = ViewContext( - "helloWorld" toProperty exampleService.getHelloWorld() - ) + fun render() = HelloWorldView(exampleService.getHelloWorld()) + + data class HelloWorldView(val helloWorld: String) : IViewContext @PostViewAction - fun testAction(): ViewContext { + fun testAction(): IViewContext { return render() } } \ No newline at end of file diff --git a/examples/thymeleaf-kotlin-example/src/main/resources/application.properties b/examples/thymeleaf-kotlin-example/src/main/resources/application.properties new file mode 100644 index 0000000..0a098c3 --- /dev/null +++ b/examples/thymeleaf-kotlin-example/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.view-component.local-development=false +server.port=8081 \ No newline at end of file diff --git a/examples/thymeleaf-kotlin-example/src/main/resources/templates/template-test.html b/examples/thymeleaf-kotlin-example/src/main/resources/templates/template-test.html new file mode 100644 index 0000000..5e1c309 --- /dev/null +++ b/examples/thymeleaf-kotlin-example/src/main/resources/templates/template-test.html @@ -0,0 +1 @@ +Hello World \ No newline at end of file diff --git a/examples/thymeleaf-kotlin-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinIntegrationTest.kt b/examples/thymeleaf-kotlin-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinIntegrationTest.kt new file mode 100644 index 0000000..c941556 --- /dev/null +++ b/examples/thymeleaf-kotlin-example/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafKotlinIntegrationTest.kt @@ -0,0 +1,196 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.http.HttpMethod +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity + + +@SpringBootTest( + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT +) +class ThymeleafKotlinIntegrationTest( + @Autowired val testRestTemplate: TestRestTemplate +) { + @Test + fun testIndexComponent() { + val expectedHtml = + //language=html + """ + +
+

This is the IndexViewComponent

+
+ IndexViewComponent
+ SimpleViewComponent
+ LayoutViewComponent
+ ActionViewComponent
+ NestedActionViewComponent
+ + """.trimIndent() + assertEndpointReturns("/", expectedHtml) + } + + @Test + fun testSimpleComponent() { + //language=html + val expectedHtml = """ +
+

This is the SimpleViewComponent

+
Hello World
+
+ """.trimIndent() + assertEndpointReturns("/simple", expectedHtml) + } + + @Test + fun testActionComponent() { + val expectedHtml = + //language=html + """ + + + + + + +

ViewAction Get CountUp

+ +

0

+

ViewAction Post AddItem

+
+ + +
+ + + + + +
ItemAction
+

ViewAction Put/Patch Person Form

+
+ + + + + +
+ + + """.trimIndent() + assertEndpointReturns( + "/action", + expectedHtml + ) + } + + @Test + fun testNestedActionComponent() { + val expectedHtml = + //language=html + """ + + + +
+ + + + + +

ViewAction Get CountUp

+ +

0

+

ViewAction Post AddItem

+
+ +
+ + + + + +
ItemAction
+

ViewAction Put/Patch Person Form

+
+ + + + + + + +
+ + +
+
This is a footer
+ + + """.trimIndent() + assertEndpointReturns("/nested-action", expectedHtml) + } + + @Test + fun testLayoutComponent() { + //language=html + val expectedHtml = + """ + + + +
+
+

This is the SimpleViewComponent

+
Hello World
+
+
+
This is a footer
+ + + """.trimIndent() + assertEndpointReturns("/layout", expectedHtml) + } + + @Test + fun testResourceTemplate() { + val expectedHtml = "Hello World" + assertEndpointReturns("/resource-template", expectedHtml) + } + + fun assertEndpointReturns(url: String, expectedHtml: String) { + val response: ResponseEntity = this.testRestTemplate + .exchange(url, HttpMethod.GET, null, String::class.java) + assertThat(response.statusCode) + .isEqualTo(HttpStatus.OK) + Assertions.assertEquals( + expectedHtml.rmWhitespaceBetweenHtmlTags(), response.body?.rmWhitespaceBetweenHtmlTags() + ) + } + + fun String.rmWhitespaceBetweenHtmlTags(): String { + // Replace whitespace between > and word + return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(), "") + .replace("(?<=\\w)(\\s*)(?=<)".toRegex(), "") + .replace("(?<=>)(\\s*)(?=<)".toRegex(), "") + .replace("\r\n","\n") + .trim() + } +} \ No newline at end of file diff --git a/jte/build.gradle.kts b/jte/build.gradle.kts index ce553a2..8c4ef35 100644 --- a/jte/build.gradle.kts +++ b/jte/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jreleaser.model.Active plugins { - id("org.springframework.boot") version "3.1.0" - id("io.spring.dependency-management") version "1.1.0" + id("org.springframework.boot") version "3.1.2" + id("io.spring.dependency-management") version "1.1.2" kotlin("jvm") version "1.8.21" kotlin("plugin.spring") version "1.8.21" @@ -13,14 +13,14 @@ plugins { } group = "de.tschuehly" -version = "0.6.0" +version = "0.6.2-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() } dependencies { - api("de.tschuehly:spring-view-component-core:0.6.0") + api("de.tschuehly:spring-view-component-core:0.6.2-SNAPSHOT") // implementation("gg.jte:jte-spring-boot-starter-3:3.0.0") implementation(files("./jte-spring-boot-starter-3-3.0.2-SNAPSHOT.jar")) implementation("org.springframework.boot:spring-boot-starter-web") diff --git a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt index 44dddd5..c315639 100644 --- a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt +++ b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentAutoConfiguration.kt @@ -2,7 +2,9 @@ package de.tschuehly.spring.viewcomponent.jte import de.tschuehly.spring.viewcomponent.core.ViewComponentAutoConfiguration import de.tschuehly.spring.viewcomponent.core.component.ViewComponentProperties +import gg.jte.ContentType import gg.jte.TemplateEngine +import gg.jte.springframework.boot.autoconfigure.JteProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @@ -12,10 +14,15 @@ import org.springframework.context.annotation.Import @Import(ViewComponentAutoConfiguration::class) @EnableConfigurationProperties(ViewComponentProperties::class) class JteViewComponentAutoConfiguration( - private val jteTemplateEngine: TemplateEngine + private val jteProperties: JteProperties ) { @Bean - fun jteViewContextAspect(): JteViewContextAspect { - return JteViewContextAspect(jteTemplateEngine) + fun jteViewContextAspect(templateEngine: TemplateEngine): JteViewContextAspect { + return JteViewContextAspect(templateEngine, jteProperties) + } + + @Bean + fun templateEngine(): TemplateEngine{ + return TemplateEngine.createPrecompiled(ContentType.Html) } } \ No newline at end of file diff --git a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentCompiler.kt b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentCompiler.kt new file mode 100644 index 0000000..2e4d40d --- /dev/null +++ b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewComponentCompiler.kt @@ -0,0 +1,24 @@ +package de.tschuehly.spring.viewcomponent.jte + +import de.tschuehly.spring.viewcomponent.core.processor.ViewComponentCompiler +import gg.jte.ContentType +import gg.jte.TemplateConfig +import gg.jte.compiler.TemplateCompiler +import gg.jte.resolve.DirectoryCodeResolver +import gg.jte.runtime.Constants +import java.nio.file.Path + +class JteViewComponentCompiler() : ViewComponentCompiler { + override fun compile(rootDir: Path, names: String, classDirectory: Path): String { + val compiler = TemplateCompiler( + /* config = */ TemplateConfig( + ContentType.Html, + Constants.PACKAGE_NAME_PRECOMPILED + ), + /* codeResolver = */ DirectoryCodeResolver(rootDir), + /* classDirectory = */ classDirectory, + /* parentClassLoader = */ this.javaClass.classLoader + ) + return compiler.precompile(listOf(names)).first() + } +} \ No newline at end of file diff --git a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt index 12db442..4fff47a 100644 --- a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt +++ b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt @@ -1,6 +1,7 @@ package de.tschuehly.spring.viewcomponent.jte import gg.jte.TemplateEngine +import gg.jte.springframework.boot.autoconfigure.JteProperties import org.aspectj.lang.annotation.AfterReturning import org.aspectj.lang.annotation.Aspect import org.aspectj.lang.annotation.Pointcut @@ -9,7 +10,8 @@ import org.springframework.stereotype.Component @Aspect @Component class JteViewContextAspect( - private val jteTemplateEngine: TemplateEngine + private val jteTemplateEngine: TemplateEngine, + private val jteProperties: JteProperties ) { @Pointcut("@within(de.tschuehly.spring.viewcomponent.core.component.ViewComponent)") fun isViewComponent() { @@ -24,6 +26,7 @@ class JteViewContextAspect( @AfterReturning(pointcut = "isViewComponent() && isRenderOrGetMethod()", returning = "viewContext") fun renderInject(viewContext: ViewContext): ViewContext { viewContext.jteTemplateEngine = jteTemplateEngine + viewContext.templateSuffix = jteProperties.templateSuffix return viewContext } } \ No newline at end of file diff --git a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt index 65cae03..4d798bd 100644 --- a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt +++ b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt @@ -9,23 +9,15 @@ import gg.jte.TemplateOutput class ViewContext( - override vararg val contextAttributes: ViewProperty ) : Content, IViewContext { + var templateSuffix: String? = null var jteTemplateEngine: TemplateEngine? = null - override var componentBean: Any? = null - override var componentTemplate: String? = null - constructor( - componentTemplate: String? = null, - vararg contextAttributes: ViewProperty - ) : this(*contextAttributes) { - this.componentTemplate = componentTemplate - - } - override fun writeTo(output: TemplateOutput) { - jteTemplateEngine?.render("$componentTemplate.jte", contextAttributes.toMap(), output) - ?: throw Error("JteTemplateEngine is null") + assert(templateSuffix != null) + assert(jteTemplateEngine != null) + IViewContext.componentTemplate +// jteTemplateEngine!!.render("$componentTemplate$templateSuffix", contextAttributes.toMap(), output) } } \ No newline at end of file diff --git a/jte/src/main/resources/application.properties b/jte/src/main/resources/application.properties index 8b13789..d1775f8 100644 --- a/jte/src/main/resources/application.properties +++ b/jte/src/main/resources/application.properties @@ -1 +1 @@ - +gg.jte.usePrecompiledTemplates=false diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/JteTestApplication.kt b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/JteTestApplication.kt deleted file mode 100644 index 8a6e826..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/JteTestApplication.kt +++ /dev/null @@ -1,17 +0,0 @@ -package de.tschuehly.spring.viewcomponent.jte.application - -import de.tschuehly.spring.viewcomponent.core.ViewComponentAutoConfiguration -import gg.jte.springframework.boot.autoconfigure.JteAutoConfiguration -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication -import org.springframework.context.annotation.Import - -@SpringBootApplication -@Import(ViewComponentAutoConfiguration::class, JteAutoConfiguration::class) -class JteTestApplication - - -fun main(args: Array) { - runApplication(*args) -} - diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/core/ExampleService.kt b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/core/ExampleService.kt deleted file mode 100644 index 8bf18bf..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/core/ExampleService.kt +++ /dev/null @@ -1,24 +0,0 @@ -package de.tschuehly.spring.viewcomponent.jte.application.core - -import org.springframework.stereotype.Service - -@Service -class ExampleService { - var dataIndex = 0 - val someData = mutableMapOf() - - fun getHelloWorld(): String { - return "Hello World" - } - - fun addItemToList(item: String) { - someData[dataIndex] = item - dataIndex += 1 - } - - fun deleteItem(id: Int) { - someData.remove(id) ?: throw NoSuchElementException("No Element with Id: $id found") - } - - -} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.kt b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.kt deleted file mode 100644 index 3f639f7..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/action/ActionViewComponent.kt +++ /dev/null @@ -1,68 +0,0 @@ -package de.tschuehly.spring.viewcomponent.jte.application.web.action - -import de.tschuehly.spring.viewcomponent.core.* -import de.tschuehly.spring.viewcomponent.core.action.* -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.jte.ViewContext -import de.tschuehly.spring.viewcomponent.jte.application.core.ExampleService - -@ViewComponent -class ActionViewComponent( - val exampleService: ExampleService -) { - - fun render() = ViewContext( - "itemList" toProperty exampleService.someData, - "counter" toProperty counter, - "person" toProperty person - ) - - var counter = 0; - - @GetViewAction("/customPath/countUp") - fun countUp(): ViewContext { - counter += 1 - return render() - } - - - class ActionFormDTO( - val item: String - ) - - @PostViewAction - fun addItem(actionFormDTO: ActionFormDTO): ViewContext { - exampleService.addItemToList(actionFormDTO.item) - return render() - } - - - @DeleteViewAction - fun deleteItem(id: Int): ViewContext { - exampleService.deleteItem(id) - return render() - } - - - var person = Person( - name = "Thomas", age = 23, location = "Ludwigsburg" - ) - - @PatchViewAction - fun savePersonPatch(person: Person): ViewContext { - this.person = person - return render() - } - - @PutViewAction - fun savePersonPut(person: Person): ViewContext { - this.person = person - return render() - } - - class Person( - val name: String, - val age: Int, - val location: String - ) -} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.jte b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.jte deleted file mode 100644 index 5c246d9..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.jte +++ /dev/null @@ -1,8 +0,0 @@ -@param String title - - - - \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.kt b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.kt deleted file mode 100644 index 61004a5..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/header/HeaderViewComponent.kt +++ /dev/null @@ -1,13 +0,0 @@ -package de.tschuehly.spring.viewcomponent.jte.application.web.header - - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.jte.ViewContext - -@ViewComponent -class HeaderViewComponent { - fun render(title: String) = ViewContext( - "title" toProperty title - ) -} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/index/IndexViewComponent.kt b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/index/IndexViewComponent.kt deleted file mode 100644 index 3fc3ed2..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/index/IndexViewComponent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package de.tschuehly.spring.viewcomponent.jte.application.web.index - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.jte.ViewContext -@ViewComponent -class IndexViewComponent { - - fun render() = ViewContext() -} \ No newline at end of file diff --git a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.kt b/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.kt deleted file mode 100644 index 2030908..0000000 --- a/jte/src/test/kotlin/de/tschuehly/spring/viewcomponent/jte/application/web/layout/LayoutViewComponent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package de.tschuehly.spring.viewcomponent.jte.application.web.layout - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.jte.ViewContext - -@ViewComponent -class LayoutViewComponent { - fun render(nestedViewComponent: ViewContext) = ViewContext( - "nestedViewComponent" toProperty nestedViewComponent - ) -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 24b3e66..90c1fec 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ includeBuild("thymeleaf") includeBuild("core") includeBuild("jte") -rootProject.name = "spring-view-component" \ No newline at end of file +rootProject.name = "spring-view-component" diff --git a/thymeleaf/build.gradle.kts b/thymeleaf/build.gradle.kts index 0cfd1f3..c006051 100644 --- a/thymeleaf/build.gradle.kts +++ b/thymeleaf/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jreleaser.model.Active plugins { - id("org.springframework.boot") version "3.1.0" - id("io.spring.dependency-management") version "1.1.0" + id("org.springframework.boot") version "3.1.2" + id("io.spring.dependency-management") version "1.1.2" kotlin("jvm") version "1.8.21" kotlin("plugin.spring") version "1.8.21" @@ -13,7 +13,7 @@ plugins { } group = "de.tschuehly" -version = "0.6.0" +version = "0.6.2-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_17 repositories { @@ -21,13 +21,14 @@ repositories { } dependencies { - api("de.tschuehly:spring-view-component-core:0.6.0") + api("de.tschuehly:spring-view-component-core:0.6.2-SNAPSHOT") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-devtools") testImplementation("org.springframework.boot:spring-boot-starter-actuator") testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.webjars:webjars-locator:0.47") testImplementation("org.webjars.npm:htmx.org:1.9.2") } diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentAutoConfiguration.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentAutoConfiguration.kt index 08a833b..10c42a7 100644 --- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentAutoConfiguration.kt +++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentAutoConfiguration.kt @@ -10,10 +10,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Import -import org.springframework.web.method.support.HandlerMethodReturnValueHandler import org.thymeleaf.dialect.IDialect import org.thymeleaf.spring6.SpringTemplateEngine -import org.thymeleaf.spring6.view.ThymeleafViewResolver import org.thymeleaf.templatemode.TemplateMode import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver import org.thymeleaf.templateresolver.FileTemplateResolver @@ -51,7 +49,7 @@ class ThymeleafViewComponentAutoConfiguration { } @Bean - @ConditionalOnProperty("viewcomponent.localDevelopment") + @ConditionalOnProperty("spring.view-component.local-development") fun fileViewComponentTemplateResolver(): FileTemplateResolver { val fileViewComponentTemplateResolver = FileTemplateResolver() if (File("src/main/kotlin").isDirectory) { @@ -68,6 +66,7 @@ class ThymeleafViewComponentAutoConfiguration { fileViewComponentTemplateResolver.checkExistence = true return fileViewComponentTemplateResolver } + @Bean fun viewComponentTemplateResolver(): ClassLoaderTemplateResolver { val templateResolver = ClassLoaderTemplateResolver() @@ -79,12 +78,6 @@ class ThymeleafViewComponentAutoConfiguration { templateResolver.checkExistence = true return templateResolver } - @Bean - fun thymeleafViewContextContainerMethodReturnValueHandler( - thymeleafViewResolver: ThymeleafViewResolver - ): HandlerMethodReturnValueHandler { - return ThymeleafViewContextContainerMethodReturnValueHandler(thymeleafViewResolver) - } } diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentDialect.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentDialect.kt index 62ae709..5799f53 100644 --- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentDialect.kt +++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentDialect.kt @@ -9,7 +9,7 @@ class ThymeleafViewComponentDialect : AbstractProcessorDialect( ) { override fun getProcessors(dialectPrefix: String): MutableSet { return mutableSetOf( - ThymeleafViewComponentProcessor(dialectPrefix) + ThymeleafViewComponentTagProcessor(dialectPrefix) ) } diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentProcessor.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt similarity index 57% rename from thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentProcessor.kt rename to thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt index 8c3820b..8ef3c00 100644 --- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentProcessor.kt +++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt @@ -2,14 +2,13 @@ package de.tschuehly.spring.viewcomponent.thymeleaf import de.tschuehly.spring.viewcomponent.core.IViewContext import de.tschuehly.spring.viewcomponent.core.action.ViewActionConstant -import de.tschuehly.spring.viewcomponent.core.component.ViewComponentProcessingException +import de.tschuehly.spring.viewcomponent.core.processor.ViewComponentProcessingException import de.tschuehly.spring.viewcomponent.core.toMap +import org.slf4j.LoggerFactory import org.thymeleaf.context.ITemplateContext import org.thymeleaf.context.WebEngineContext import org.thymeleaf.engine.AttributeName import org.thymeleaf.engine.EngineEventUtils -import org.thymeleaf.exceptions.TemplateProcessingException -import org.thymeleaf.model.AttributeValueQuotes import org.thymeleaf.model.IProcessableElementTag import org.thymeleaf.processor.element.AbstractAttributeTagProcessor import org.thymeleaf.processor.element.IElementTagStructureHandler @@ -18,8 +17,7 @@ import org.thymeleaf.spring6.context.SpringContextUtils import org.thymeleaf.templatemode.TemplateMode -class ThymeleafViewComponentProcessor(dialectPrefix: String) : - +class ThymeleafViewComponentTagProcessor(dialectPrefix: String) : AbstractAttributeTagProcessor( /* templateMode = */ TemplateMode.HTML, /* dialectPrefix = */ dialectPrefix, @@ -30,6 +28,8 @@ class ThymeleafViewComponentProcessor(dialectPrefix: String) : /* precedence = */ PRECEDENCE, /* removeAttribute = */ true ) { + private val logger = LoggerFactory.getLogger(ThymeleafViewComponentTagProcessor::class.java) + companion object { val ATTR_NAME = "component" val PRECEDENCE = 10000 @@ -49,41 +49,32 @@ class ThymeleafViewComponentProcessor(dialectPrefix: String) : val webContext = context as WebEngineContext val viewContext = try { expression.execute(webContext) as IViewContext - } catch (e: TemplateProcessingException) { + } catch (e: ClassCastException) { + throw ViewComponentExpressionException( + "Could not execute expression: \"${expression.stringRepresentation}\" " + + "as ViewContext, did you forget the brackets? \${${expression.stringRepresentation}}, did you pass \"${expression.stringRepresentation}\" as ViewContextProperty?" + ) + } catch (e: Exception) { + logger.error("Could not execute expression: \"${expression.stringRepresentation}\"") throw ViewComponentProcessingException(e.message, e.cause) } - val viewComponentName = viewContext.componentBean?.javaClass?.simpleName?.lowercase() - ?: throw ViewComponentProcessingException( - "viewContext.componentBean of expression $attributeValue is somehow null", - null - ) val appCtx = SpringContextUtils.getApplicationContext(webContext) val engine = appCtx.getBean(SpringTemplateEngine::class.java) - SpringContextUtils.getRequestContext(webContext).model.putAll(viewContext.contextAttributes.toMap()) - webContext.setVariables(viewContext.contextAttributes.toMap()) + SpringContextUtils.getRequestContext(webContext).model.putAll(IViewContext.getAttributes(viewContext)) + webContext.setVariables(IViewContext.getAttributes(viewContext)) + + val componentName = viewContext.javaClass.enclosingClass.simpleName.substringBefore("$$") + val componentPackage = viewContext.javaClass.enclosingClass.`package`.name.replace(".", "/") + "/" val modelFactory = webContext.modelFactory - val model = modelFactory.createModel().let { model -> - model.add( - modelFactory.createOpenElementTag( - "div", - mapOf( - "id" to viewComponentName, - ViewActionConstant.nestedViewComponentAttributeName to "" - ), - AttributeValueQuotes.DOUBLE, - false - ) - ) - model.add( - modelFactory.createText( - engine.process(viewContext.componentTemplate, webContext) - ) - ) - model.add(modelFactory.createCloseElementTag("div")) - return@let model - } - structureHandler.replaceWith(model, false) + val viewComponentBody = modelFactory.createText( + engine.process("$componentPackage$componentName", webContext) + ) + + structureHandler.setAttribute("id", viewContext.javaClass.enclosingClass.simpleName.lowercase()) + structureHandler.setAttribute(ViewActionConstant.nestedViewComponentAttributeName, null) + structureHandler.removeAttribute("view:component") + structureHandler.setBody(viewComponentBody, true) } } diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewContextContainerMethodReturnValueHandler.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewContextContainerMethodReturnValueHandler.kt deleted file mode 100644 index a8a4f65..0000000 --- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewContextContainerMethodReturnValueHandler.kt +++ /dev/null @@ -1,43 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf - -import de.tschuehly.spring.viewcomponent.core.component.ViewContextContainer -import de.tschuehly.spring.viewcomponent.core.toMap -import jakarta.servlet.http.HttpServletRequest -import jakarta.servlet.http.HttpServletResponse -import org.springframework.core.MethodParameter -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.web.context.support.WebApplicationObjectSupport -import org.springframework.web.method.support.HandlerMethodReturnValueHandler -import org.springframework.web.method.support.ModelAndViewContainer -import org.thymeleaf.spring6.view.ThymeleafView -import org.thymeleaf.spring6.view.ThymeleafViewResolver -import java.util.* - -class ThymeleafViewContextContainerMethodReturnValueHandler( - private val thymeleafViewResolver: ThymeleafViewResolver -) : HandlerMethodReturnValueHandler, WebApplicationObjectSupport() { - - override fun supportsReturnType(returnType: MethodParameter): Boolean { - return ViewContextContainer::class.java.isAssignableFrom(returnType.parameterType) - } - - override fun handleReturnValue( - returnValue: Any?, - returnType: MethodParameter, - mavContainer: ModelAndViewContainer, - webRequest: NativeWebRequest - ) { - val request = webRequest.getNativeRequest(HttpServletRequest::class.java)!! - val response = webRequest.getNativeResponse(HttpServletResponse::class.java)!! - val viewContextContainer = returnValue as ViewContextContainer - viewContextContainer.viewContexts.forEach { viewContext -> - val view: ThymeleafView = - thymeleafViewResolver.resolveViewName(viewContext.componentTemplate!!, Locale.GERMAN) as ThymeleafView - view.render(viewContext.contextAttributes.toMap(), request, response) - } - mavContainer.isRequestHandled = true - } - -} - - diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewComponentExpressionException.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewComponentExpressionException.kt new file mode 100644 index 0000000..fdd8e94 --- /dev/null +++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewComponentExpressionException.kt @@ -0,0 +1,5 @@ +package de.tschuehly.spring.viewcomponent.thymeleaf + +class ViewComponentExpressionException(message: String) : Throwable(message) { + +} diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt index da91a15..7308486 100644 --- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt +++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt @@ -1,28 +1 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf - -import de.tschuehly.spring.viewcomponent.core.IViewContext -import de.tschuehly.spring.viewcomponent.core.ViewProperty - -class ViewContext(override val contextAttributes: Array) : - IViewContext { - override var componentTemplate: String? = null - override var componentBean: Any? = null - - - constructor( - vararg contextAttributes: ViewProperty, - componentTemplate: String? = null - ) : this(contextAttributes) { - this.componentTemplate = componentTemplate - - } - companion object{ - @JvmStatic - fun of(vararg contextAttributes: ViewProperty): ViewContext { - return ViewContext( - *contextAttributes - ) - } - } - -} \ No newline at end of file +package de.tschuehly.spring.viewcomponent.thymeleaf \ No newline at end of file diff --git a/thymeleaf/src/main/resources/application.properties b/thymeleaf/src/main/resources/application.properties deleted file mode 100644 index 4eb1405..0000000 --- a/thymeleaf/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -spring.thymeleaf.prefix = classpath:/ -spring.thymeleaf.template-resolver-order=0 diff --git a/thymeleaf/src/main/resources/templates/test.html b/thymeleaf/src/main/resources/templates/test.html new file mode 100644 index 0000000..dd18b84 --- /dev/null +++ b/thymeleaf/src/main/resources/templates/test.html @@ -0,0 +1,3 @@ +
+ Hello World +
\ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt deleted file mode 100644 index 48c60af..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/IntegrationTest.kt +++ /dev/null @@ -1,80 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf - -import de.tschuehly.spring.viewcomponent.thymeleaf.application.ThymeleafTestApplication -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.web.client.TestRestTemplate -import org.springframework.http.HttpEntity -import org.springframework.http.HttpHeaders -import org.springframework.http.HttpMethod -import org.springframework.http.HttpStatus -import org.springframework.http.HttpStatusCode -import org.springframework.http.MediaType.APPLICATION_JSON_VALUE -import org.springframework.http.ResponseEntity -import org.springframework.test.web.servlet.MockMvc -import org.springframework.test.web.servlet.get -import org.springframework.util.StringUtils - - -@SpringBootTest( - classes = [ThymeleafTestApplication::class], - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT -) -class IntegrationTest( - @Autowired val testRestTemplate: TestRestTemplate -) { - @Test - fun testIndexComponent() { - val expectedHtml = """

This is the IndexViewComponent

IndexViewComponent
SimpleViewComponent
LayoutViewComponent
ActionViewComponent
NestedActionViewComponent





""" - assertEndpointReturns("/",expectedHtml) - } - @Test - fun testSimpleComponent() { - val expectedHtml = """

This is the SimpleViewComponent

Hello World
""" - assertEndpointReturns("/simple",expectedHtml) - } - @Test - fun testActionComponent(){ - assertEndpointReturns("/action","""

ViewAction Get CountUp

0

ViewAction Post AddItem

ItemAction

ViewAction Put/Patch Person Form

""") - } - @Test - fun testNestedActionComponent() { - val expectedHtml = """

ViewAction Get CountUp

0

ViewAction Post AddItem

ItemAction

ViewAction Put/Patch Person Form

This is a footer
""" - assertEndpointReturns("/nested-action",expectedHtml) - } - @Test - fun testLayoutComponent() { - val expectedHtml = """

This is the SimpleViewComponent

Hello World
This is a footer
""" - assertEndpointReturns("/layout",expectedHtml) - } - @Test - fun testMultiComponent() { - val expectedHtml = """

This is the SimpleViewComponent

Hello World

This is the SimpleViewComponent

Hello World
This is a footer
""" - assertEndpointReturns("/multi",expectedHtml) - - } - - fun assertEndpointReturns(url: String, expectedHtml: String){ - val response: ResponseEntity = this.testRestTemplate - .exchange(url, HttpMethod.GET, null, String::class.java) - - assertThat(response.statusCode) - .isEqualTo(HttpStatus.OK) - assertThat(response.body?.rmWhitespaceBetweenHtmlTags()) - .isEqualTo(expectedHtml) - } - fun String.rmWhitespaceBetweenHtmlTags(): String { - // Replace whitespace between > and word - return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(),"").run { - // Replace whitespace between word and < - this.replace("(?<=\\w)(\\s*)(?=<)".toRegex(),"") - }.run { - // Replace whitespace between > and < - this.replace("(?<=>)(\\s*)(?=<)".toRegex(),"") - } - } -} \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/ThymeleafTestApplication.kt b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/ThymeleafTestApplication.kt deleted file mode 100644 index 782d5a2..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/ThymeleafTestApplication.kt +++ /dev/null @@ -1,18 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application - -import de.tschuehly.spring.viewcomponent.thymeleaf.ThymeleafViewComponentAutoConfiguration -import de.tschuehly.spring.viewcomponent.thymeleaf.application.web.header.HeaderViewComponent -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration -import org.springframework.boot.runApplication -import org.springframework.context.annotation.Import - -@SpringBootApplication -@Import(ThymeleafViewComponentAutoConfiguration::class, ThymeleafAutoConfiguration::class) -class ThymeleafTestApplication - - -fun main(args: Array) { - runApplication(*args) -} - diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html deleted file mode 100644 index a97ef24..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/action/ActionViewComponent.html +++ /dev/null @@ -1,43 +0,0 @@ -
- -

ViewAction Get CountUp

- - -

- -

ViewAction Post AddItem

-
- - -
- - - - - - - - - -
ItemAction
- - - -
- -

ViewAction Put/Patch Person Form

- -
- - - - - -
-
\ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html deleted file mode 100644 index cd03728..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt deleted file mode 100644 index 5e69669..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/header/HeaderViewComponent.kt +++ /dev/null @@ -1,13 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.header - - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext - -@ViewComponent -class HeaderViewComponent{ - fun render(title: String) = ViewContext( - "title" toProperty title - ) -} \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html deleted file mode 100644 index 3e63541..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.html +++ /dev/null @@ -1,12 +0,0 @@ - -
-

This is the IndexViewComponent

- -
-IndexViewComponent
-SimpleViewComponent
-LayoutViewComponent
-ActionViewComponent
-NestedActionViewComponent
- - \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt deleted file mode 100644 index 358d3b9..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt +++ /dev/null @@ -1,10 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext - -@ViewComponent -class IndexViewComponent { - - fun render() = ViewContext() -} \ No newline at end of file diff --git a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt b/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt deleted file mode 100644 index 4c5b977..0000000 --- a/thymeleaf/src/test/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/layout/LayoutViewComponent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.layout - -import de.tschuehly.spring.viewcomponent.core.component.ViewComponent -import de.tschuehly.spring.viewcomponent.core.toProperty -import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext - -@ViewComponent -class LayoutViewComponent { - fun render(nestedViewComponent: ViewContext) = ViewContext( - "nestedViewComponent" toProperty nestedViewComponent - ) -} \ No newline at end of file diff --git a/thymeleaf/src/test/resources/application.yaml b/thymeleaf/src/test/resources/application.yaml deleted file mode 100644 index fee0a9a..0000000 --- a/thymeleaf/src/test/resources/application.yaml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 8082 -logging: - level: - org.springframework.web: TRACE -spring: - thymeleaf: - cache: false - view-component: - view-action: - enabled: true \ No newline at end of file diff --git a/thymeleaf/src/test/resources/static/favicon.ico b/thymeleaf/src/test/resources/static/favicon.ico deleted file mode 100644 index e69de29..0000000