This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 17cdc892eec camel-pubnub: upgrade to v10 client
17cdc892eec is described below
commit 17cdc892eec7b01736abb889f37fc7d9f0a685e7
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Nov 15 10:50:13 2024 +0100
camel-pubnub: upgrade to v10 client
---
.../apache/camel/catalog/components/pubnub.json | 24 +++---
.../apache/camel/catalog/main/sensitive-keys.json | 1 -
.../pubnub/PubNubComponentConfigurer.java | 6 --
.../component/pubnub/PubNubEndpointConfigurer.java | 10 +--
.../component/pubnub/PubNubEndpointUriFactory.java | 6 +-
.../org/apache/camel/component/pubnub/pubnub.json | 24 +++---
.../component/pubnub/PubNubConfiguration.java | 17 +----
.../camel/component/pubnub/PubNubConsumer.java | 15 ++--
.../camel/component/pubnub/PubNubEndpoint.java | 18 ++---
.../camel/component/pubnub/PubNubTestBase.java | 27 ++++---
.../java/org/apache/camel/util/SensitiveUtils.java | 4 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_9.adoc | 4 +
.../dsl/PubnubComponentBuilderFactory.java | 23 ++----
.../endpoint/dsl/PubNubEndpointBuilderFactory.java | 87 +++++++---------------
parent/pom.xml | 2 +-
15 files changed, 94 insertions(+), 174 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
index 4fe6a528bcb..0ecd522f4ed 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
@@ -31,12 +31,11 @@
"lazyStartProducer": { "index": 4, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "HERENOW", "GETSTATE", "SETSTATE",
"GETHISTORY", "PUBLISH", "FIRE" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The operation to perform. PUBL [...]
"autowiredEnabled": { "index": 6, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
- "authKey": { "index": 7, "kind": "property", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests." },
- "cipherKey": { "index": 8, "kind": "property", "displayName": "Cipher
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If cipher is passed, all communications
to\/from PubNub will be encrypted." },
- "publishKey": { "index": 9, "kind": "property", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
- "secretKey": { "index": 10, "kind": "property", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
- "secure": { "index": 11, "kind": "property", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
- "subscribeKey": { "index": 12, "kind": "property", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listening [...]
+ "authKey": { "index": 7, "kind": "property", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests. Default value notice: This [...]
+ "publishKey": { "index": 8, "kind": "property", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
+ "secretKey": { "index": 9, "kind": "property", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
+ "secure": { "index": 10, "kind": "property", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
+ "subscribeKey": { "index": 11, "kind": "property", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listening [...]
},
"headers": {
"CamelPubNubOperation": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The operation to perform.", "constantName":
"org.apache.camel.component.pubnub.PubNubConstants#OPERATION" },
@@ -53,12 +52,11 @@
"exchangePattern": { "index": 5, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"operation": { "index": 6, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "enum": [ "HERENOW",
"GETSTATE", "SETSTATE", "GETHISTORY", "PUBLISH", "FIRE" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The operation to perform. PUB [...]
"lazyStartProducer": { "index": 7, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produc [...]
- "pubnub": { "index": 8, "kind": "parameter", "displayName": "Pubnub",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.pubnub.api.PubNub", "deprecated": false, "deprecationNote":
"", "autowired": true, "secret": false, "description": "Reference to a Pubnub
client in the registry." },
- "authKey": { "index": 9, "kind": "parameter", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests." },
- "cipherKey": { "index": 10, "kind": "parameter", "displayName": "Cipher
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If cipher is passed, all communications
to\/from PubNub will be encrypted." },
- "publishKey": { "index": 11, "kind": "parameter", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
- "secretKey": { "index": 12, "kind": "parameter", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
- "secure": { "index": 13, "kind": "parameter", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
- "subscribeKey": { "index": 14, "kind": "parameter", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listenin [...]
+ "pubnub": { "index": 8, "kind": "parameter", "displayName": "Pubnub",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.pubnub.api.java.PubNub", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false, "description":
"Reference to a Pubnub client in the registry." },
+ "authKey": { "index": 9, "kind": "parameter", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests. Default value notice: This [...]
+ "publishKey": { "index": 10, "kind": "parameter", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
+ "secretKey": { "index": 11, "kind": "parameter", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
+ "secure": { "index": 12, "kind": "parameter", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
+ "subscribeKey": { "index": 13, "kind": "parameter", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listenin [...]
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
index b429b387897..167f9d6a91d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
@@ -16,7 +16,6 @@
"blobaccesskey",
"blobstoragesharedkeycredential",
"certresourcepassword",
- "cipherkey",
"clientid",
"clientsecret",
"clientsecretcredential",
diff --git
a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubComponentConfigurer.java
b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubComponentConfigurer.java
index e8c94a04cde..e6dd8bcd592 100644
---
a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubComponentConfigurer.java
+++
b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubComponentConfigurer.java
@@ -36,8 +36,6 @@ public class PubNubComponentConfigurer extends
PropertyConfigurerSupport impleme
case "autowiredEnabled":
target.setAutowiredEnabled(property(camelContext, boolean.class, value));
return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
- case "cipherkey":
- case "cipherKey":
getOrCreateConfiguration(target).setCipherKey(property(camelContext,
java.lang.String.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext,
org.apache.camel.component.pubnub.PubNubConfiguration.class, value)); return
true;
case "lazystartproducer":
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
@@ -65,8 +63,6 @@ public class PubNubComponentConfigurer extends
PropertyConfigurerSupport impleme
case "autowiredEnabled": return boolean.class;
case "bridgeerrorhandler":
case "bridgeErrorHandler": return boolean.class;
- case "cipherkey":
- case "cipherKey": return java.lang.String.class;
case "configuration": return
org.apache.camel.component.pubnub.PubNubConfiguration.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
@@ -95,8 +91,6 @@ public class PubNubComponentConfigurer extends
PropertyConfigurerSupport impleme
case "autowiredEnabled": return target.isAutowiredEnabled();
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
- case "cipherkey":
- case "cipherKey": return
getOrCreateConfiguration(target).getCipherKey();
case "configuration": return target.getConfiguration();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
diff --git
a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointConfigurer.java
b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointConfigurer.java
index c3b5d296ee9..60de398a2a6 100644
---
a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointConfigurer.java
+++
b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointConfigurer.java
@@ -27,8 +27,6 @@ public class PubNubEndpointConfigurer extends
PropertyConfigurerSupport implemen
case "authKey":
target.getConfiguration().setAuthKey(property(camelContext,
java.lang.String.class, value)); return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
- case "cipherkey":
- case "cipherKey":
target.getConfiguration().setCipherKey(property(camelContext,
java.lang.String.class, value)); return true;
case "exceptionhandler":
case "exceptionHandler":
target.setExceptionHandler(property(camelContext,
org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exchangepattern":
@@ -38,7 +36,7 @@ public class PubNubEndpointConfigurer extends
PropertyConfigurerSupport implemen
case "operation":
target.getConfiguration().setOperation(property(camelContext,
java.lang.String.class, value)); return true;
case "publishkey":
case "publishKey":
target.getConfiguration().setPublishKey(property(camelContext,
java.lang.String.class, value)); return true;
- case "pubnub": target.setPubnub(property(camelContext,
com.pubnub.api.PubNub.class, value)); return true;
+ case "pubnub": target.setPubnub(property(camelContext,
com.pubnub.api.java.PubNub.class, value)); return true;
case "secretkey":
case "secretKey":
target.getConfiguration().setSecretKey(property(camelContext,
java.lang.String.class, value)); return true;
case "secure":
target.getConfiguration().setSecure(property(camelContext, boolean.class,
value)); return true;
@@ -63,8 +61,6 @@ public class PubNubEndpointConfigurer extends
PropertyConfigurerSupport implemen
case "authKey": return java.lang.String.class;
case "bridgeerrorhandler":
case "bridgeErrorHandler": return boolean.class;
- case "cipherkey":
- case "cipherKey": return java.lang.String.class;
case "exceptionhandler":
case "exceptionHandler": return
org.apache.camel.spi.ExceptionHandler.class;
case "exchangepattern":
@@ -74,7 +70,7 @@ public class PubNubEndpointConfigurer extends
PropertyConfigurerSupport implemen
case "operation": return java.lang.String.class;
case "publishkey":
case "publishKey": return java.lang.String.class;
- case "pubnub": return com.pubnub.api.PubNub.class;
+ case "pubnub": return com.pubnub.api.java.PubNub.class;
case "secretkey":
case "secretKey": return java.lang.String.class;
case "secure": return boolean.class;
@@ -95,8 +91,6 @@ public class PubNubEndpointConfigurer extends
PropertyConfigurerSupport implemen
case "authKey": return target.getConfiguration().getAuthKey();
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
- case "cipherkey":
- case "cipherKey": return target.getConfiguration().getCipherKey();
case "exceptionhandler":
case "exceptionHandler": return target.getExceptionHandler();
case "exchangepattern":
diff --git
a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
index 2eb6afef01c..2905ade614c 100644
---
a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
+++
b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
@@ -23,11 +23,10 @@ public class PubNubEndpointUriFactory extends
org.apache.camel.support.component
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(15);
+ Set<String> props = new HashSet<>(14);
props.add("authKey");
props.add("bridgeErrorHandler");
props.add("channel");
- props.add("cipherKey");
props.add("exceptionHandler");
props.add("exchangePattern");
props.add("lazyStartProducer");
@@ -40,9 +39,8 @@ public class PubNubEndpointUriFactory extends
org.apache.camel.support.component
props.add("uuid");
props.add("withPresence");
PROPERTY_NAMES = Collections.unmodifiableSet(props);
- Set<String> secretProps = new HashSet<>(5);
+ Set<String> secretProps = new HashSet<>(4);
secretProps.add("authKey");
- secretProps.add("cipherKey");
secretProps.add("publishKey");
secretProps.add("secretKey");
secretProps.add("subscribeKey");
diff --git
a/components/camel-pubnub/src/generated/resources/META-INF/org/apache/camel/component/pubnub/pubnub.json
b/components/camel-pubnub/src/generated/resources/META-INF/org/apache/camel/component/pubnub/pubnub.json
index 4fe6a528bcb..0ecd522f4ed 100644
---
a/components/camel-pubnub/src/generated/resources/META-INF/org/apache/camel/component/pubnub/pubnub.json
+++
b/components/camel-pubnub/src/generated/resources/META-INF/org/apache/camel/component/pubnub/pubnub.json
@@ -31,12 +31,11 @@
"lazyStartProducer": { "index": 4, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "HERENOW", "GETSTATE", "SETSTATE",
"GETHISTORY", "PUBLISH", "FIRE" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The operation to perform. PUBL [...]
"autowiredEnabled": { "index": 6, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
- "authKey": { "index": 7, "kind": "property", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests." },
- "cipherKey": { "index": 8, "kind": "property", "displayName": "Cipher
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If cipher is passed, all communications
to\/from PubNub will be encrypted." },
- "publishKey": { "index": 9, "kind": "property", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
- "secretKey": { "index": 10, "kind": "property", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
- "secure": { "index": 11, "kind": "property", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
- "subscribeKey": { "index": 12, "kind": "property", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listening [...]
+ "authKey": { "index": 7, "kind": "property", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests. Default value notice: This [...]
+ "publishKey": { "index": 8, "kind": "property", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
+ "secretKey": { "index": 9, "kind": "property", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
+ "secure": { "index": 10, "kind": "property", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
+ "subscribeKey": { "index": 11, "kind": "property", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listening [...]
},
"headers": {
"CamelPubNubOperation": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The operation to perform.", "constantName":
"org.apache.camel.component.pubnub.PubNubConstants#OPERATION" },
@@ -53,12 +52,11 @@
"exchangePattern": { "index": 5, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"operation": { "index": 6, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "enum": [ "HERENOW",
"GETSTATE", "SETSTATE", "GETHISTORY", "PUBLISH", "FIRE" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The operation to perform. PUB [...]
"lazyStartProducer": { "index": 7, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produc [...]
- "pubnub": { "index": 8, "kind": "parameter", "displayName": "Pubnub",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.pubnub.api.PubNub", "deprecated": false, "deprecationNote":
"", "autowired": true, "secret": false, "description": "Reference to a Pubnub
client in the registry." },
- "authKey": { "index": 9, "kind": "parameter", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests." },
- "cipherKey": { "index": 10, "kind": "parameter", "displayName": "Cipher
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If cipher is passed, all communications
to\/from PubNub will be encrypted." },
- "publishKey": { "index": 11, "kind": "parameter", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
- "secretKey": { "index": 12, "kind": "parameter", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
- "secure": { "index": 13, "kind": "parameter", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
- "subscribeKey": { "index": 14, "kind": "parameter", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listenin [...]
+ "pubnub": { "index": 8, "kind": "parameter", "displayName": "Pubnub",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.pubnub.api.java.PubNub", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false, "description":
"Reference to a Pubnub client in the registry." },
+ "authKey": { "index": 9, "kind": "parameter", "displayName": "Auth Key",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "If Access Manager is utilized, client will use
this authKey in all restricted requests. Default value notice: This [...]
+ "publishKey": { "index": 10, "kind": "parameter", "displayName": "Publish
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The publish key obtained from your PubNub
account. Required when publishing messages." },
+ "secretKey": { "index": 11, "kind": "parameter", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The secret key used for message signing." },
+ "secure": { "index": 12, "kind": "parameter", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "Use SSL for secure transmission." },
+ "subscribeKey": { "index": 13, "kind": "parameter", "displayName":
"Subscribe Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.pubnub.PubNubConfiguration", "configurationField":
"configuration", "description": "The subscribe key obtained from your PubNub
account. Required when subscribing to channels or listenin [...]
}
}
diff --git
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConfiguration.java
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConfiguration.java
index 8b0227abe27..87d4908d86c 100644
---
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConfiguration.java
+++
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConfiguration.java
@@ -34,10 +34,10 @@ public class PubNubConfiguration implements Cloneable {
private String subscribeKey;
@UriParam(label = "security", secret = true)
private String secretKey;
- @UriParam(label = "security", secret = true)
+ @Deprecated
+ @UriParam(label = "security", secret = true,
+ defaultValueNote = "This setting is deprecated because it
relates to deprecated Access Manager (PAM V2) and will be removed in the
future. Please, migrate to new Access Manager (PAM V3)
https://www.pubnub.com/docs/general/resources/migration-guides/pam-v3-migration";)
private String authKey;
- @UriParam(label = "security", secret = true)
- private String cipherKey;
@UriParam(label = "security", defaultValue = "true")
private boolean secure = true;
@UriParam
@@ -101,17 +101,6 @@ public class PubNubConfiguration implements Cloneable {
this.authKey = authKey;
}
- /**
- * If cipher is passed, all communications to/from PubNub will be
encrypted.
- */
- public String getCipherKey() {
- return cipherKey;
- }
-
- public void setCipherKey(String cipherKey) {
- this.cipherKey = cipherKey;
- }
-
/**
* Use SSL for secure transmission.
*/
diff --git
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
index 54ef929f7c4..07b0a91c55c 100644
---
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
+++
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.pubnub;
import java.util.Arrays;
-import com.pubnub.api.PubNub;
-import com.pubnub.api.callbacks.SubscribeCallback;
+import com.pubnub.api.java.PubNub;
+import com.pubnub.api.java.callbacks.SubscribeCallback;
+import
com.pubnub.api.java.models.consumer.objects_api.channel.PNChannelMetadataResult;
+import
com.pubnub.api.java.models.consumer.objects_api.membership.PNMembershipResult;
+import
com.pubnub.api.java.models.consumer.objects_api.uuid.PNUUIDMetadataResult;
import com.pubnub.api.models.consumer.PNStatus;
-import
com.pubnub.api.models.consumer.objects_api.channel.PNChannelMetadataResult;
-import
com.pubnub.api.models.consumer.objects_api.membership.PNMembershipResult;
-import com.pubnub.api.models.consumer.objects_api.uuid.PNUUIDMetadataResult;
import com.pubnub.api.models.consumer.pubsub.PNMessageResult;
import com.pubnub.api.models.consumer.pubsub.PNPresenceEventResult;
import com.pubnub.api.models.consumer.pubsub.PNSignalResult;
@@ -145,9 +145,6 @@ public class PubNubConsumer extends DefaultConsumer {
/**
* signal, user, space, membership, messageAction, presence, and file
listeners are mandatory and you MUST at
* least provide no op implementations for these listeners
- *
- * @param pubnub
- * @param pnSignalResult
*/
@Override
public void signal(@NotNull PubNub pubnub, @NotNull PNSignalResult
pnSignalResult) {
@@ -161,7 +158,7 @@ public class PubNubConsumer extends DefaultConsumer {
@Override
public void channel(@NotNull PubNub pubnub, @NotNull
PNChannelMetadataResult pnChannelMetadataResult) {
- LOG.trace("uuid: {}.", pnChannelMetadataResult);
+ LOG.trace("channel: {}.", pnChannelMetadataResult);
}
@Override
diff --git
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubEndpoint.java
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubEndpoint.java
index 54f6d113dde..b837a11281f 100644
---
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubEndpoint.java
+++
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubEndpoint.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.pubnub;
-import com.pubnub.api.PNConfiguration;
-import com.pubnub.api.PubNub;
import com.pubnub.api.PubNubException;
import com.pubnub.api.UserId;
+import com.pubnub.api.java.PubNub;
+import com.pubnub.api.java.v2.PNConfiguration;
import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -89,13 +89,11 @@ public class PubNubEndpoint extends DefaultEndpoint {
}
private PubNub getInstance() throws PubNubException {
- PNConfiguration pnConfiguration = new PNConfiguration(new
UserId(configuration.getUuid()));
- pnConfiguration.setPublishKey(configuration.getPublishKey());
- pnConfiguration.setSubscribeKey(configuration.getSubscribeKey());
- pnConfiguration.setSecretKey(configuration.getSecretKey());
- pnConfiguration.setAuthKey(configuration.getAuthKey());
- pnConfiguration.setCipherKey(configuration.getCipherKey());
- pnConfiguration.setSecure(configuration.isSecure());
- return PubNub.create(pnConfiguration);
+ PNConfiguration config = PNConfiguration.builder(new
UserId(configuration.getUuid()), configuration.getSubscribeKey())
+ .publishKey(configuration.getPublishKey())
+ .secretKey(configuration.getSecretKey())
+ .authKey(configuration.getAuthKey())
+ .secure(configuration.isSecure()).build();
+ return PubNub.create(config);
}
}
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
index f100cf141b6..5fcda51f1f7 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.pubnub;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
-import com.pubnub.api.PNConfiguration;
import com.pubnub.api.PubNub;
-import com.pubnub.api.PubNubException;
import com.pubnub.api.UserId;
import com.pubnub.api.enums.PNLogVerbosity;
-import com.pubnub.internal.PubNubImpl;
+import com.pubnub.api.java.v2.PNConfiguration;
+import com.pubnub.internal.java.PubNubForJavaImpl;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -57,20 +56,20 @@ public class PubNubTestBase extends CamelTestSupport {
}
private PubNub createPubNubInstance() {
- PNConfiguration pnConfiguration = null;
+ PNConfiguration config;
try {
- pnConfiguration = new PNConfiguration(new UserId("myUUID"));
- } catch (PubNubException e) {
+ config = PNConfiguration.builder(new UserId("myUUID"),
"mySubscribeKey")
+ .publishKey("myPublishKey")
+ .secure(false)
+ .origin("localhost" + ":" + port)
+ .logVerbosity(PNLogVerbosity.NONE)
+ .heartbeatNotificationOptions(NONE)
+ .build();
+ } catch (Exception e) {
throw new RuntimeException(e);
}
- pnConfiguration.setOrigin("localhost" + ":" + port);
- pnConfiguration.setSecure(false);
- pnConfiguration.setSubscribeKey("mySubscribeKey");
- pnConfiguration.setPublishKey("myPublishKey");
- pnConfiguration.setLogVerbosity(PNLogVerbosity.NONE);
- pnConfiguration.setHeartbeatNotificationOptions(NONE);
- class MockedTimePubNub extends PubNubImpl {
+ class MockedTimePubNub extends PubNubForJavaImpl {
MockedTimePubNub(PNConfiguration initialConfig) {
super(initialConfig);
@@ -88,6 +87,6 @@ public class PubNubTestBase extends CamelTestSupport {
}
- return new MockedTimePubNub(pnConfiguration);
+ return new MockedTimePubNub(config);
}
}
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 28a3db9051f..65013bc2da4 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -45,7 +45,6 @@ public final class SensitiveUtils {
"blobaccesskey",
"blobstoragesharedkeycredential",
"certresourcepassword",
- "cipherkey",
"clientid",
"clientsecret",
"clientsecretcredential",
@@ -125,7 +124,6 @@ public final class SensitiveUtils {
+ "|\\Qblobaccesskey\\E"
+
"|\\Qblobstoragesharedkeycredential\\E"
+
"|\\Qcertresourcepassword\\E"
- + "|\\Qcipherkey\\E"
+ "|\\Qclientid\\E"
+ "|\\Qclientsecret\\E"
+
"|\\Qclientsecretcredential\\E"
@@ -182,7 +180,7 @@ public final class SensitiveUtils {
+ "|\\Qverificationcode\\E"
+
"|\\Qwebhookverifytoken\\E"
+
"|\\Qzookeeperpassword\\E"
- // SENSITIVE-PATTERN: END
+ // SENSITIVE-PATTERN: END
;
private SensitiveUtils() {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_9.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_9.adoc
index 83c40879fc0..d7dfc36f6cc 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_9.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_9.adoc
@@ -37,6 +37,10 @@ The `camel-opentelemetry` component has had significant bug
fixes to handle span
better when Camel route messages synchronously and asynchronously. This
component should also work better
on Spring Boot.
+=== camel-pubnub
+
+Upgraded to pubnub client to 10.x which removed the `cipherKey` option.
+
=== camel-smooks
Upgraded Smooks from version 2.0.0-RC4 to version 2.0.1 which has
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
index fb950d8d3b7..14138e9639d 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
@@ -202,7 +202,10 @@ public interface PubnubComponentBuilderFactory {
/**
* If Access Manager is utilized, client will use this authKey in all
- * restricted requests.
+ * restricted requests. Default value notice: This setting is
deprecated
+ * because it relates to deprecated Access Manager (PAM V2) and will be
+ * removed in the future. Please, migrate to new Access Manager (PAM
V3)
+ *
https://www.pubnub.com/docs/general/resources/migration-guides/pam-v3-migration.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -211,27 +214,12 @@ public interface PubnubComponentBuilderFactory {
* @param authKey the value to set
* @return the dsl builder
*/
+ @Deprecated
default PubnubComponentBuilder authKey(java.lang.String authKey) {
doSetProperty("authKey", authKey);
return this;
}
- /**
- * If cipher is passed, all communications to/from PubNub will be
- * encrypted.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- *
- * @param cipherKey the value to set
- * @return the dsl builder
- */
- default PubnubComponentBuilder cipherKey(java.lang.String cipherKey) {
- doSetProperty("cipherKey", cipherKey);
- return this;
- }
-
/**
* The publish key obtained from your PubNub account. Required when
* publishing messages.
@@ -324,7 +312,6 @@ public interface PubnubComponentBuilderFactory {
case "operation": getOrCreateConfiguration((PubNubComponent)
component).setOperation((java.lang.String) value); return true;
case "autowiredEnabled": ((PubNubComponent)
component).setAutowiredEnabled((boolean) value); return true;
case "authKey": getOrCreateConfiguration((PubNubComponent)
component).setAuthKey((java.lang.String) value); return true;
- case "cipherKey": getOrCreateConfiguration((PubNubComponent)
component).setCipherKey((java.lang.String) value); return true;
case "publishKey": getOrCreateConfiguration((PubNubComponent)
component).setPublishKey((java.lang.String) value); return true;
case "secretKey": getOrCreateConfiguration((PubNubComponent)
component).setSecretKey((java.lang.String) value); return true;
case "secure": getOrCreateConfiguration((PubNubComponent)
component).setSecure((boolean) value); return true;
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
index b003e0a9c8c..22703d30163 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
@@ -92,7 +92,10 @@ public interface PubNubEndpointBuilderFactory {
}
/**
* If Access Manager is utilized, client will use this authKey in all
- * restricted requests.
+ * restricted requests. Default value notice: This setting is
deprecated
+ * because it relates to deprecated Access Manager (PAM V2) and will be
+ * removed in the future. Please, migrate to new Access Manager (PAM
V3)
+ *
https://www.pubnub.com/docs/general/resources/migration-guides/pam-v3-migration.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -101,25 +104,11 @@ public interface PubNubEndpointBuilderFactory {
* @param authKey the value to set
* @return the dsl builder
*/
+ @Deprecated
default PubNubEndpointConsumerBuilder authKey(String authKey) {
doSetProperty("authKey", authKey);
return this;
}
- /**
- * If cipher is passed, all communications to/from PubNub will be
- * encrypted.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- *
- * @param cipherKey the value to set
- * @return the dsl builder
- */
- default PubNubEndpointConsumerBuilder cipherKey(String cipherKey) {
- doSetProperty("cipherKey", cipherKey);
- return this;
- }
/**
* The publish key obtained from your PubNub account. Required when
* publishing messages.
@@ -325,22 +314,22 @@ public interface PubNubEndpointBuilderFactory {
/**
* Reference to a Pubnub client in the registry.
*
- * The option is a: <code>com.pubnub.api.PubNub</code> type.
+ * The option is a: <code>com.pubnub.api.java.PubNub</code> type.
*
* Group: advanced
*
* @param pubnub the value to set
* @return the dsl builder
*/
- default AdvancedPubNubEndpointConsumerBuilder
pubnub(com.pubnub.api.PubNub pubnub) {
+ default AdvancedPubNubEndpointConsumerBuilder
pubnub(com.pubnub.api.java.PubNub pubnub) {
doSetProperty("pubnub", pubnub);
return this;
}
/**
* Reference to a Pubnub client in the registry.
*
- * The option will be converted to a <code>com.pubnub.api.PubNub</code>
- * type.
+ * The option will be converted to a
+ * <code>com.pubnub.api.java.PubNub</code> type.
*
* Group: advanced
*
@@ -404,7 +393,10 @@ public interface PubNubEndpointBuilderFactory {
}
/**
* If Access Manager is utilized, client will use this authKey in all
- * restricted requests.
+ * restricted requests. Default value notice: This setting is
deprecated
+ * because it relates to deprecated Access Manager (PAM V2) and will be
+ * removed in the future. Please, migrate to new Access Manager (PAM
V3)
+ *
https://www.pubnub.com/docs/general/resources/migration-guides/pam-v3-migration.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -413,25 +405,11 @@ public interface PubNubEndpointBuilderFactory {
* @param authKey the value to set
* @return the dsl builder
*/
+ @Deprecated
default PubNubEndpointProducerBuilder authKey(String authKey) {
doSetProperty("authKey", authKey);
return this;
}
- /**
- * If cipher is passed, all communications to/from PubNub will be
- * encrypted.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- *
- * @param cipherKey the value to set
- * @return the dsl builder
- */
- default PubNubEndpointProducerBuilder cipherKey(String cipherKey) {
- doSetProperty("cipherKey", cipherKey);
- return this;
- }
/**
* The publish key obtained from your PubNub account. Required when
* publishing messages.
@@ -565,22 +543,22 @@ public interface PubNubEndpointBuilderFactory {
/**
* Reference to a Pubnub client in the registry.
*
- * The option is a: <code>com.pubnub.api.PubNub</code> type.
+ * The option is a: <code>com.pubnub.api.java.PubNub</code> type.
*
* Group: advanced
*
* @param pubnub the value to set
* @return the dsl builder
*/
- default AdvancedPubNubEndpointProducerBuilder
pubnub(com.pubnub.api.PubNub pubnub) {
+ default AdvancedPubNubEndpointProducerBuilder
pubnub(com.pubnub.api.java.PubNub pubnub) {
doSetProperty("pubnub", pubnub);
return this;
}
/**
* Reference to a Pubnub client in the registry.
*
- * The option will be converted to a <code>com.pubnub.api.PubNub</code>
- * type.
+ * The option will be converted to a
+ * <code>com.pubnub.api.java.PubNub</code> type.
*
* Group: advanced
*
@@ -622,7 +600,10 @@ public interface PubNubEndpointBuilderFactory {
}
/**
* If Access Manager is utilized, client will use this authKey in all
- * restricted requests.
+ * restricted requests. Default value notice: This setting is
deprecated
+ * because it relates to deprecated Access Manager (PAM V2) and will be
+ * removed in the future. Please, migrate to new Access Manager (PAM
V3)
+ *
https://www.pubnub.com/docs/general/resources/migration-guides/pam-v3-migration.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -631,25 +612,11 @@ public interface PubNubEndpointBuilderFactory {
* @param authKey the value to set
* @return the dsl builder
*/
+ @Deprecated
default PubNubEndpointBuilder authKey(String authKey) {
doSetProperty("authKey", authKey);
return this;
}
- /**
- * If cipher is passed, all communications to/from PubNub will be
- * encrypted.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- *
- * @param cipherKey the value to set
- * @return the dsl builder
- */
- default PubNubEndpointBuilder cipherKey(String cipherKey) {
- doSetProperty("cipherKey", cipherKey);
- return this;
- }
/**
* The publish key obtained from your PubNub account. Required when
* publishing messages.
@@ -740,22 +707,22 @@ public interface PubNubEndpointBuilderFactory {
/**
* Reference to a Pubnub client in the registry.
*
- * The option is a: <code>com.pubnub.api.PubNub</code> type.
+ * The option is a: <code>com.pubnub.api.java.PubNub</code> type.
*
* Group: advanced
*
* @param pubnub the value to set
* @return the dsl builder
*/
- default AdvancedPubNubEndpointBuilder pubnub(com.pubnub.api.PubNub
pubnub) {
+ default AdvancedPubNubEndpointBuilder
pubnub(com.pubnub.api.java.PubNub pubnub) {
doSetProperty("pubnub", pubnub);
return this;
}
/**
* Reference to a Pubnub client in the registry.
*
- * The option will be converted to a <code>com.pubnub.api.PubNub</code>
- * type.
+ * The option will be converted to a
+ * <code>com.pubnub.api.java.PubNub</code> type.
*
* Group: advanced
*
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e43e5ba70f..2d543af76bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -421,7 +421,7 @@
<protonpack-version>1.8</protonpack-version>
<protostream-version>5.0.12.Final</protostream-version>
<prowide-version>SRU2024-10.2.4</prowide-version>
- <pubnub-version>9.2.4</pubnub-version>
+ <pubnub-version>10.1.0</pubnub-version>
<pulsar-version>3.3.1</pulsar-version>
<qdrant-client-version>1.12.0</qdrant-client-version>
<qpid-broker-version>9.2.0</qpid-broker-version>
