Skip to content

Commit 32e34bf

Browse files
artembilanartembilan
authored
GH-5871: Add missed order attr to XSDs (#8624)
* GH-5871: Add missed `order` attr to XSDs Fixes #5871 * * Fix `spring-integration-xml.xsd` for duplicates
1 parent c70d7a6 commit 32e34bf

File tree

10 files changed

+75
-72
lines changed

10 files changed

+75
-72
lines changed

‎spring-integration-cassandra/src/main/resources/org/springframework/integration/config/xml/spring-integration-cassandra.xsd‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,18 @@
187187
</xsd:documentation>
188188
</xsd:annotation>
189189
<xsd:simpleType>
190-
<xsd:union memberTypes="xsd:boolean xsd:string" />
190+
<xsd:union memberTypes="xsd:boolean xsd:string"/>
191191
</xsd:simpleType>
192192
</xsd:attribute>
193+
<xsd:attribute name="order" type="xsd:string">
194+
<xsd:annotation>
195+
<xsd:documentation>
196+
Specifies the order for invocation when this
197+
endpoint is connected as a
198+
subscriber to a channel.
199+
</xsd:documentation>
200+
</xsd:annotation>
201+
</xsd:attribute>
193202
</xsd:complexType>
194203

195204
<xsd:complexType name="queryParameterType">

‎spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx.xsd‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,14 @@
163163
minOccurs="0" maxOccurs="1"/>
164164
</xsd:all>
165165
<xsd:attribute name="default-notification-type" type="xsd:string" use="optional"/>
166+
<xsd:attribute name="order" type="xsd:string">
167+
<xsd:annotation>
168+
<xsd:documentation>
169+
The order for dispatching when the channel adapter is connected
170+
as a subscriber to a 'SubscribableChannel'.
171+
</xsd:documentation>
172+
</xsd:annotation>
173+
</xsd:attribute>
166174
</xsd:extension>
167175
</xsd:complexContent>
168176
</xsd:complexType>
@@ -328,6 +336,14 @@
328336
<xsd:extension base="mbeanServerIdentifierType">
329337
<xsd:attribute name="object-name" type="xsd:string"/>
330338
<xsd:attribute name="operation-name" type="xsd:string"/>
339+
<xsd:attribute name="order" type="xsd:string">
340+
<xsd:annotation>
341+
<xsd:documentation>
342+
The order for dispatching when the channel adapter is connected
343+
as a subscriber to a 'SubscribableChannel'.
344+
</xsd:documentation>
345+
</xsd:annotation>
346+
</xsd:attribute>
331347
</xsd:extension>
332348
</xsd:complexContent>
333349
</xsd:complexType>

‎spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail.xsd‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -370,24 +370,7 @@
370370

371371
<xsd:complexType name="transformerType">
372372
<xsd:attribute name="id" type="xsd:string"/>
373-
<xsd:attribute name="input-channel" type="xsd:string">
374-
<xsd:annotation>
375-
<xsd:appinfo>
376-
<tool:annotation kind="ref">
377-
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
378-
</tool:annotation>
379-
</xsd:appinfo>
380-
</xsd:annotation>
381-
</xsd:attribute>
382-
<xsd:attribute name="output-channel" type="xsd:string">
383-
<xsd:annotation>
384-
<xsd:appinfo>
385-
<tool:annotation kind="ref">
386-
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
387-
</tool:annotation>
388-
</xsd:appinfo>
389-
</xsd:annotation>
390-
</xsd:attribute>
373+
<xsd:attributeGroup ref="integration:inputOutputChannelGroup"/>
391374
</xsd:complexType>
392375

393376
<xsd:attributeGroup name="inboundMappingGroup">

‎spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,14 @@
126126
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
127127
minOccurs="0" maxOccurs="1"/>
128128
</xsd:choice>
129+
<xsd:attribute name="order" type="xsd:string">
130+
<xsd:annotation>
131+
<xsd:documentation>
132+
Specifies the order for invocation when this adapter is connected as a
133+
subscriber to a SubscribableChannel.
134+
</xsd:documentation>
135+
</xsd:annotation>
136+
</xsd:attribute>
129137
</xsd:extension>
130138
</xsd:complexContent>
131139
</xsd:complexType>

‎spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis.xsd‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,14 @@
343343
</xsd:appinfo>
344344
</xsd:annotation>
345345
</xsd:attribute>
346+
<xsd:attribute name="order" type="xsd:string">
347+
<xsd:annotation>
348+
<xsd:documentation>
349+
Specifies the order for invocation when this adapter is connected as a
350+
subscriber to a SubscribableChannel.
351+
</xsd:documentation>
352+
</xsd:annotation>
353+
</xsd:attribute>
346354
</xsd:extension>
347355
</xsd:complexContent>
348356
</xsd:complexType>
@@ -674,7 +682,7 @@
674682
<xsd:documentation><![CDATA[
675683
Configures a Consumer Endpoint for the
676684
'org.springframework.integration.redis.outbound.RedisQueueOutboundGateway' that
677-
pushes a conversation UUID to the the 'queue', then pushes the value to the
685+
pushes a conversation UUID to the 'queue', then pushes the value to the
678686
Redis List with that UUID as a key and receives a reply from the Redis List with
679687
'<UUID>.reply' as its key. A new UUID is used for each interaction.
680688
]]></xsd:documentation>

‎spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp.xsd‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,16 @@
107107
</xsd:documentation>
108108
</xsd:annotation>
109109
</xsd:attribute>
110+
<xsd:attribute name="order">
111+
<xsd:annotation>
112+
<xsd:documentation>
113+
Specifies the order for invocation when this endpoint is connected as a
114+
subscriber to a channel. This is particularly relevant when that channel
115+
is using a "failover" dispatching strategy. It has no effect when this
116+
endpoint itself is a Polling Consumer for a channel with a queue.
117+
</xsd:documentation>
118+
</xsd:annotation>
119+
</xsd:attribute>
110120
</xsd:extension>
111121
</xsd:complexContent>
112122
</xsd:complexType>

‎spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket.xsd‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,16 @@
358358
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
359359
minOccurs="0" maxOccurs="1"/>
360360
</xsd:choice>
361+
<xsd:attribute name="order">
362+
<xsd:annotation>
363+
<xsd:documentation>
364+
Specifies the order for invocation when this endpoint is connected as a
365+
subscriber to a channel. This is particularly relevant when that channel
366+
is using a "failover" dispatching strategy. It has no effect when this
367+
endpoint itself is a Polling Consumer for a channel with a queue.
368+
</xsd:documentation>
369+
</xsd:annotation>
370+
</xsd:attribute>
361371
</xsd:extension>
362372
</xsd:complexContent>
363373
</xsd:complexType>

‎spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws.xsd‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
]]></xsd:documentation>
8888
</xsd:annotation>
8989
</xsd:attribute>
90-
<xsd:attribute name="requires-reply" type="xsd:string" use="optional" default="false">
90+
<xsd:attribute name="requires-reply" type="xsd:string" default="false">
9191
<xsd:annotation>
9292
<xsd:documentation>
9393
Specify whether this outbound gateway must return a non-null value. This value is
@@ -495,24 +495,7 @@ this list can also be simple patterns to be matched against the header names (e.
495495

496496
<xsd:complexType name="transformerType">
497497
<xsd:attribute name="id" type="xsd:string"/>
498-
<xsd:attribute name="input-channel" type="xsd:string">
499-
<xsd:annotation>
500-
<xsd:appinfo>
501-
<tool:annotation kind="ref">
502-
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
503-
</tool:annotation>
504-
</xsd:appinfo>
505-
</xsd:annotation>
506-
</xsd:attribute>
507-
<xsd:attribute name="output-channel" type="xsd:string">
508-
<xsd:annotation>
509-
<xsd:appinfo>
510-
<tool:annotation kind="ref">
511-
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
512-
</tool:annotation>
513-
</xsd:appinfo>
514-
</xsd:annotation>
515-
</xsd:attribute>
498+
<xsd:attributeGroup ref="integration:inputOutputChannelGroup"/>
516499
</xsd:complexType>
517500

518501
<xsd:simpleType name="encodingModeEnumeration">

‎spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml.xsd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
<xsd:documentation><![CDATA[
493493
By default XPath expressions are evaluated as NODESET type and then converted
494494
to a List of channel names, thus handling single channel scenarios as well as multiple.
495-
However certain XPath expressions may evaluate to String type results from the very
495+
However, certain XPath expressions may evaluate to String type results from the very
496496
beginning (e.g., 'name(./node())' - which will return the name of the root node) thus resulting in
497497
an exception if the default evaluation type (NODESET) is used.
498498
@@ -505,7 +505,7 @@
505505
<xsd:union memberTypes="xsd:boolean xsd:string"/>
506506
</xsd:simpleType>
507507
</xsd:attribute>
508-
<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
508+
<xsd:attribute name="xpath-expression-ref" type="xsd:string">
509509
<xsd:annotation>
510510
<xsd:documentation>
511511
Reference to the XPathExpression instance to be
@@ -534,13 +534,13 @@
534534
<xsd:documentation><![CDATA[
535535
Internally XPath expressions will be evaluated as
536536
NODESET type and converted to a List<String>
537-
representing channel names. Typically such a list
537+
representing channel names. Typically, such a list
538538
will contain a single channel name. However,
539539
based on the results of an XPath Expression, the
540540
XPath router can also take on the characteristics
541541
of a Recipient List Router if the XPath Expression
542-
returns more then one value. In that case, the
543-
List<String> will contain more then one channel
542+
returns more than one value. In that case, the
543+
List<String> will contain more than one channel
544544
name and consequently Messages will be sent to
545545
all channels in the list.
546546
]]></xsd:documentation>

‎spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
A SpEL expression to evaluate a 'payload' with the incoming
113113
'org.jivesoftware.smack.packet.Message' as root object.
114114
It useful in case of custom (XEP) XMPP interactions, e.g. GCM.
115-
By default a Message 'body' is used as 'payload'.
115+
By default, a Message 'body' is used as 'payload'.
116116
The '#extension' SpEL variable is registered in the evaluation context
117117
if one and only one extension is present in the Message.
118118
Replaces 'extract-payload' attribute since 4.3.
@@ -295,7 +295,7 @@
295295
<xsd:element name="chat-to" type="headerType">
296296
<xsd:annotation>
297297
<xsd:documentation>
298-
The id of the user you sending a message to (e.g., [email protected])
298+
The id of the user the message is sent to (e.g., [email protected])
299299
</xsd:documentation>
300300
</xsd:annotation>
301301
</xsd:element>
@@ -333,7 +333,7 @@
333333
<xsd:attribute name="value" type="xsd:string">
334334
<xsd:annotation>
335335
<xsd:documentation>
336-
Value of this header inside of a Message
336+
Value of this header in a Message
337337
</xsd:documentation>
338338
</xsd:annotation>
339339
</xsd:attribute>
@@ -366,31 +366,7 @@
366366

367367
<xsd:complexType name="transformerType">
368368
<xsd:attribute name="id" type="xsd:string"/>
369-
<xsd:attribute name="input-channel" type="xsd:string">
370-
<xsd:annotation>
371-
<xsd:appinfo>
372-
<tool:annotation kind="ref">
373-
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
374-
</tool:annotation>
375-
</xsd:appinfo>
376-
<xsd:documentation>
377-
The receiving Message channel of this endpoint
378-
</xsd:documentation>
379-
</xsd:annotation>
380-
</xsd:attribute>
381-
<xsd:attribute name="output-channel" type="xsd:string">
382-
<xsd:annotation>
383-
<xsd:appinfo>
384-
<tool:annotation kind="ref">
385-
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
386-
</tool:annotation>
387-
</xsd:appinfo>
388-
<xsd:documentation>
389-
Identifies the Message channel where Message will be sent after it's being processed by this
390-
endpoint
391-
</xsd:documentation>
392-
</xsd:annotation>
393-
</xsd:attribute>
369+
<xsd:attributeGroup ref="integration:inputOutputChannelGroup"/>
394370
</xsd:complexType>
395371

396372
</xsd:schema>

0 commit comments

Comments
 (0)