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/12/15 15:36:04 UTC
(camel-karavan) branch main updated: Fix #1031
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 ddcaf0f4 Fix #1031
ddcaf0f4 is described below
commit ddcaf0f4f2fc9859a4c50cd611874e5681e813f3
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Dec 15 10:35:56 2023 -0500
Fix #1031
---
karavan-core/src/core/api/CamelDefinitionYaml.ts | 7 +++++++
karavan-core/src/core/model/CamelDefinition.ts | 2 +-
karavan-core/src/core/model/CamelMetadata.ts | 8 ++++++++
.../org/apache/camel/karavan/generator/AbstractGenerator.java | 4 +++-
.../apache/camel/karavan/generator/CamelMetadataGenerator.java | 3 ++-
5 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts b/karavan-core/src/core/api/CamelDefinitionYaml.ts
index bf336b7d..5738ea9c 100644
--- a/karavan-core/src/core/api/CamelDefinitionYaml.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts
@@ -182,6 +182,13 @@ export class CamelDefinitionYaml {
stepName === 'noErrorHandler' ||
stepName === 'springTransactionErrorHandler' ||
stepName === 'redeliveryPolicy' ||
+ stepName === 'securityDefinitions' ||
+ stepName === 'apiKey' ||
+ stepName === 'basicAuth' ||
+ stepName === 'bearer' ||
+ stepName === 'mutualTls' ||
+ stepName === 'oauth2' ||
+ stepName === 'openIdConnect' ||
key === 'from'
) {
delete newValue.inArray;
diff --git a/karavan-core/src/core/model/CamelDefinition.ts b/karavan-core/src/core/model/CamelDefinition.ts
index 8a8e121e..232e7498 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -3700,7 +3700,7 @@ export class RestPropertyDefinition extends CamelElement {
}
export class RestSecuritiesDefinition extends CamelElement {
- stepName?: string = 'restSecurities';
+ stepName?: string = 'securityDefinitions';
apiKey?: ApiKeyDefinition;
basicAuth?: BasicAuthDefinition;
bearer?: BearerTokenDefinition;
diff --git a/karavan-core/src/core/model/CamelMetadata.ts b/karavan-core/src/core/model/CamelMetadata.ts
index c863c29f..9b0c2b13 100644
--- a/karavan-core/src/core/model/CamelMetadata.ts
+++ b/karavan-core/src/core/model/CamelMetadata.ts
@@ -2214,6 +2214,14 @@ export const CamelModelMetadata: ElementMeta[] = [
new PropertyMeta('key', 'Key', "Property key", 'string', '', '', true, false, false, false, '', '', false),
new PropertyMeta('value', 'Value', "Property value", 'string', '', '', true, false, false, false, '', '', false),
]),
+ new ElementMeta('securityDefinitions', 'RestSecuritiesDefinition', 'Rest Security Definitions', "To configure rest security definitions.", 'rest,security,configuration', [
+ new PropertyMeta('apiKey', 'apiKey', "apiKey", 'ApiKeyDefinition', '', '', false, false, false, true, '', '', false),
+ new PropertyMeta('basicAuth', 'basicAuth', "basicAuth", 'BasicAuthDefinition', '', '', false, false, false, true, '', '', false),
+ new PropertyMeta('bearer', 'bearer', "bearer", 'BearerTokenDefinition', '', '', false, false, false, true, '', '', false),
+ new PropertyMeta('mutualTls', 'mutualTls', "mutualTls", 'MutualTLSDefinition', '', '', false, false, false, true, '', '', false),
+ new PropertyMeta('oauth2', 'oauth2', "oauth2", 'OAuth2Definition', '', '', false, false, false, true, '', '', false),
+ new PropertyMeta('openIdConnect', 'openIdConnect', "openIdConnect", 'OpenIdConnectDefinition', '', '', false, false, false, true, '', '', false),
+ ]),
new ElementMeta('rests', 'RestsDefinition', 'Rests', "A series of rest services defined using the rest-dsl", 'rest', [
new PropertyMeta('id', 'Id', "Sets the id of this node", 'string', '', '', false, false, false, false, '', '', false),
new PropertyMeta('description', 'Description', "Sets the description of this node", 'string', '', '', false, false, false, false, '', '', false),
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
index 487c7f04..de024364 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/AbstractGenerator.java
@@ -76,6 +76,8 @@ public class AbstractGenerator {
className = "sample";
} else if (className.equals("BeanPropertiesDefinition")) {
className = "properties";
+ } else if (className.equals("RestSecuritiesDefinition")) {
+ className = "securityDefinitions";
} else if (className.endsWith("Definition")) {
className = className.substring(0, className.length() - 10);
} else if (className.endsWith("DataFormat")){
@@ -237,7 +239,7 @@ public class AbstractGenerator {
Files.createDirectories(path);
}
File targetFile = Paths.get(folder, fileName).toFile();
- LOGGER.info("Saving file " + targetFile.getAbsolutePath());
+// LOGGER.info("Saving file " + targetFile.getAbsolutePath());
Files.copy(new ByteArrayInputStream(text.getBytes()), targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
e.printStackTrace();
diff --git a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java
index 6f0f75ec..cb69b8ee 100644
--- a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java
+++ b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelMetadataGenerator.java
@@ -151,7 +151,6 @@ public final class CamelMetadataGenerator extends AbstractGenerator {
code.append(String.format("export const %s: ElementMeta[] = [\n", className));
classProps.entrySet().stream().filter(entry -> {
if (entry.getValue() == null) {
-// System.out.println(entry.getKey());
return false;
} else {
return true;
@@ -199,6 +198,8 @@ public final class CamelMetadataGenerator extends AbstractGenerator {
}
});
code.append(" ]),\n");
+ } else {
+ System.out.println("Empty JSON for class: " + name + " as a stepName " + stepName);
}
});
code.append("]\n\n");