Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start version 5.3

Browse Source 
* Move `What's New` into `changes-5.1-5.2.adoc`
* Remove version from the `XSD` files:
 1. Align with SF
 2. The version for XSD doesn't matter for the current jar version,
 since only the version is available in classpath is from the current
 jar version
 3. Modify `spring.schemas` to map all the possible versions for XSD
 into the current one in a jar.
 This way target applications can upgrade without changing the version
 for XSD location and we don't need to require `versionless` variant
 any more
 4. The jar in classpath can handle only its own XSD, so independently
 of version or no-version variants we still may fail because the current
 jar may not support end-user code any more - need some fix over there
 anyway.
* Remove `checkTestConfigs` Gradle task since we don't worry about XSD
version any more
* Modify `schemaZip` Gradle task to populate XSDs into a distribution
still with a version to avoid overriding on-line XSDs for version `1.0.x`.
We may consider not do that since SF doesn't and just bite a bullet
for always overriding those on-line XSDs to the actual one from the latest
release.
This commit is contained in:
Artem Bilan
2019-11-27 17:51:35 -05:00
parent 1a9fb83199
commit 9dc3519f20
71 changed files with 4106 additions and 3358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-integration-mongodb/src/main/resources/META-INF/spring.schemas
View File

@@ -1,4 +1,20 @@
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-3.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.3.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-3.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-4.3.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
https\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd

53
spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd → spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb.xsd
View File

@@ -4,11 +4,11 @@
xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:integration="http://www.springframework.org/schema/integration"
targetNamespace="http://www.springframework.org/schema/integration/mongodb"
elementFormDefault="qualified" attributeFormDefault="unqualified">
elementFormDefault="qualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" />
schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[
@@ -28,7 +28,7 @@
<xsd:complexContent>
<xsd:extension base="mongodbAdapterType">
<xsd:sequence>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
<xsd:element ref="integration:poller" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="query" type="xsd:string">
<xsd:annotation>
@@ -45,8 +45,10 @@
<xsd:attribute name="query-expression" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
SpEL expression which should resolve to a String query (please refer to the 'query' attribute),
or to an instance of MongoDb Query (e.q., query-expression="new BasicQuery('{''name'' : ''Bob''}').limit(2)").
SpEL expression which should resolve to a String query (please refer to the 'query'
attribute),
or to an instance of MongoDb Query (e.q., query-expression="new BasicQuery('{''name'' :
''Bob''}').limit(2)").
This attribute is mutually exclusive with 'query' attribute.
</xsd:documentation>
</xsd:annotation>
@@ -60,7 +62,7 @@
If this attribute is not provided the default value is com.mongodb.DBObject
</xsd:documentation>
<tool:annotation kind="direct">
<tool:expected-type type="java.lang.Class" />
<tool:expected-type type="java.lang.Class"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -68,11 +70,16 @@
<xsd:attribute name="expect-single-result" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Allows you to manage find* method of MongoTemplate is used to query MongoDb. Default value for this
attribute is 'false'. This means that we'll use find(..) method thus resulting in a Message with
payload of type List of entities identified by 'entity-class' attribute. If you want/expect a single
value set this attribute to 'true' which will result in invocation of findOne(..) method resulting in
the payload of type identified by 'entity-class' attribute (default com.mongodb.DBObject)
Allows you to manage find* method of MongoTemplate is used to query MongoDb. Default
value for this
attribute is 'false'. This means that we'll use find(..) method thus resulting in a
Message with
payload of type List of entities identified by 'entity-class' attribute. If you
want/expect a single
value set this attribute to 'true' which will result in invocation of findOne(..) method
resulting in
the payload of type identified by 'entity-class' attribute (default
com.mongodb.DBObject)
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -95,7 +102,7 @@
<xsd:choice minOccurs="0" maxOccurs="2">
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1" />
minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
@@ -119,7 +126,7 @@
<xsd:choice minOccurs="0" maxOccurs="2">
<xsd:element ref="integration:poller" minOccurs="0"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" />
minOccurs="0"/>
</xsd:choice>
<xsd:attribute name="request-channel" type="xsd:string">
<xsd:annotation>
@@ -129,7 +136,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -141,7 +148,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -178,7 +185,7 @@
</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">
@@ -201,7 +208,7 @@
</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="query" type="xsd:string">
@@ -234,7 +241,7 @@
If this attribute is not provided the default value is org.bson.Document
</xsd:documentation>
<tool:annotation kind="direct">
<tool:expected-type type="java.lang.Class" />
<tool:expected-type type="java.lang.Class"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -251,7 +258,7 @@
</xsd:documentation>
<tool:annotation kind="ref">
<tool:expected-type
type="org.springframework.data.mongodb.core.CollectionCallback" />
type="org.springframework.data.mongodb.core.CollectionCallback"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -276,7 +283,7 @@
org.springframework.data.mongodb.MongoDbFactory
</xsd:documentation>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.data.mongodb.MongoDbFactory" />
<tool:expected-type type="org.springframework.data.mongodb.MongoDbFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -289,7 +296,7 @@
org.springframework.data.mongodb.core.MongoTemplate
</xsd:documentation>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.data.mongodb.core.MongoTemplate" />
<tool:expected-type type="org.springframework.data.mongodb.core.MongoTemplate"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -321,7 +328,7 @@
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type
type="org.springframework.data.mongodb.core.convert.MongoConverter" />
type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>