Commit Graph

106 Commits

Author SHA1 Message Date
Gunnar Hillert
05062aa0b2 INT-2964 Various JavaDoc Fixes
INT-2964 - JavaDoc: <emphasis> should be <em>

INT-2964 - JavaDoc: <p/> should be <p>

INT-2964 - JavaDoc polishing

* <li></li> should be wrapped in <ul></ul>
* wrap code snippets in {@code myCode()}
* change <code>false</false> to <code>false</code>

INT-2964 - Polish - Fix more JavaDoc errors

* Mockito-all dependency causes JavaDoc error. Change dependency to Mockito-Core.
2013-04-15 17:11:38 -04:00
Gunnar Hillert
0271acaf4c INT-2916 - Upgrade to JUnit 4.11 in support of JDK7
For reference see: https://jira.springsource.org/browse/INT-2916

Changes:

* INT-2919 - Upgrade Spring Data Gemfire to 1.2.2.RELEASE
* Exclude Hamcrest transitive dependency from JUnit (as already explicitly declared)
* Set sourceCompatibility in build.gradle to 1.6
* Set targetCompatibility in build.gradle to 1.6
* Upgrade Hamcrest to 1.3 and fix deprications
  - Corematcher is(*class) change to is(instanceOf(*class))
  - Change org.junit.internal.matchers.TypeSafeMatcher to org.hamcrest.TypeSafeMatcher
  - Change import org.junit.matchers.JUnitMatchers.containsString to org.hamcrest.CoreMatchers.containsString
  - Change import org.junit.matchers.JUnitMatchers.both to org.hamcrest.CoreMatchers.both
  - Change import org.junit.matchers.JUnitMatchers.containsString to org.hamcrest.CoreMatchers.containsString
* Fix JUnit deprecations
  - changed junit.framework.Assert to org.junit.Assert
* Add few missing licenses headers to tests
* Marked several test classes with: @DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
  - SplitterIntegrationTests
  - GatewayInvokingMessageHandlerTests
  - FileToChannelIntegrationTests
  - FileInboundChannelAdapterWithRecursiveDirectoryTests
  - JdbcMessageStoreChannelTests
  - ChatMessageInboundChannelAdapterParserTests
* 3 Tests ignored (Still needs to be addressed):
  - testOperationOnPrototypeBean
  - testFailOperationWithCustomScope
  - testOperationOfControlBus
* Update SQL script (test-failure):
  - spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
  - add drop table statements
  - add ignore-failures="DROPS" to "jdbcOutboundChannelAdapterCommonConfig.xml"

INT-2916 - Code Review Changes

INT-2916 - Fix ignored Tests

Fix 3 previously ignored tests in *GroovyControlBusTests*:

* testOperationOnPrototypeBean
* testFailOperationWithCustomScope
* testOperationOfControlBus

INT-2916 - CI Build Testing

INT-2963 - Remove JDK7 Compilation Warnings

* Upgrade Mockito to 1.9.5
* Fix failing SubscribableJmsChannelTests

INT-2916 - Standardize Hamcrest assertions
Ensure Hamcrest assertions are standardized to: is(instanceOf(...))
2013-04-04 13:40:46 -04:00
Gunnar Hillert
26e41c8858 INT-2960 - Remove deprecated 'xpath-selector'
For reference see: https://jira.springsource.org/browse/INT-2960

* Remove 'xpath-selector' from XML Schema
* Remove parser class
* Remove tests
* Remove respective reference documentation
2013-03-14 15:48:20 -04:00
Soby Chacko
d43bbc8eda INT-2531: Remove deprecations in XML Adapter after upgrade to Spring 3.1.1
* BeanDefinitionParserDelegate constructor now prefers an Environment. Circumvent this
preference by directly getting BeanDefinitionParserDelegate from the associated ParserContext
2013-03-14 13:47:06 -04:00
Gary Russell
451beb424a INT-2873 Create 3.0 Schemas
Copy schemas, cleanup whitespace, update spring.schemas files,
update version in AbstractIntegrationNamespaceHandler.

For each schema compared the 2.2 version with the 3.0 version
(diff -w), ensuring the only difference is the import of
3.0 schemas (where appropriate) instead of 2.2.
2013-01-25 16:12:00 -05:00
Gunnar Hillert
7055845424 INT-2218 - Chain Parser Validation Improvements
Components within Chain: Add parser validation

For reference see: https://jira.springsource.org/browse/INT-2218

INT-2218 - Code review changes

INT-2218 - Fix HttpOutboundGatewayParserTests

INT-2218 - Remove input-channel validation

Was already covered by PR #592
2012-09-21 12:22:52 +01:00
Gunnar Hillert
57bc67b8fb INT-2689 - SI builds without warnings (Except Spring Integration HTTP)
* Ensure that no deprecation warnings occur
* Spring Integration builds with all tests successfully for Spring 3.1.2.RELEASE and 3.0.7.RELEASE (Except Spring Integration HTTP)

For reference see: https://jira.springsource.org/browse/INT-2689

INT-2694 - Fix Http Test Failures with Spring 3.0

As part of INT-2689, fix Http Test Failures in the Spring Integration Http Module when using Spring 3.0.7.RELEASE
For reference see: https://jira.springsource.org/browse/INT-2694
2012-08-01 13:09:51 -04:00
Gunnar Hillert
2877776823 INT-2473 - Update Doc for Xslt Transformers
INT-2473 Document XSD for xslt-transformer

* convert spaces to tabs in XsltPayloadTransformerParser
* Add JavaDoc to ResultTransformer

INT-2473 - Code/Doc Review

* Add documentation for *SourceFactories*
* Add links
* Rephrase section on *ResultTransformers*

Minor polish
2012-07-06 15:57:30 -04:00
Artem Bilan
25a2efe59c INT-2607: refactor 'resolveId' with pC.isNested()
* add delegation to `BeanDefinitionReaderUtils.generateBeanName(definition, parserContext.getRegistry(), parserContext.isNested())`
in the `AbstractBeanDefinitionParser#resolveId()` implementations when it is necessary.
* remove redundant `shouldGenerateId()` & `shouldGenerateIdAsFallback()` when they don't make sense.
* additional simple polishing in the affected classes.
* remove TODO & forced 'id' attribute from JpaOutboundGatewayTests-context.xml to check that this solution works as was booked.

JIRA: https://jira.springsource.org/browse/INT-2607
2012-06-21 14:30:32 -04:00
Gunnar Hillert
a4a27e941f INT-2290 - Document Top Schema Elements in XML Module
* Make sure all top-level XML Elements have documentation
* Convert space to tabs
2012-06-21 13:45:49 -04:00
Gary Russell
95cd202be6 INT-2536 Create 2.2 Schemas
Add 2.2 versions of module schemas.

JMX is already covered by an existing pull request.

INT-2536 Schema Check

Bump version for schema check in
AbstractIntegrationNamespaceHandler.

INT-2536 Remove Schema Versions

Some test config files had 2.1 versioned schemas.
2012-05-04 10:04:01 -04:00
Gary Russell
f76f63f23a NT-2400 Fix tool:expected-type Classes
* MessageChannel was moved from core to the base package.
* ChannelResolver moved from core to support.
* TcpConnectionInterceptorFactoryChain was incorrect.
2012-01-13 13:21:41 -05:00
Gunnar Hillert
bd3a93d601 INT-2371 - add package-info.java files - XML
See: https://jira.springsource.org/browse/INT-2371

INT-2370 - add package-info.java files - JDBC
Reference: https://jira.springsource.org/browse/INT-2370

Add package-info.java files - Twitter
For reference: https://jira.springsource.org/browse/INT-2383

INT-2386 - add package-info.java files - XMPP
For reference: https://jira.springsource.org/browse/INT-2386

INT-2384 - add package-info.java files - WS
Reference: https://jira.springsource.org/browse/INT-2384

INT-2382 - add package-info.java files - Test
For reference: https://jira.springsource.org/browse/INT-2382
2012-01-05 16:17:18 -05:00
Oleg Zhurakousky
0a8b348c98 INT-2299
put back 'channel-resolver' attribute with deprecation warnings

INT-2299 polishing

INT-2299 added XPATH test
2011-12-15 17:09:52 -05:00
Mark Fisher
73c9876aca remove channel-resolver attribute
remove ChannelResolver awareness from router parsers and FactoryBean

refactor 'channelIdentifierMap' -> 'channelMappings' and other clarity enhancements

trim array tokens

added AbstractMappingMessageRouter
2011-10-21 16:12:00 -04:00
Gunnar Hillert
18aceb73fc INT-2191 - XPath Expression Namespace Parser: Improve Validation 2011-10-20 17:01:16 -04:00
Mark Fisher
9819eb3b07 polishing 2011-10-20 10:56:44 -04:00
Gunnar Hillert
34a9703c7a INT-2189 - Made expression attribute required
Made expression attribute required for xpath-expression element
2011-10-20 10:50:07 -04:00
Mark Fisher
2a33aaee5f versionless schemas for xml module 2011-10-10 14:02:52 -04:00
Mark Fisher
c9a34f5d7b add support for 'converter' on <xpath-router>
also improved the xsd doc and the reference manual
2011-10-04 15:35:43 -04:00
Mark Fisher
a0951c8fb4 initial implementation of XPathFilter 2011-09-30 15:55:51 -04:00
Gunnar Hillert
2c023f6fd1 Refactor/Standardize Router XSD Schema Attributes
- Add more documentation for schema elements in spring-integration-xml-2.1.xsd
  - Simplify Handling of Channel Resolution (Failures) for Routers
  - Fix PayloadTypeRouterTests
  - Update reference docs, XSD Schemas
  - Rename 'channel-resolution-required' to 'resolution-required'
  - Updated all tests accordingly
2011-09-20 11:08:43 -04:00
Mark Fisher
9f59001230 removed deprecated trigger sub-elements non-core 2011-08-31 12:54:22 -04:00
Mark Fisher
7c5603fe83 INT-2092 update schema imports to use 2.1 version 2011-08-31 05:26:02 -04:00
David Turanski
7921d3f7e6 INT-2068 fixed shouldSkipNulls logic 2011-08-21 11:05:54 -04:00
Mark Fisher
7bf7e04314 reverting 3.1 BeanDefinitionParserDelegate usage 2011-08-19 15:42:50 -04:00
Oleg Zhurakousky
6ecf0ec1e6 INT-2039 removed references to deprecated Spring classes. Modified code where needed 2011-08-09 00:19:42 -04:00
Oleg Zhurakousky
935cd01d07 INT-1512 changed the type of ID attribute to be xsd:string in all related 2.1 schema files 2011-08-08 23:34:12 -04:00
Mark Fisher
3e71b5a83b INT-2004 added 2.1 versions of all XML schemas and adjusted spring.schemas files accordingly 2011-08-05 11:07:20 -04:00
Mark Fisher
c4f2fd7afe formatting 2011-05-06 11:45:25 -04:00
Oleg Zhurakousky
765503daa4 polishing, fixed warning messages 2011-05-03 19:20:57 -04:00
jonas.partner
99d6b12174 add test additional test for INT-1838 using namespace although was fixed as a side effect of INT-1812 2011-04-12 10:18:45 +01:00
jonas.partner
12dafc8179 add test for producing a text output using <xsl:output method="text" encoding="UTF-8" /> relates to INT-1838 2011-04-12 10:00:33 +01:00
Jonas Partner
653c61e8d1 INT-1812 namespace parser for xsl transformer now sets always use source and result factories if result factory or type is specified 2011-03-08 17:29:26 +00:00
Mark Fisher
a5a64cebb0 un-@Ignored test now that it's compatible with JDK5 2010-12-22 08:08:23 -05:00
David Turanski
3db5db8696 Modified test for JDK 1.5 compatibility 2010-12-22 07:27:16 -05:00
Mark Fisher
5a25530b56 ignoring test again until we resolve the jdk version issue 2010-12-21 21:17:19 -05:00
Mark Fisher
27512ecea2 trying build with 'xalan' in output property test 2010-12-21 21:01:21 -05:00
Mark Fisher
ebd8d40120 temporarily ignoring test to determine if rest of build passes on jdk5 2010-12-21 20:52:56 -05:00
Oleg Zhurakousky
6725b68d5d INT-1659 changed the name of the attribute to 'evaluate-as-string', updated schema and tests. Updated documentation 2010-12-03 13:37:42 -05:00
Oleg Zhurakousky
928f38f315 INT-1659 exposed 'evaluate-as-node' attribute via the namespace, added tests 2010-12-03 11:36:49 -05:00
Oleg Zhurakousky
317d2cad7f INT-1659 added 'evaluateAsNode' attribute to XPath router, added tests 2010-12-03 10:25:58 -05:00
David Turanski
37b16bc3f3 INT-1654 added test for outputProperties 2010-12-01 19:35:24 -05:00
Mark Fisher
7db581b40b INT-1654 added 'outputProperties' to ResultToStringTransformer 2010-12-01 16:35:43 -05:00
Mark Fisher
c4a760a26d router polishing, minor changes to PayloadTypeRouter algorithm 2010-11-11 15:44:06 -05:00
Mark Fisher
38aa676cb9 renamed getChannelIndicatorList method to getChannelIdentifiers on AbstractMessageRouter 2010-11-10 08:50:21 -05:00
Oleg Zhurakousky
1278666ed7 INT-1596, fixed the broken links as well as all warnings 2010-11-09 12:17:45 -05:00
Mark Fisher
d3cfac25fe polishing, also fixed concurrency issue in XsltPayloadTransfomer.buildTransformer() method (assigning rootObject to instance var SpEL EvaluationContext) 2010-11-02 18:33:41 -04:00
Mark Fisher
55941036e4 polishing 2010-11-02 17:41:06 -04:00
Mark Fisher
b3456bf098 polishing 2010-11-02 17:18:27 -04:00