diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f36b..17783c7c06 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden with regard to the reporter of an incident. This Code of Conduct is adapted from the -http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at -http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index b236df01b1..03cbfcd1f5 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -33,7 +33,7 @@ Signing the CLA does not grant anyone commit rights to the main repository, but 1. Go to https://github.com/spring-projects/spring-integration[https://github.com/spring-projects/spring-integration] 2. Hit the "fork" button and choose your own github account as the target -3. For more detail see http://help.github.com/fork-a-repo/[Fork A Repo]. +3. For more detail see https://help.github.com/fork-a-repo/[Fork A Repo]. == Setup your Local Development Environment @@ -53,7 +53,7 @@ _you should see branches on origin as well as upstream, including 'master'_ * _Always_ work on topic branches (Typically use the GitHub issue ID as the branch name). - For example, to create and switch to a new branch for issue 123: `git checkout -b GH-123` * You might be working on several different topic branches at any given time, but when at a stopping point for one of those branches, commit (a local operation). -* Please follow the "Commit Guidelines" described in http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git]. +* Please follow the "Commit Guidelines" described in https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git]. * Then to begin working on another issue (say 101): `git checkout GH-101`. The _-b_ flag is not needed if that branch already exists in your local repository. * When ready to resolve an issue or to collaborate with others, you can push your branch to origin (your fork), e.g.: `git push origin GH-123` @@ -65,7 +65,7 @@ Alternatively, they can use `git fetch --all` to sync their local state with all * A prerequisite for any pull request is that it will be cleanly merge-able with the upstream master's current state. **This is the responsibility of any contributor.** If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. -For a full explanation, see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]. +For a full explanation, see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]. As stated there: _"> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain."_ == Keeping your Local Code in Sync @@ -80,7 +80,7 @@ As stated there: _"> Often, you’ll do this to make sure your commits apply cle - Then: `git pull upstream master` - Switch back to the topic branch: `git checkout GH-123` (no -b needed since the branch already exists) - Rebase the topic branch to minimize the distance between it and your recently synced master branch: `git rebase master` -(Again, for more detail see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]). +(Again, for more detail see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]). * **Note** While it is generally recommended to __not__ re-write history by using `push --force`, and we do not do this on `master` (and release) branches in the main repo, we require topic branches for pull requests to be rebased before merging, in order to maintain a clean timeline and avoid "merge" commits. * If, while rebasing for the merge, we find significant conflicts, we may ask you to rebase and `push --force` to your topic branch after resolving the conflicts. * Assuming your pull request is merged into the 'upstream' master, you will end up pulling that change into your own master eventually and, at that time, you may decide to delete the topic branch from your local repository and your fork (origin) if you pushed it there. diff --git a/README.md b/README.md index 4e54e2dd78..110039e64c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Spring Integration [](https://build.spring.io/browse/INT-MASTER) [![Join the chat at https://gitter.im/spring-projects/spring-integration](https://badges.gitter.im/spring-projects/spring-integration.svg)](https://gitter.im/spring-projects/spring-integration?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +Spring Integration [](https://build.spring.io/browse/INT-MASTER) [![Join the chat at https://gitter.im/spring-projects/spring-integration](https://badges.gitter.im/spring-projects/spring-integration.svg)](https://gitter.im/spring-projects/spring-integration?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ================== # Checking out and Building @@ -53,4 +53,4 @@ To generate IDEA metadata (.iml and .ipr files), do the following: # Resources For more information, please visit the Spring Integration website at: -[http://projects.spring.io/spring-integration](http://projects.spring.io/spring-integration/) +[https://projects.spring.io/spring-integration](https://projects.spring.io/spring-integration/) diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd index 08d6662a67..a2a311f24d 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"/> diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java index b2c18dea5a..471a6ac343 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.util.Assert; /** * The {@link org.aopalliance.intercept.MethodInterceptor} implementation for the - * Idempotent Receiver + * Idempotent Receiver * E.I. Pattern. *

* This {@link org.aopalliance.intercept.MethodInterceptor} works like a @@ -48,6 +48,7 @@ import org.springframework.util.Assert; * @author Gary Russell * * @since 4.1 + * * @see org.springframework.integration.selector.MetadataStoreSelector * @see org.springframework.integration.config.IdempotentReceiverAutoProxyCreatorInitializer */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java index 765420cf35..4b30641235 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java @@ -27,7 +27,7 @@ import com.jayway.jsonpath.Predicate; /** * Utility class to {@link #evaluate} a jsonPath on the provided object. - * Delegates evaluation to JsonPath. + * Delegates evaluation to JsonPath. * Note {@link #evaluate} is used as {@code #jsonPath()} SpEL function. * * @author Artem Bilan diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java index f7788a1794..bca20abc91 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java @@ -44,7 +44,7 @@ import org.springframework.util.ClassUtils; /** * The {@link MessageHandler} implementation for the - * Scatter-Gather EIP pattern. + * Scatter-Gather EIP pattern. * * @author Artem Bilan * @author Abdul Zaheer diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java index 22e50c89c7..3874259f64 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.util.Assert; * {@code MetadataStore} associated with the {@code key}. *

* This {@link MessageSelector} is useful for an - * Idempotent Receiver + * Idempotent Receiver * implementation. *

* It can be used in a {@link org.springframework.integration.filter.MessageFilter} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties index 490af3edb7..6db001bf48 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties @@ -3,8 +3,8 @@ xmlheaders=\ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= service-activator=\ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties index bef7d6af06..574974b0a0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties @@ -3,8 +3,8 @@ xmlheaders=\ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= empty= diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties index d17d38496d..df0d215dde 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties @@ -3,9 +3,9 @@ splitter-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -21,11 +21,11 @@ splitter-inner-success-with-poller=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -45,11 +45,11 @@ splitter-inner-success-with-poller-reversed-order=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -67,9 +67,9 @@ splitter-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -82,9 +82,9 @@ splitter-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -99,9 +99,9 @@ transformer-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -115,9 +115,9 @@ transformer-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -130,9 +130,9 @@ transformer-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -147,9 +147,9 @@ router-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -166,9 +166,9 @@ router-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -184,9 +184,9 @@ router-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -198,9 +198,9 @@ sa-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -214,9 +214,9 @@ sa-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -229,9 +229,9 @@ sa-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -246,9 +246,9 @@ aggregator-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -262,9 +262,9 @@ aggregator-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -280,11 +280,11 @@ aggregator-inner-concurrent-success=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -304,11 +304,11 @@ aggregator-inner-concurrent-success-reorder-bean-poller=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -326,9 +326,9 @@ aggregator-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -343,9 +343,9 @@ filter-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -359,9 +359,9 @@ filter-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -374,9 +374,9 @@ filter-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java index 67be94473f..d2d00f80a8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java @@ -84,9 +84,9 @@ public class PayloadTypeRouterParserTests { "" + + " https://www.springframework.org/schema/integration/spring-integration.xsd\">" + " " + " " + " " + @@ -98,9 +98,9 @@ public class PayloadTypeRouterParserTests { "" + + " https://www.springframework.org/schema/integration/spring-integration.xsd\">" + " " + " " + ""; diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd index 045ec2cc53..0c4ab91d0a 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd @@ -8,7 +8,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss b/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss index dc33a94ea5..dd056fad05 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss @@ -1,7 +1,7 @@ Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration Spring Integration is a really cool framework @@ -11,9 +11,9 @@ All Rights Reserved. Tue, 12 Apr 2010 18:21:32 EST 240 -http://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png +https://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss b/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss index c475f18280..3f940edfb3 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss @@ -1,7 +1,7 @@ Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration Spring Integration is a really cool framework @@ -11,16 +11,16 @@ All Rights Reserved. Tue, 12 Apr 2010 18:21:32 EST 240 -http://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png +https://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration Spring Integration adapters -http://www.springsource.org/extensions/se-sia +https://www.springsource.org/extensions/se-sia Spring Integration adapters are really cool @@ -31,7 +31,7 @@ Spring Integration adapters are really cool Spring Integration download -http://www.springsource.com/products/spring-community-download +https://www.springsource.com/products/spring-community-download Download Spring Integration @@ -42,7 +42,7 @@ Download Spring Integration Check out Spring Integration forums -http://forum.springsource.org/forumdisplay.php?f=42 +https://forum.spring.io/forumdisplay.php?f=42 Spring Integration forums are awesome diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd index 0c63f8aee3..05134fe5bc 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd @@ -10,7 +10,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"/> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration/file https://www.springframework.org/schema/integration/file/spring-integration-file.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= file-outbound-gateway=\ diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd index fd7147e3bb..adf637cb1c 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd @@ -10,9 +10,9 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/file/spring-integration-file-5.2.xsd" /> diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd index 1c035d9f86..6f26002c30 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> + schemaLocation="https://www.springframework.org/schema/beans/spring-beans.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java index 4b8f139a55..f823411566 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2018 the original author or authors. + * Copyright 2017-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -364,7 +364,7 @@ public abstract class HttpInboundEndpointSupportSpecThese values are placed in the {@code Access-Control-Allow-Origin} * header of both the pre-flight response and the actual response. * {@code "*"} means that all origins are allowed. diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd index 743537245a..af797ae39e 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd @@ -8,7 +8,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration/http https://www.springframework.org/schema/integration/http/spring-integration-http.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= http-outbound-gateway=\ - \ + \ diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index f66f888b76..c90b7fb8a6 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -85,7 +85,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleStringKeyStringValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -120,7 +120,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleStringKeyObjectValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -154,7 +154,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleObjectKeyObjectValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -189,7 +189,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyStringArrayValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -237,7 +237,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyPrimitiveArrayValueMixedFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -288,7 +288,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyNullArrayValueMixedFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -332,7 +332,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyNullCollectionValueMixedFormDataString() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -379,7 +379,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyNullCollectionValueMixedFormDataObject() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -422,7 +422,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyStringCollectionValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -467,7 +467,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyObjectCollectionValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -512,7 +512,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void nameOnlyWithNullValues() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -550,7 +550,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void contentAsByteArray() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -577,7 +577,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void contentAsXmlSource() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -604,7 +604,7 @@ public class HttpRequestExecutingMessageHandlerTests { // should see a warn message HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -614,7 +614,7 @@ public class HttpRequestExecutingMessageHandlerTests { // should not see a warn message since 'setExtractPayload' is not set explicitly - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -623,7 +623,7 @@ public class HttpRequestExecutingMessageHandlerTests { // should not see a warn message since HTTP method is not GET - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -636,7 +636,7 @@ public class HttpRequestExecutingMessageHandlerTests { public void contentTypeIsNotSetForGetAndHeadRequest() throws Exception { // GET HttpRequestExecutingMessageHandler handler = - new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -736,7 +736,7 @@ public class HttpRequestExecutingMessageHandlerTests { new SpelExpressionParser().parseExpression("headers['foo']"), restTemplate); setBeanFactory(handler); handler.afterPropertiesSet(); - String theURL = "http://bar/baz?foo#bar"; + String theURL = "https://bar/baz?foo#bar"; Message message = MessageBuilder.withPayload("").setHeader("foo", theURL).build(); try { handler.handleRequestMessage(message); @@ -750,7 +750,7 @@ public class HttpRequestExecutingMessageHandlerTests { public void testInt2455UriNotEncoded() { MockRestTemplate restTemplate = new MockRestTemplate(); HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - new SpelExpressionParser().parseExpression("'http://my.RabbitMQ.com/api/' + payload"), restTemplate); + new SpelExpressionParser().parseExpression("'https://my.RabbitMQ.com/api/' + payload"), restTemplate); handler.setEncodeUri(false); setBeanFactory(handler); handler.afterPropertiesSet(); @@ -761,13 +761,13 @@ public class HttpRequestExecutingMessageHandlerTests { catch (Exception e) { } assertThat(restTemplate.actualUrl.get()) - .isEqualTo("http://my.RabbitMQ.com/api/queues/%2f/si.test.queue?foo#bar"); + .isEqualTo("https://my.RabbitMQ.com/api/queues/%2f/si.test.queue?foo#bar"); } @Test public void acceptHeaderForSerializableResponse() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); handler.setHttpMethod(HttpMethod.GET); handler.setExpectedResponseType(Foo.class); @@ -801,7 +801,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void acceptHeaderForSerializableResponseMessageExchange() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); handler.setHttpMethod(HttpMethod.GET); handler.setExtractPayload(false); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index 2214e9dd4e..97af1463fe 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -17,8 +17,10 @@ package org.springframework.integration.http.support; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import java.net.URI; +import java.net.URISyntaxException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -28,7 +30,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.convert.ConversionService; @@ -47,25 +50,27 @@ import org.springframework.util.CollectionUtils; * @author Mark Fisher * @author Gunnar Hillert * @author Artem Bilan + * * @since 2.0.1 */ +@TestInstance(TestInstance.Lifecycle.PER_CLASS) public class DefaultHttpHeaderMapperFromMessageInboundTests { - // Allow tests - @Test(expected = IllegalArgumentException.class) + @Test public void validateAllowWithWrongMethodName() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", "bar"); HttpHeaders headers = new HttpHeaders(); - mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); + assertThatIllegalArgumentException() + .isThrownBy(() -> mapper.fromHeaders(new MessageHeaders(messageHeaders), headers)); } @Test public void validateAllowAsString() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", "GET"); HttpHeaders headers = new HttpHeaders(); @@ -77,7 +82,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsStringCaseInsensitive() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("allow", "GET"); HttpHeaders headers = new HttpHeaders(); @@ -89,7 +94,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsHttpMethod() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", HttpMethod.GET); HttpHeaders headers = new HttpHeaders(); @@ -101,7 +106,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsDelimitedString() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", "GET, POST"); HttpHeaders headers = new HttpHeaders(); @@ -114,7 +119,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsStringArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", new String[] { "GET", "POST" }); HttpHeaders headers = new HttpHeaders(); @@ -127,7 +132,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsHttpMethodArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", new HttpMethod[] { HttpMethod.GET, HttpMethod.POST }); HttpHeaders headers = new HttpHeaders(); @@ -140,7 +145,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsCollectionOfString() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", CollectionUtils.arrayToList(new String[] { "GET", "POST" })); HttpHeaders headers = new HttpHeaders(); @@ -153,7 +158,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateAllowAsCollectionOfHttpMethods() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Allow", CollectionUtils.arrayToList(new HttpMethod[] { HttpMethod.GET, HttpMethod.POST })); HttpHeaders headers = new HttpHeaders(); @@ -173,7 +178,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateETag() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("ETag", "\"1234\""); HttpHeaders headers = new HttpHeaders(); @@ -186,7 +191,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateExpiresAsNumber() throws ParseException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Expires", 12345678); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -199,7 +204,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateExpiresAsString() throws ParseException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Expires", "12345678"); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -212,7 +217,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateExpiresAsDate() throws ParseException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Expires", new Date(12345678)); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -227,7 +232,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateLastModifiedAsNumber() throws ParseException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Last-Modified", 12345678); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -241,7 +246,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateLastModifiedAsString() throws ParseException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Last-Modified", "12345678"); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -255,7 +260,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateLastModifiedAsDate() throws ParseException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Last-Modified", new Date(12345678)); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -269,22 +274,22 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { // Location tests @Test - public void validateLocation() throws Exception { + public void validateLocation() throws URISyntaxException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); - messageHeaders.put("Location", "http://foo.com"); + Map messageHeaders = new HashMap<>(); + messageHeaders.put("Location", "http://www.foo.com/"); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); - assertThat(headers.getLocation().toString()).isEqualTo(new URI("http://foo.com").toString()); + assertThat(headers.getLocation().toString()).isEqualTo(new URI("http://www.foo.com/").toString()); } // Transfer Encoding tests @Test - public void validateTransferEncodingNotMappedFromMessageHeaders() throws Exception { + public void validateTransferEncodingNotMappedFromMessageHeaders() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("Transfer-Encoding", "chunked"); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -294,7 +299,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateTransferEncodingMappedFromHttpHeaders() throws Exception { + public void validateTransferEncodingMappedFromHttpHeaders() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setInboundHeaderNames(new String[] { "Transfer-Encoding" }); HttpHeaders headers = new HttpHeaders(); @@ -307,7 +312,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateTransferEncodingNotMappedFromHttpHeadersByDefault() throws Exception { + public void validateTransferEncodingNotMappedFromHttpHeadersByDefault() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); HttpHeaders headers = new HttpHeaders(); @@ -322,10 +327,10 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { // Pragma tested as part of DefaultHttpHeaderMapperFromMessageOutboundTests @Test - public void validateCustomHeaderNamesMappedToHttpHeaders() throws Exception { + public void validateCustomHeaderNamesMappedToHttpHeaders() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] { "foo", "bar" }); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("foo", "abc"); messageHeaders.put("bar", "123"); HttpHeaders headers = new HttpHeaders(); @@ -338,10 +343,10 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsMappedToHttpHeaders() throws Exception { + public void validateCustomHeaderNamePatternsMappedToHttpHeaders() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] { "x*", "*z", "a*f" }); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("x1", "x1-value"); messageHeaders.put("1x", "1x-value"); messageHeaders.put("z1", "z1-value"); @@ -365,11 +370,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeaders() throws Exception { + public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeaders() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] { "foo*", "HTTP_RESPONSE_HEADERS" }); mapper.setUserDefinedHeaderPrefix("X-"); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("foobar", "abc"); messageHeaders.put("Accept", "text/html"); messageHeaders.put("Content-Type", "text/xml"); @@ -383,11 +388,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefix() throws Exception { + public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefix() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setUserDefinedHeaderPrefix("Z-"); mapper.setOutboundHeaderNames(new String[] { "foo*", "HTTP_RESPONSE_HEADERS" }); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("foobar", "abc"); messageHeaders.put("Accept", "text/html"); messageHeaders.put("Content-Type", "text/xml"); @@ -401,11 +406,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() throws Exception { + public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setUserDefinedHeaderPrefix(""); mapper.setOutboundHeaderNames(new String[] { "foo*", "HTTP_RESPONSE_HEADERS" }); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("foobar", "abc"); messageHeaders.put("Accept", "text/html"); messageHeaders.put("Content-Type", "text/xml"); @@ -419,11 +424,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixNull() throws Exception { + public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixNull() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setUserDefinedHeaderPrefix(null); mapper.setOutboundHeaderNames(new String[] { "foo*", "HTTP_RESPONSE_HEADERS" }); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("foobar", "abc"); messageHeaders.put("Accept", "text/html"); messageHeaders.put("Content-Type", "text/xml"); @@ -437,7 +442,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamesMappedFromHttpHeaders() throws Exception { + public void validateCustomHeaderNamesMappedFromHttpHeaders() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setInboundHeaderNames(new String[] { "foo", "bar" }); HttpHeaders headers = new HttpHeaders(); @@ -450,7 +455,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsMappedFromHttpHeaders() throws Exception { + public void validateCustomHeaderNamePatternsMappedFromHttpHeaders() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setInboundHeaderNames(new String[] { "x*", "*z", "a*f" }); HttpHeaders headers = new HttpHeaders(); @@ -473,13 +478,15 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsAndStandardRequestHeadersMappedFromHttpHeaders() throws Exception { + public void validateCustomHeaderNamePatternsAndStandardRequestHeadersMappedFromHttpHeaders() + throws URISyntaxException { + DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setInboundHeaderNames(new String[] { "foo*", "HTTP_REQUEST_HEADERS" }); HttpHeaders headers = new HttpHeaders(); headers.set("foobar", "abc"); headers.setAccept(Collections.singletonList(MediaType.TEXT_XML)); - headers.setLocation(new URI("http://example.org")); + headers.setLocation(new URI("http://www.example.org")); Map result = mapper.toHeaders(headers); assertThat(result.size()).isEqualTo(2); assertThat(result.get("Location")).isNull(); @@ -488,12 +495,12 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeadersWithNonStringValuesAndNoConverter() throws Exception { + public void validateCustomHeadersWithNonStringValuesAndNoConverter() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] { "customHeader*" }); HttpHeaders headers = new HttpHeaders(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("customHeaderA", 123); messageHeaders.put("customHeaderB", new TestClass()); @@ -504,7 +511,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test - public void validateCustomHeadersWithNonStringValuesAndDefaultConverterOnly() throws Exception { + public void validateCustomHeadersWithNonStringValuesAndDefaultConverterOnly() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] { "customHeader*" }); ConversionService cs = new DefaultConversionService(); @@ -514,7 +521,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { mapper.afterPropertiesSet(); HttpHeaders headers = new HttpHeaders(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("customHeaderA", 123); messageHeaders.put("customHeaderB", new TestClass()); @@ -525,7 +532,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeadersWithNonStringValuesAndDefaultConverterWithCustomConverter() throws Exception { + public void validateCustomHeadersWithNonStringValuesAndDefaultConverterWithCustomConverter() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] { "customHeader*" }); GenericConversionService cs = new DefaultConversionService(); @@ -536,7 +543,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { mapper.afterPropertiesSet(); HttpHeaders headers = new HttpHeaders(); - Map messageHeaders = new HashMap(); + Map messageHeaders = new HashMap<>(); messageHeaders.put("customHeaderA", 123); messageHeaders.put("customHeaderB", new TestClass()); @@ -560,7 +567,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void testInt2995IfModifiedSince() throws Exception { + public void testInt2995IfModifiedSince() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Date ifModifiedSince = new Date(); long ifModifiedSinceTime = ifModifiedSince.getTime(); @@ -574,9 +581,9 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void testContentTypeHeader() throws Exception { + public void testContentTypeHeader() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(MessageHeaders.CONTENT_TYPE, "text/plain"); MessageHeaders messageHeaders = new MessageHeaders(map); HttpHeaders httpHeaders = new HttpHeaders(); @@ -585,7 +592,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void testContentTypeInboundHeader() throws Exception { + public void testContentTypeInboundHeader() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); HttpHeaders headers = new HttpHeaders(); headers.add(HttpHeaders.CONTENT_TYPE.toLowerCase(), "text/plain"); diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd index 7f40ec3edc..aee2716660 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> 1. *

* Fore more details, please see: - * http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked + * https://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked * * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd index 31690842fa..f26c5d1b50 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd @@ -7,7 +7,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> " + + " xsi:schemaLocation=\"http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd" + + " http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + + " http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">" + "" + " " + "" + @@ -90,9 +90,9 @@ public class InnerPollerParserTests { " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + " xmlns:int=\"http://www.springframework.org/schema/integration\"" + " xmlns:int-jdbc=\"http://www.springframework.org/schema/integration/jdbc\"" + - " xsi:schemaLocation=\"http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd" + - " http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + - " http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd\">" + + " xsi:schemaLocation=\"http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd" + + " http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + + " http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">" + "" + " " + "" + @@ -129,9 +129,9 @@ public class InnerPollerParserTests { " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + " xmlns:int=\"http://www.springframework.org/schema/integration\"" + " xmlns:int-jdbc=\"http://www.springframework.org/schema/integration/jdbc\"" + - " xsi:schemaLocation=\"http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd" + - " http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + - " http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd\">" + + " xsi:schemaLocation=\"http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd" + + " http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + + " http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">" + "" + " " + "" + diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties index c2695d9bd3..9f61705831 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties @@ -3,8 +3,8 @@ xmlheaders=\ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd"> xmlfooter= nameAndExpressionExclusivity= + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd"/> Twitter - - - - + + + + @@ -48,7 +48,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo

@@ -127,49 +127,49 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
  • Trending topics
  • - Catwoman + Catwoman
  • - Damn Beliebers + Damn Beliebers
  • - Anne Hathaway + Anne Hathaway
  • - Steven Tyler + Steven Tyler
  • - Coachella + Coachella
  • - Friday + Friday
  • - Modern Family + Modern Family
    • @@ -178,49 +178,49 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
  • Trending topics
  • - Obamacare + Obamacare
  • - First Class + First Class
  • - English + English
  • - Rise & Grind + Rise & Grind
  • - Rivaldo + Rivaldo
  • - Seoul Music Awards + Seoul Music Awards
  • - Passiva + Passiva
    • @@ -229,49 +229,49 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
  • Trending topics
  • - JBisJonasBrothers + JBisJonasBrothers
  • - Farmacêutico + Farmacêutico
  • - Giuliano + Giuliano
  • - Edgar Allan Poe + Edgar Allan Poe
  • - Tom Hardy + Tom Hardy
  • - Janis Joplin + Janis Joplin
  • - Bane + Bane
    • @@ -288,7 +288,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo @@ -314,25 +314,25 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo

    Top Trending Topics

    @@ -349,11 +349,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo

    See who’s here