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/01 21:53:27 UTC
[camel-karavan] branch main updated: Camel-main runtme in vscode #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 f4aa2f6b Camel-main runtme in vscode #839
f4aa2f6b is described below
commit f4aa2f6b54bc62eefe7d747e29b2f7775586e602
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Aug 1 17:53:17 2023 -0400
Camel-main runtme in vscode #839
---
.../snippets/org.apache.camel.AggregationStrategy | 25 ++++++----------------
.../public/snippets/org.apache.camel.Processor | 7 ++----
karavan-vscode/CHANGELOG.md | 9 ++++----
karavan-vscode/package.json | 2 +-
...-main-org.apache.camel.AggregationStrategy.java | 7 ++----
.../camel-main-org.apache.camel.Processor.java | 7 ++----
karavan-vscode/src/exec.ts | 2 +-
karavan-vscode/src/extension.ts | 1 +
karavan-vscode/webview/App.tsx | 2 +-
9 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/karavan-designer/public/snippets/org.apache.camel.AggregationStrategy b/karavan-designer/public/snippets/org.apache.camel.AggregationStrategy
index 4dcc8829..66f39afd 100644
--- a/karavan-designer/public/snippets/org.apache.camel.AggregationStrategy
+++ b/karavan-designer/public/snippets/org.apache.camel.AggregationStrategy
@@ -1,22 +1,11 @@
-import org.apache.camel.AggregationStrategy;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
-import javax.inject.Named;
-import javax.inject.Singleton;
+@BindToRegistry("NAME")
+public class NAME implements Processor {
-@Singleton
-@Named("NAME")
-public class NAME implements AggregationStrategy {
- @Override
- public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
-
- if (oldExchange == null) {
- return newExchange;
- }
-
- String oldBody = oldExchange.getIn().getBody(String.class);
- String newBody = newExchange.getIn().getBody(String.class);
- oldExchange.getIn().setBody(oldBody + "+" + newBody);
- return oldExchange;
- }
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello World");
+ }
}
\ No newline at end of file
diff --git a/karavan-designer/public/snippets/org.apache.camel.Processor b/karavan-designer/public/snippets/org.apache.camel.Processor
index 6b813234..66f39afd 100644
--- a/karavan-designer/public/snippets/org.apache.camel.Processor
+++ b/karavan-designer/public/snippets/org.apache.camel.Processor
@@ -1,11 +1,8 @@
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-@Singleton
-@Named("NAME")
+@BindToRegistry("NAME")
public class NAME implements Processor {
public void process(Exchange exchange) throws Exception {
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index 8de11376..2352520c 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -2,10 +2,11 @@
## 4.0.0-RC2
0. Camel 4.0.0-RC2
-1. Kamelets 4.0.0-RC1
-2. Spring Boot 3.1.2
-3. jkube 1.13.1
-4. Quarkus 3.2.2.Final
+1. Camel-main Runtime
+2. Kamelets 4.0.0-RC1
+3. Spring Boot 3.1.2
+4. jkube 1.13.1
+5. Quarkus 3.2.2.Final
## 3.21.0
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 73546fe3..9784d538 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -69,7 +69,7 @@
},
"camel.runtimes": {
"type": "string",
- "default": "quarkus",
+ "default": "camel-main",
"enum": [
"camel-main",
"quarkus",
diff --git a/karavan-designer/public/snippets/org.apache.camel.AggregationStrategy b/karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java
similarity index 86%
copy from karavan-designer/public/snippets/org.apache.camel.AggregationStrategy
copy to karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java
index 4dcc8829..094ee279 100644
--- a/karavan-designer/public/snippets/org.apache.camel.AggregationStrategy
+++ b/karavan-vscode/snippets/camel-main-org.apache.camel.AggregationStrategy.java
@@ -1,11 +1,8 @@
import org.apache.camel.AggregationStrategy;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-@Singleton
-@Named("NAME")
+@BindToRegistry("NAME")
public class NAME implements AggregationStrategy {
@Override
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
diff --git a/karavan-designer/public/snippets/org.apache.camel.Processor b/karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java
similarity index 72%
copy from karavan-designer/public/snippets/org.apache.camel.Processor
copy to karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java
index 6b813234..66f39afd 100644
--- a/karavan-designer/public/snippets/org.apache.camel.Processor
+++ b/karavan-vscode/snippets/camel-main-org.apache.camel.Processor.java
@@ -1,11 +1,8 @@
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-@Singleton
-@Named("NAME")
+@BindToRegistry("NAME")
public class NAME implements Processor {
public void process(Exchange exchange) throws Exception {
diff --git a/karavan-vscode/src/exec.ts b/karavan-vscode/src/exec.ts
index 1511e5c2..dbede1c3 100644
--- a/karavan-vscode/src/exec.ts
+++ b/karavan-vscode/src/exec.ts
@@ -48,7 +48,7 @@ export async function runWithRuntime(fullPath: string, run?: boolean) {
let command = jbang.createExportCommand(fullPath);
if (run) {
const runtime = await utils.getRuntime();
- const mvn = runtime === 'quarkus' ? "quarkus:dev" : "spring-boot:run";
+ const mvn = runtime === 'quarkus' ? "quarkus:dev" : (runtime === 'spring-boot' ? "spring-boot:run" : "camel:run");
command = command.concat(" && mvn clean ").concat(mvn).concat(" -f ").concat(fullPath);
}
execTerminalCommand("runtime-run", command);
diff --git a/karavan-vscode/src/extension.ts b/karavan-vscode/src/extension.ts
index bff29787..17eea70a 100644
--- a/karavan-vscode/src/extension.ts
+++ b/karavan-vscode/src/extension.ts
@@ -73,6 +73,7 @@ export function activate(context: ExtensionContext) {
const defaultRuntime: string = workspace.getConfiguration().get("camel.runtimes") || '';
const deployTarget: string = workspace.getConfiguration().get("camel.deployTarget") || 'openshift';
const runtimeOptions: QuickPickItem[] = [
+ { label: "camel-main", picked: "camel-main" === defaultRuntime },
{ label: "quarkus", picked: "quarkus" === defaultRuntime },
{ label: "spring-boot", picked: "spring-boot" === defaultRuntime }
];
diff --git a/karavan-vscode/webview/App.tsx b/karavan-vscode/webview/App.tsx
index 50adb9aa..33952d7f 100644
--- a/karavan-vscode/webview/App.tsx
+++ b/karavan-vscode/webview/App.tsx
@@ -195,7 +195,7 @@ class App extends React.Component<Props, State> {
onSaveCustomCode={(name, code) => this.saveJavCode(name, code)}
onGetCustomCode={(name, javaType) => {
let code = TemplateApi.getJavaCode(name);
- if (code === undefined || code.length === 0) code = TemplateApi.generateCode(name, javaType);
+ if (code === undefined || code.length === 0) code = TemplateApi.generateCode(javaType, name);
return new Promise<string | undefined>(resolve => resolve(code))
}}
/>