Skip to content

GH-5871: Add missed order attr to XSDs #8624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2023
Merged

GH-5871: Add missed order attr to XSDs #8624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff8819d
GH-5871: Add missed `order` attr to XSDs
artembilan May 12, 2023
4a8dfa0
* Fix `spring-integration-xml.xsd` for duplicates
artembilan May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ...ain/resources/org/springframework/integration/config/xml/spring-integration-cassandra.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,18 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Specifies the order for invocation when this
endpoint is connected as a
subscriber to a channel.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>

<xsd:complexType name="queryParameterType">
Expand Down
16 changes: 16 additions & 0 deletions .../src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,14 @@
minOccurs="0" maxOccurs="1"/>
</xsd:all>
<xsd:attribute name="default-notification-type" type="xsd:string" use="optional"/>
<xsd:attribute name="order" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
The order for dispatching when the channel adapter is connected
as a subscriber to a 'SubscribableChannel'.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down Expand Up @@ -328,6 +336,14 @@
<xsd:extension base="mbeanServerIdentifierType">
<xsd:attribute name="object-name" type="xsd:string"/>
<xsd:attribute name="operation-name" type="xsd:string"/>
<xsd:attribute name="order" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
The order for dispatching when the channel adapter is connected
as a subscriber to a 'SubscribableChannel'.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down
19 changes: 1 addition & 18 deletions ...rc/main/resources/org/springframework/integration/mail/config/spring-integration-mail.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,24 +370,7 @@

<xsd:complexType name="transformerType">
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="input-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="output-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="integration:inputOutputChannelGroup"/>
</xsd:complexType>

<xsd:attributeGroup name="inboundMappingGroup">
Expand Down
8 changes: 8 additions & 0 deletions ...n/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1"/>
</xsd:choice>
<xsd:attribute name="order" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Specifies the order for invocation when this adapter is connected as a
subscriber to a SubscribableChannel.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down
10 changes: 9 additions & 1 deletion .../main/resources/org/springframework/integration/redis/config/spring-integration-redis.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Specifies the order for invocation when this adapter is connected as a
subscriber to a SubscribableChannel.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down Expand Up @@ -674,7 +682,7 @@
<xsd:documentation><![CDATA[
Configures a Consumer Endpoint for the
'org.springframework.integration.redis.outbound.RedisQueueOutboundGateway' that
pushes a conversation UUID to the the 'queue', then pushes the value to the
pushes a conversation UUID to the 'queue', then pushes the value to the
Redis List with that UUID as a key and receives a reply from the Redis List with
'<UUID>.reply' as its key. A new UUID is used for each interaction.
]]></xsd:documentation>
Expand Down
10 changes: 10 additions & 0 deletions .../main/resources/org/springframework/integration/stomp/config/spring-integration-stomp.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="order">
<xsd:annotation>
<xsd:documentation>
Specifies the order for invocation when this endpoint is connected as a
subscriber to a channel. This is particularly relevant when that channel
is using a "failover" dispatching strategy. It has no effect when this
endpoint itself is a Polling Consumer for a channel with a queue.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down
10 changes: 10 additions & 0 deletions ...sources/org/springframework/integration/websocket/config/spring-integration-websocket.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,16 @@
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1"/>
</xsd:choice>
<xsd:attribute name="order">
<xsd:annotation>
<xsd:documentation>
Specifies the order for invocation when this endpoint is connected as a
subscriber to a channel. This is particularly relevant when that channel
is using a "failover" dispatching strategy. It has no effect when this
endpoint itself is a Polling Consumer for a channel with a queue.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down
21 changes: 2 additions & 19 deletions ...ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="requires-reply" type="xsd:string" use="optional" default="false">
<xsd:attribute name="requires-reply" type="xsd:string" default="false">
<xsd:annotation>
<xsd:documentation>
Specify whether this outbound gateway must return a non-null value. This value is
Expand Down Expand Up @@ -495,24 +495,7 @@ this list can also be simple patterns to be matched against the header names (e.

<xsd:complexType name="transformerType">
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="input-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="output-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="integration:inputOutputChannelGroup"/>
</xsd:complexType>

<xsd:simpleType name="encodingModeEnumeration">
Expand Down
10 changes: 5 additions & 5 deletions .../src/main/resources/org/springframework/integration/xml/config/spring-integration-xml.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
<xsd:documentation><![CDATA[
By default XPath expressions are evaluated as NODESET type and then converted
to a List of channel names, thus handling single channel scenarios as well as multiple.
However certain XPath expressions may evaluate to String type results from the very
However, certain XPath expressions may evaluate to String type results from the very
beginning (e.g., 'name(./node())' - which will return the name of the root node) thus resulting in
an exception if the default evaluation type (NODESET) is used.

Expand All @@ -505,7 +505,7 @@
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
<xsd:attribute name="xpath-expression-ref" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Reference to the XPathExpression instance to be
Expand Down Expand Up @@ -534,13 +534,13 @@
<xsd:documentation><![CDATA[
Internally XPath expressions will be evaluated as
NODESET type and converted to a List<String>
representing channel names. Typically such a list
representing channel names. Typically, such a list
will contain a single channel name. However,
based on the results of an XPath Expression, the
XPath router can also take on the characteristics
of a Recipient List Router if the XPath Expression
returns more then one value. In that case, the
List<String> will contain more then one channel
returns more than one value. In that case, the
List<String> will contain more than one channel
name and consequently Messages will be sent to
all channels in the list.
]]></xsd:documentation>
Expand Down
32 changes: 4 additions & 28 deletions ...rc/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
A SpEL expression to evaluate a 'payload' with the incoming
'org.jivesoftware.smack.packet.Message' as root object.
It useful in case of custom (XEP) XMPP interactions, e.g. GCM.
By default a Message 'body' is used as 'payload'.
By default, a Message 'body' is used as 'payload'.
The '#extension' SpEL variable is registered in the evaluation context
if one and only one extension is present in the Message.
Replaces 'extract-payload' attribute since 4.3.
Expand Down Expand Up @@ -295,7 +295,7 @@
<xsd:element name="chat-to" type="headerType">
<xsd:annotation>
<xsd:documentation>
The id of the user you sending a message to (e.g., [email protected])
The id of the user the message is sent to (e.g., [email protected])
</xsd:documentation>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -333,7 +333,7 @@
<xsd:attribute name="value" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Value of this header inside of a Message
Value of this header in a Message
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
Expand Down Expand Up @@ -366,31 +366,7 @@

<xsd:complexType name="transformerType">
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="input-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
The receiving Message channel of this endpoint
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="output-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
Identifies the Message channel where Message will be sent after it's being processed by this
endpoint
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="integration:inputOutputChannelGroup"/>
</xsd:complexType>

</xsd:schema>