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 7a062153 Fix #1465
7a062153 is described below
commit 7a0621534e6867187446e5f475d06e5e9f071602
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Fri Dec 6 12:21:58 2024 -0500
Fix #1465
---
karavan-core/src/core/api/CamelDefinitionYaml.ts | 3 +--
karavan-core/test/yamDataFormat.camel.yaml | 1 -
karavan-core/test/yamDataFormat.spec.ts | 13 -------------
karavan-core/test/yamDataFormat1.camel.yaml | 1 -
karavan-core/test/yamDataFormat2.camel.yaml | 1 -
5 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts
b/karavan-core/src/core/api/CamelDefinitionYaml.ts
index 1023edda..51b93baa 100644
--- a/karavan-core/src/core/api/CamelDefinitionYaml.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts
@@ -240,10 +240,9 @@ export class CamelDefinitionYaml {
return xValue;
}
} else {
- if (value.dslName === 'YAMLDataFormat') { // YAMLDataFormat
constructor field
+ if (value?.dslName === 'YAMLDataFormat') { // YAMLDataFormat
constructor field
value.constructor = value._constructor;
delete value._constructor;
- return value;
}
delete value?.dslName;
return value;
diff --git a/karavan-core/test/yamDataFormat.camel.yaml
b/karavan-core/test/yamDataFormat.camel.yaml
index 641909ae..46dfcedb 100644
--- a/karavan-core/test/yamDataFormat.camel.yaml
+++ b/karavan-core/test/yamDataFormat.camel.yaml
@@ -7,7 +7,6 @@
- marshal:
id: marshal-7abc
yaml:
- dslName: YAMLDataFormat
id: yaml-b347
library: hello
constructor: any-constructor
diff --git a/karavan-core/test/yamDataFormat.spec.ts
b/karavan-core/test/yamDataFormat.spec.ts
index 5a3bbb39..2c4455a8 100644
--- a/karavan-core/test/yamDataFormat.spec.ts
+++ b/karavan-core/test/yamDataFormat.spec.ts
@@ -16,21 +16,8 @@
*/
import {expect} from 'chai';
import 'mocha';
-import {
- FromDefinition,
- LogDefinition,
- WhenDefinition,
- ChoiceDefinition,
- MulticastDefinition,
- ExpressionDefinition,
- RouteDefinition, TryDefinition,CatchDefinition
-} from "../src/core/model/CamelDefinition";
-import {CamelDefinitionApiExt} from "../src/core/api/CamelDefinitionApiExt";
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
-import {SimpleExpression} from "../src/core/model/CamelDefinition";
-import {Integration} from "../src/core/model/IntegrationDefinition";
import * as fs from 'fs';
-import { MarshalDefinition, YAMLDataFormat } from
'../lib/model/CamelDefinition';
describe('YAML Data Format', () => {
diff --git a/karavan-core/test/yamDataFormat1.camel.yaml
b/karavan-core/test/yamDataFormat1.camel.yaml
index dfd3ca68..77996a51 100644
--- a/karavan-core/test/yamDataFormat1.camel.yaml
+++ b/karavan-core/test/yamDataFormat1.camel.yaml
@@ -7,6 +7,5 @@
- marshal:
id: marshal-7abc
yaml:
- dslName: YAMLDataFormat
id: yaml-b347
library: hello
diff --git a/karavan-core/test/yamDataFormat2.camel.yaml
b/karavan-core/test/yamDataFormat2.camel.yaml
index 4b8e8d09..197f3a12 100644
--- a/karavan-core/test/yamDataFormat2.camel.yaml
+++ b/karavan-core/test/yamDataFormat2.camel.yaml
@@ -7,7 +7,6 @@
- marshal:
id: marshal-7abc
yaml:
- dslName: YAMLDataFormat
id: yaml-b347
library: hello
constructor: test
