This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new da4848cba96 Camel-Milvus: Improve headers (#13535)
da4848cba96 is described below
commit da4848cba966d21c41940ed242d6f99552195245
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Mar 19 14:03:22 2024 +0100
Camel-Milvus: Improve headers (#13535)
* Camel-Milvus Test Infra: Align langchain embeddings component to new usage
Signed-off-by: Andrea Cosentino <[email protected]>
* Camel-Milvus: Improve headers
Signed-off-by: Andrea Cosentino <[email protected]>
* Camel-Milvus: Improve headers
Signed-off-by: Andrea Cosentino <[email protected]>
---------
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../apache/camel/catalog/components/milvus.json | 8 +---
.../org/apache/camel/component/milvus/milvus.json | 8 +---
.../org/apache/camel/component/milvus/Milvus.java | 14 ------
.../camel/component/milvus/MilvusProducer.java | 1 +
.../endpoint/dsl/MilvusEndpointBuilderFactory.java | 54 ----------------------
5 files changed, 5 insertions(+), 80 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json
index 21e7d75e8e7..4e470ce0c9c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milvus.json
@@ -33,12 +33,8 @@
},
"headers": {
"CamelMilvusAction": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"enum": [ "CREATE_COLLECTION", "CREATE_INDEX", "UPSERT", "INSERT", "SEARCH",
"DELETE" ], "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The action to be performed.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#ACTION" },
- "CamelMilvusOperationID": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "long",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Operation ID.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_ID" },
- "CamelMilvusOperationStatus": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" },
- "CamelMilvusOperationStatusValue": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "int", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status Value.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" },
- "CamelMilvusWithPayload": { "index": 4, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "defaultValue": "true", "description": "Include Payload.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_PAYLOAD" },
- "CamelMilvusWithVectors": { "index": 5, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "defaultValue": "false", "description": "Include Vectors.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_VECTORS" },
- "CamelMilvusSize": { "index": 6, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "int",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The number of elements.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#SIZE" }
+ "CamelMilvusOperationStatus": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" },
+ "CamelMilvusOperationStatusValue": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "int", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status Value.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" }
},
"properties": {
"collection": { "index": 0, "kind": "path", "displayName": "Collection",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The collection Name" },
diff --git
a/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json
b/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json
index 21e7d75e8e7..4e470ce0c9c 100644
---
a/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json
+++
b/components/camel-milvus/src/generated/resources/META-INF/org/apache/camel/component/milvus/milvus.json
@@ -33,12 +33,8 @@
},
"headers": {
"CamelMilvusAction": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"enum": [ "CREATE_COLLECTION", "CREATE_INDEX", "UPSERT", "INSERT", "SEARCH",
"DELETE" ], "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The action to be performed.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#ACTION" },
- "CamelMilvusOperationID": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "long",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Operation ID.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_ID" },
- "CamelMilvusOperationStatus": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" },
- "CamelMilvusOperationStatusValue": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "int", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status Value.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" },
- "CamelMilvusWithPayload": { "index": 4, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "defaultValue": "true", "description": "Include Payload.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_PAYLOAD" },
- "CamelMilvusWithVectors": { "index": 5, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "defaultValue": "false", "description": "Include Vectors.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#INCLUDE_VECTORS" },
- "CamelMilvusSize": { "index": 6, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "int",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The number of elements.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#SIZE" }
+ "CamelMilvusOperationStatus": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status.", "constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS" },
+ "CamelMilvusOperationStatusValue": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "int", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status Value.",
"constantName":
"org.apache.camel.component.milvus.Milvus$Headers#OPERATION_STATUS_VALUE" }
},
"properties": {
"collection": { "index": 0, "kind": "path", "displayName": "Collection",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The collection Name" },
diff --git
a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java
b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java
index dbf45547b05..ebc92861673 100644
---
a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java
+++
b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/Milvus.java
@@ -29,24 +29,10 @@ public class Milvus {
enums =
"CREATE_COLLECTION,CREATE_INDEX,UPSERT,INSERT,SEARCH,DELETE")
public static final String ACTION = "CamelMilvusAction";
- @Metadata(description = "Operation ID.", javaType = "long")
- public static final String OPERATION_ID = "CamelMilvusOperationID";
-
@Metadata(description = "Operation Status.", javaType = "String")
public static final String OPERATION_STATUS =
"CamelMilvusOperationStatus";
@Metadata(description = "Operation Status Value.", javaType = "int")
public static final String OPERATION_STATUS_VALUE =
"CamelMilvusOperationStatusValue";
-
- @Metadata(description = "Include Payload.", javaType = "boolean",
defaultValue = "true")
- public static final String INCLUDE_PAYLOAD = "CamelMilvusWithPayload";
- public static final boolean DEFAULT_INCLUDE_PAYLOAD = true;
-
- @Metadata(description = "Include Vectors.", javaType = "boolean",
defaultValue = "false")
- public static final String INCLUDE_VECTORS = "CamelMilvusWithVectors";
- public static final boolean DEFAULT_INCLUDE_VECTORS = false;
-
- @Metadata(description = "The number of elements.", javaType = "int")
- public static final String SIZE = "CamelMilvusSize";
}
}
diff --git
a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java
b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java
index c6f23fcc687..cf58965ca76 100644
---
a/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java
+++
b/components/camel-milvus/src/main/java/org/apache/camel/component/milvus/MilvusProducer.java
@@ -186,6 +186,7 @@ public class MilvusProducer extends DefaultProducer {
private void populateResponse(R<?> r, Exchange exchange) {
Message out = exchange.getMessage();
out.setHeader(Milvus.Headers.OPERATION_STATUS, r.getStatus());
+ out.setHeader(Milvus.Headers.OPERATION_STATUS_VALUE,
r.getStatus().intValue());
out.setBody(r.getData());
}
}
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java
index 8296e4289f9..b3bd1f451cb 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MilvusEndpointBuilderFactory.java
@@ -269,19 +269,6 @@ public interface MilvusEndpointBuilderFactory {
return "CamelMilvusAction";
}
- /**
- * Operation ID.
- *
- * The option is a: {@code long} type.
- *
- * Group: producer
- *
- * @return the name of the header {@code MilvusOperationID}.
- */
- public String milvusOperationID() {
- return "CamelMilvusOperationID";
- }
-
/**
* Operation Status.
*
@@ -307,47 +294,6 @@ public interface MilvusEndpointBuilderFactory {
public String milvusOperationStatusValue() {
return "CamelMilvusOperationStatusValue";
}
-
- /**
- * Include Payload.
- *
- * The option is a: {@code boolean} type.
- *
- * Default: true
- * Group: producer
- *
- * @return the name of the header {@code MilvusWithPayload}.
- */
- public String milvusWithPayload() {
- return "CamelMilvusWithPayload";
- }
-
- /**
- * Include Vectors.
- *
- * The option is a: {@code boolean} type.
- *
- * Default: false
- * Group: producer
- *
- * @return the name of the header {@code MilvusWithVectors}.
- */
- public String milvusWithVectors() {
- return "CamelMilvusWithVectors";
- }
-
- /**
- * The number of elements.
- *
- * The option is a: {@code int} type.
- *
- * Group: producer
- *
- * @return the name of the header {@code MilvusSize}.
- */
- public String milvusSize() {
- return "CamelMilvusSize";
- }
}
static MilvusEndpointBuilder endpointBuilder(
String componentName,
