Skip to content

Commit cd84f25

Browse files
committed
Regen
1 parent b5129c7 commit cd84f25

File tree

7 files changed

+158
-30
lines changed

7 files changed

+158
-30
lines changed

catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dapr.json

+36-14
Large diffs are not rendered by default.

catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"autowiredEnabled": { "index": 4, "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 type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc." },
3232
"fetchSize": { "index": 5, "kind": "property", "displayName": "Fetch Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Gives the JDBC driver a hint as to the number of rows that should be fetched from the database when more rows are needed for ResultSet objects generated by this Statement. If the value specified is zero, then the hint is ignored. The default value is zero. This is important for processing large result sets: Setting this higher than the default value will increase processing speed at the cost of memory consumption; setting this lower can avoid transferring row data that will never be read by the application." },
3333
"rowMapperFactory": { "index": 6, "kind": "property", "displayName": "Row Mapper Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sql.RowMapperFactory", "deprecated": false, "autowired": true, "secret": false, "description": "Factory for creating RowMapper" },
34-
"serviceLocationEnabled": { "index": 7, "kind": "property", "displayName": "Service Location Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to detect the network address location of the JMS broker on startup. This information is gathered via reflection on the ConnectionFactory, and is vendor specific. This option can be used to turn this off." },
34+
"serviceLocationEnabled": { "index": 7, "kind": "property", "displayName": "Service Location Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to detect the network address location of the Database on startup. This information is gathered via reflection on the DataSource, and is vendor specific. This option can be used to turn this off." },
3535
"usePlaceholder": { "index": 8, "kind": "property", "displayName": "Use Placeholder", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether to use placeholder and replace all placeholder characters with sign in the SQL queries. This option is default true" },
3636
"healthCheckConsumerEnabled": { "index": 9, "kind": "property", "displayName": "Health Check Consumer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all consumer based health checks from this component" },
3737
"healthCheckProducerEnabled": { "index": 10, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on producer checks globally by setting camel.health.producersEnabled=true." }

components-starter/camel-dapr-starter/src/main/docs/dapr.json

+37
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,35 @@
2020
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration",
2121
"defaultValue": true
2222
},
23+
{
24+
"name": "camel.component.dapr.concurrency",
25+
"type": "io.dapr.client.domain.StateOptions$Concurrency",
26+
"description": "Concurrency mode to use with state operations",
27+
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
28+
},
2329
{
2430
"name": "camel.component.dapr.configuration",
2531
"type": "org.apache.camel.component.dapr.DaprConfiguration",
2632
"description": "The component configurations. The option is a org.apache.camel.component.dapr.DaprConfiguration type.",
2733
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
2834
},
35+
{
36+
"name": "camel.component.dapr.consistency",
37+
"type": "io.dapr.client.domain.StateOptions$Consistency",
38+
"description": "Consistency level to use with state operations",
39+
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
40+
},
2941
{
3042
"name": "camel.component.dapr.customizer.enabled",
3143
"type": "java.lang.Boolean",
3244
"sourceType": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
3345
},
46+
{
47+
"name": "camel.component.dapr.e-tag",
48+
"type": "java.lang.String",
49+
"description": "The eTag for optimistic concurrency during state save or delete operations",
50+
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
51+
},
3452
{
3553
"name": "camel.component.dapr.enabled",
3654
"type": "java.lang.Boolean",
@@ -43,6 +61,12 @@
4361
"description": "HTTP method to use when invoking the service. Accepts verbs like GET, POST, PUT, DELETE, etc. Creates a minimal HttpExtension with no headers or query params. Takes precedence over verb. The option is a io.dapr.client.domain.HttpExtension type.",
4462
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
4563
},
64+
{
65+
"name": "camel.component.dapr.key",
66+
"type": "java.lang.String",
67+
"description": "The key used to identify the state object within the specified state store",
68+
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
69+
},
4670
{
4771
"name": "camel.component.dapr.lazy-start-producer",
4872
"type": "java.lang.Boolean",
@@ -62,6 +86,19 @@
6286
"description": "Target service to invoke. Can be a Dapr App ID, a named HTTPEndpoint, or a FQDN\/public URL",
6387
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
6488
},
89+
{
90+
"name": "camel.component.dapr.state-operation",
91+
"type": "org.apache.camel.component.dapr.StateOperation",
92+
"description": "The state operation to perform on the state store. Required for DaprOperation.state operation",
93+
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration",
94+
"defaultValue": "get"
95+
},
96+
{
97+
"name": "camel.component.dapr.state-store",
98+
"type": "java.lang.String",
99+
"description": "The name of the Dapr state store to interact with, defined in statestore.yaml config",
100+
"sourceType": "org.apache.camel.component.dapr.springboot.DaprComponentConfiguration"
101+
},
65102
{
66103
"name": "camel.component.dapr.verb",
67104
"type": "java.lang.String",

components-starter/camel-dapr-starter/src/main/java/org/apache/camel/component/dapr/springboot/DaprComponentConfiguration.java

+80
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
package org.apache.camel.component.dapr.springboot;
1818

1919
import io.dapr.client.domain.HttpExtension;
20+
import io.dapr.client.domain.StateOptions.Concurrency;
21+
import io.dapr.client.domain.StateOptions.Consistency;
22+
import org.apache.camel.component.dapr.DaprComponent;
2023
import org.apache.camel.component.dapr.DaprConfiguration;
24+
import org.apache.camel.component.dapr.StateOperation;
2125
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
2226
import org.springframework.boot.context.properties.ConfigurationProperties;
2327

@@ -36,18 +40,36 @@ public class DaprComponentConfiguration
3640
* enabled by default.
3741
*/
3842
private Boolean enabled;
43+
/**
44+
* Concurrency mode to use with state operations
45+
*/
46+
private Concurrency concurrency;
3947
/**
4048
* The component configurations. The option is a
4149
* org.apache.camel.component.dapr.DaprConfiguration type.
4250
*/
4351
private DaprConfiguration configuration;
52+
/**
53+
* Consistency level to use with state operations
54+
*/
55+
private Consistency consistency;
56+
/**
57+
* The eTag for optimistic concurrency during state save or delete
58+
* operations
59+
*/
60+
private String eTag;
4461
/**
4562
* HTTP method to use when invoking the service. Accepts verbs like GET,
4663
* POST, PUT, DELETE, etc. Creates a minimal HttpExtension with no headers
4764
* or query params. Takes precedence over verb. The option is a
4865
* io.dapr.client.domain.HttpExtension type.
4966
*/
5067
private HttpExtension httpExtension;
68+
/**
69+
* The key used to identify the state object within the specified state
70+
* store
71+
*/
72+
private String key;
5173
/**
5274
* Whether the producer should be started lazy (on the first message). By
5375
* starting lazy you can use this to allow CamelContext and routes to
@@ -68,6 +90,16 @@ public class DaprComponentConfiguration
6890
* a FQDN/public URL
6991
*/
7092
private String serviceToInvoke;
93+
/**
94+
* The state operation to perform on the state store. Required for
95+
* DaprOperation.state operation
96+
*/
97+
private StateOperation stateOperation = StateOperation.get;
98+
/**
99+
* The name of the Dapr state store to interact with, defined in
100+
* statestore.yaml config
101+
*/
102+
private String stateStore;
71103
/**
72104
* The HTTP verb to use for invoking the method
73105
*/
@@ -82,6 +114,14 @@ public class DaprComponentConfiguration
82114
*/
83115
private Boolean autowiredEnabled = true;
84116

117+
public Concurrency getConcurrency() {
118+
return concurrency;
119+
}
120+
121+
public void setConcurrency(Concurrency concurrency) {
122+
this.concurrency = concurrency;
123+
}
124+
85125
public DaprConfiguration getConfiguration() {
86126
return configuration;
87127
}
@@ -90,6 +130,22 @@ public void setConfiguration(DaprConfiguration configuration) {
90130
this.configuration = configuration;
91131
}
92132

133+
public Consistency getConsistency() {
134+
return consistency;
135+
}
136+
137+
public void setConsistency(Consistency consistency) {
138+
this.consistency = consistency;
139+
}
140+
141+
public String getETag() {
142+
return eTag;
143+
}
144+
145+
public void setETag(String eTag) {
146+
this.eTag = eTag;
147+
}
148+
93149
public HttpExtension getHttpExtension() {
94150
return httpExtension;
95151
}
@@ -98,6 +154,14 @@ public void setHttpExtension(HttpExtension httpExtension) {
98154
this.httpExtension = httpExtension;
99155
}
100156

157+
public String getKey() {
158+
return key;
159+
}
160+
161+
public void setKey(String key) {
162+
this.key = key;
163+
}
164+
101165
public Boolean getLazyStartProducer() {
102166
return lazyStartProducer;
103167
}
@@ -122,6 +186,22 @@ public void setServiceToInvoke(String serviceToInvoke) {
122186
this.serviceToInvoke = serviceToInvoke;
123187
}
124188

189+
public StateOperation getStateOperation() {
190+
return stateOperation;
191+
}
192+
193+
public void setStateOperation(StateOperation stateOperation) {
194+
this.stateOperation = stateOperation;
195+
}
196+
197+
public String getStateStore() {
198+
return stateStore;
199+
}
200+
201+
public void setStateStore(String stateStore) {
202+
this.stateStore = stateStore;
203+
}
204+
125205
public String getVerb() {
126206
return verb;
127207
}

components-starter/camel-sql-starter/src/main/docs/sql.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
{
125125
"name": "camel.component.sql.service-location-enabled",
126126
"type": "java.lang.Boolean",
127-
"description": "Whether to detect the network address location of the JMS broker on startup. This information is gathered via reflection on the ConnectionFactory, and is vendor specific. This option can be used to turn this off.",
127+
"description": "Whether to detect the network address location of the Database on startup. This information is gathered via reflection on the DataSource, and is vendor specific. This option can be used to turn this off.",
128128
"sourceType": "org.apache.camel.component.sql.springboot.SqlComponentConfiguration",
129129
"defaultValue": true
130130
},

components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentConfiguration.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,9 @@ public class SqlComponentConfiguration
9898
*/
9999
private RowMapperFactory rowMapperFactory;
100100
/**
101-
* Whether to detect the network address location of the JMS broker on
102-
* startup. This information is gathered via reflection on the
103-
* ConnectionFactory, and is vendor specific. This option can be used to
104-
* turn this off.
101+
* Whether to detect the network address location of the Database on
102+
* startup. This information is gathered via reflection on the DataSource,
103+
* and is vendor specific. This option can be used to turn this off.
105104
*/
106105
private Boolean serviceLocationEnabled = true;
107106
/**

tooling/camel-spring-boot-dependencies/pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
<description>Camel Spring-Boot Dependencies BOM</description>
3131
<dependencyManagement>
3232
<dependencies>
33-
<dependency>
34-
<groupId>com.fasterxml.woodstox</groupId>
35-
<artifactId>woodstox-core</artifactId>
36-
<version>7.1.0</version>
37-
</dependency>
3833
<dependency>
3934
<groupId>com.google.api.grpc</groupId>
4035
<artifactId>proto-google-2common-protos</artifactId>
@@ -4675,11 +4670,6 @@
46754670
<artifactId>plexus-xml</artifactId>
46764671
<version>3.0.1</version>
46774672
</dependency>
4678-
<dependency>
4679-
<groupId>org.codehaus.woodstox</groupId>
4680-
<artifactId>stax2-api</artifactId>
4681-
<version>4.2.2</version>
4682-
</dependency>
46834673
<dependency>
46844674
<groupId>org.xmlunit</groupId>
46854675
<artifactId>xmlunit-assertj3</artifactId>

0 commit comments

Comments
 (0)