[camel-quarkus] 01/06: Use model.name instead of model.scheme in cq.create templates so that it works for dataformats too

[pp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 6acedc648147d78b35102cd7c819bbb49eefcaa9
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Aug 25 10:20:22 2020 +0200

    Use model.name instead of model.scheme in cq.create templates so that it
    works for dataformats too
---
 tooling/create-extension-templates/Test.java         |  4 ++--
 tooling/create-extension-templates/TestResource.java | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tooling/create-extension-templates/Test.java b/tooling/create-extension-templates/Test.java
index fabd474..f8d6fa0 100644
--- a/tooling/create-extension-templates/Test.java
+++ b/tooling/create-extension-templates/Test.java
@@ -46,9 +46,9 @@ class [=toCapCamelCase(artifactIdBase)]Test {
 [#else]
 [#list models as model]
     @Test
-    public void load[=toCapCamelCase(model.kind)][=toCapCamelCase(model.scheme)]() {
+    public void load[=toCapCamelCase(model.kind)][=toCapCamelCase(model.name)]() {
         /* A simple autogenerated test */
-        RestAssured.get("/[=artifactIdBase]/load/[=model.kind]/[=model.scheme]")
+        RestAssured.get("/[=artifactIdBase]/load/[=model.kind]/[=model.name]")
                 .then()
                 .statusCode(200);
     }
diff --git a/tooling/create-extension-templates/TestResource.java b/tooling/create-extension-templates/TestResource.java
index 0ddba52..ff71fcb 100644
--- a/tooling/create-extension-templates/TestResource.java
+++ b/tooling/create-extension-templates/TestResource.java
@@ -73,31 +73,31 @@ public class [=toCapCamelCase(artifactIdBase)]Resource {
     }
 [#else]
 [#list models as m]
-    private static final String [=toSnakeCase(m.kind)?upper_case]_[=toSnakeCase(m.scheme)?upper_case] = "[=m.scheme]";
+    private static final String [=toSnakeCase(m.kind)?upper_case]_[=toSnakeCase(m.name)?upper_case] = "[=m.name]";
 [/#list]
     @Inject
     CamelContext context;
 
 [#list models as model]
-    @Path("/load/[=model.kind]/[=model.scheme]")
+    @Path("/load/[=model.kind]/[=model.name]")
     @GET
     @Produces(MediaType.TEXT_PLAIN)
-    public Response load[=toCapCamelCase(model.kind)][=toCapCamelCase(model.scheme)]() throws Exception {
+    public Response load[=toCapCamelCase(model.kind)][=toCapCamelCase(model.name)]() throws Exception {
         /* This is an autogenerated test */
-[#if kind == "other" ]
+[#if model.kind == "other" ]
         /* No way to test a Camel artifact of kind "other" */
         return Response.ok().build();
 [#else]
-[#if kind == "component" ]
+[#if model.kind == "component" ]
 [#assign contextMethod = "getComponent"]
-[#elseif kind == "language" ]
+[#elseif model.kind == "language" ]
 [#assign contextMethod = "resolveLanguage"]
-[#elseif kind == "dataformat" ]
-[#assign contextMethod = "createDataFormat"]
+[#elseif model.kind == "dataformat" ]
+[#assign contextMethod = "resolveDataFormat"]
 [#else]
-[#stop "Unexpected Camel artifact kind " + kind ]
+[#stop "Unexpected Camel artifact kind " + model.kind ]
 [/#if]
-[#assign schemeVarName = "[=toSnakeCase(model.kind)?upper_case]_[=toSnakeCase(model.scheme)?upper_case]"]
+[#assign schemeVarName = "[=toSnakeCase(model.kind)?upper_case]_[=toSnakeCase(model.name)?upper_case]"]
         if (context.[=contextMethod]([=schemeVarName]) != null) {
             return Response.ok().build();
         }