You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/08/02 14:39:58 UTC
[camel-karavan] branch main updated: Snippets improvements for #839
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 47706722 Snippets improvements for #839
47706722 is described below
commit 477067227dcd8064f6d103da01435b16c9ae2fb6
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Aug 2 10:39:42 2023 -0400
Snippets improvements for #839
---
karavan-vscode/package.json | 8 ++------
.../snippets/camel-main-org.apache.camel.AggregationStrategy.java | 2 ++
.../snippets/camel-main-org.apache.camel.Processor.java | 2 ++
.../main/java/org/apache/camel/karavan/service/CodeService.java | 2 +-
.../resources/snippets/camel-main-docker-application.properties | 7 +------
.../snippets/camel-main-kubernetes-application.properties | 7 +------
.../snippets/camel-main-openshift-application.properties | 7 +------
.../snippets/camel-main-org.apache.camel.AggregationStrategy.java | 2 ++
.../resources/snippets/camel-main-org.apache.camel.Processor.java | 8 +++++---
9 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 9784d538..c905ff67 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -278,8 +278,6 @@
"type": "string"
},
"default": [
- "camel.health.enabled=true",
- "camel.health.exposure-level=full",
"camel.karavan.project-id=$NAME",
"camel.karavan.project-name=$NAME",
"camel.karavan.project-description=$NAME",
@@ -288,9 +286,8 @@
"camel.jbang.version=4.0.0-RC2",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
- "management.endpoints.web.exposure.include=health",
- "management.health.probes.enabled=true",
- "management.endpoint.health.show-details=always"
+ "camel.health.enabled=true",
+ "camel.health.exposure-level=full"
],
"description": "Camel-main application.properties template",
"scope": "machine",
@@ -392,7 +389,6 @@
"type": "string"
},
"default": [
- "camel.jbang.dependencies=camel:microprofile-health",
"# jkube properties",
"jkube.version=1.13.1",
"jkube.build.strategy=s2i",
diff --git a/karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java b/karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java
index 094ee279..a5e29f22 100644
--- a/karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java
+++ b/karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java
@@ -1,7 +1,9 @@
import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Configuration;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
+@Configuration
@BindToRegistry("NAME")
public class NAME implements AggregationStrategy {
@Override
diff --git a/karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java b/karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java
index 66f39afd..d834b10f 100644
--- a/karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java
+++ b/karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java
@@ -1,7 +1,9 @@
import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+@Configuration
@BindToRegistry("NAME")
public class NAME implements Processor {
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
index 85c80464..f961d968 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
@@ -91,7 +91,7 @@ public class CodeService {
if (ConfigService.inKubernetes()) {
instance.data("namespace", kubernetesService.getNamespace());
}
- String code = result.render();
+ String code = instance.render();
return new ProjectFile(APPLICATION_PROPERTIES_FILENAME, code, project.getProjectId(), Instant.now().toEpochMilli());
}
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-docker-application.properties b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-docker-application.properties
index 381727c1..c446e92d 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-docker-application.properties
+++ b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-docker-application.properties
@@ -4,11 +4,6 @@ camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=camel-main
camel.jbang.version=4.0.0-RC2
-camel.jbang.dependencies=camel:microprofile-health
+camel.jbang.dependencies=camel-console,camel-platform-http-main
camel.health.enabled=true
camel.health.exposure-level=full
-management.endpoints.web.exposure.include=health
-management.health.probes.enabled=true
-management.health.livenessState.enabled=true
-management.health.readinessState.enabled=true
-management.endpoint.health.show-details=always
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-kubernetes-application.properties b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-kubernetes-application.properties
index 02fc81d8..26fff7c6 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-kubernetes-application.properties
+++ b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-kubernetes-application.properties
@@ -4,14 +4,9 @@ camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=camel-main
camel.jbang.version=4.0.0-RC2
-camel.jbang.dependencies=camel:microprofile-health
+camel.jbang.dependencies=camel-console,camel-platform-http-main
camel.health.enabled=true
camel.health.exposure-level=full
-management.endpoints.web.exposure.include=health
-management.health.probes.enabled=true
-management.health.livenessState.enabled=true
-management.health.readinessState.enabled=true
-management.endpoint.health.show-details=always
jkube.version=1.13.1
jkube.build.strategy=jib
jkube.imagePullPolicy=IfNotPresent
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-openshift-application.properties b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-openshift-application.properties
index 3d558bd9..6997a260 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-openshift-application.properties
+++ b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-openshift-application.properties
@@ -4,14 +4,9 @@ camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=camel-main
camel.jbang.version=4.0.0-RC2
-camel.jbang.dependencies=camel:microprofile-health
+camel.jbang.dependencies=camel-console,camel-platform-http-main
camel.health.enabled=true
camel.health.exposure-level=full
-management.endpoints.web.exposure.include=health
-management.health.probes.enabled=true
-management.health.livenessState.enabled=true
-management.health.readinessState.enabled=true
-management.endpoint.health.show-details=always
jkube.version=1.13.1
jkube.build.strategy=jib
jkube.imagePullPolicy=IfNotPresent
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.AggregationStrategy.java b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.AggregationStrategy.java
index 094ee279..a5e29f22 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.AggregationStrategy.java
+++ b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.AggregationStrategy.java
@@ -1,7 +1,9 @@
import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Configuration;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
+@Configuration
@BindToRegistry("NAME")
public class NAME implements AggregationStrategy {
@Override
diff --git a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.Processor.java b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.Processor.java
index 66f39afd..eeef3a7a 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.Processor.java
+++ b/karavan-web/karavan-app/src/main/resources/snippets/camel-main-org.apache.camel.Processor.java
@@ -1,11 +1,13 @@
import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+@Configuration
@BindToRegistry("NAME")
public class NAME implements Processor {
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setBody("Hello World");
- }
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello World");
+ }
}
\ No newline at end of file