From d38fd18d23f969a141b3a854cec2c28bba85a758 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 20:04:12 -0500 Subject: [PATCH] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://queue-url.com/ (UnknownHostException) with 2 occurrences migrated to: https://queue-url.com/ ([https](https://queue-url.com/) result UnknownHostException). * [ ] http://queue-url.com/bar (UnknownHostException) with 1 occurrences migrated to: https://queue-url.com/bar ([https](https://queue-url.com/bar) result UnknownHostException). * [ ] http://queue-url.com/baz (UnknownHostException) with 1 occurrences migrated to: https://queue-url.com/baz ([https](https://queue-url.com/baz) result UnknownHostException). * [ ] http://queue-url.com/foo (UnknownHostException) with 2 occurrences migrated to: https://queue-url.com/foo ([https](https://queue-url.com/foo) result UnknownHostException). * [ ] http://help.github.com/send-pull-requests (404) with 1 occurrences migrated to: https://help.github.com/send-pull-requests ([https](https://help.github.com/send-pull-requests) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://aws.amazon.com/ with 1 occurrences migrated to: https://aws.amazon.com/ ([https](https://aws.amazon.com/) result 200). * [ ] http://aws.amazon.com/products/ with 3 occurrences migrated to: https://aws.amazon.com/products/ ([https](https://aws.amazon.com/products/) result 200). * [ ] http://aws.amazon.com/ses/ with 2 occurrences migrated to: https://aws.amazon.com/ses/ ([https](https://aws.amazon.com/ses/) result 200). * [ ] http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-long-polling.html with 1 occurrences migrated to: https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-long-polling.html ([https](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-long-polling.html) result 200). * [ ] http://docs.spring.io/spring-integration/reference/ with 1 occurrences migrated to: https://docs.spring.io/spring-integration/reference/ ([https](https://docs.spring.io/spring-integration/reference/) result 200). * [ ] http://projects.spring.io/spring-integration/ with 1 occurrences migrated to: https://projects.spring.io/spring-integration/ ([https](https://projects.spring.io/spring-integration/) result 200). * [ ] http://www.apache.org with 1 occurrences migrated to: https://www.apache.org ([https](https://www.apache.org) result 200). * [ ] http://www.springframework.org/schema/integration/spring-integration.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/integration/spring-integration.xsd ([https](https://www.springframework.org/schema/integration/spring-integration.xsd) result 200). * [ ] http://aws.amazon.com/documentation/ses/ with 2 occurrences migrated to: https://aws.amazon.com/documentation/ses/ ([https](https://aws.amazon.com/documentation/ses/) result 301). * [ ] http://aws.amazon.com/sdkforjava/ with 1 occurrences migrated to: https://aws.amazon.com/sdkforjava/ ([https](https://aws.amazon.com/sdkforjava/) result 301). * [ ] http://contributor-covenant.org with 1 occurrences migrated to: https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301). * [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to: https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301). * [ ] http://www.springframework.org with 1 occurrences migrated to: https://www.springframework.org ([https](https://www.springframework.org) result 301). # Ignored These URLs were intentionally ignored. * http://localhost with 4 occurrences * http://testQueue.amazonaws.com with 2 occurrences * http://www.springframework.org/schema/beans with 1 occurrences * http://www.springframework.org/schema/integration with 2 occurrences * http://www.springframework.org/schema/integration/aws with 2 occurrences * http://www.springframework.org/schema/tool with 2 occurrences * http://www.w3.org/2001/XMLSchema with 1 occurrences --- CODE_OF_CONDUCT.adoc | 4 ++-- README.md | 14 +++++++------- src/api/overview.html | 4 ++-- src/dist/notice.txt | 4 ++-- .../aws/config/spring-integration-aws-2.2.xsd | 4 ++-- .../aws/outbound/SqsMessageHandlerTests.java | 12 ++++++------ 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f..17783c7 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/README.md b/README.md index 714279c..fa3dba4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Spring Integration Extension for Amazon Web Services (AWS) Launched in 2006, [Amazon Web Services][] (AWS) provides key infrastructure services for business through its cloud computing platform. Using cloud computing businesses can adopt a new business model whereby they do not have to plan and invest in procuring their own IT infrastructure. They can use the infrastructure and services -provided by the cloud service provider and pay as they use the services. Visit [http://aws.amazon.com/products/] +provided by the cloud service provider and pay as they use the services. Visit [https://aws.amazon.com/products/] for more details about various products offered by Amazon as a part their cloud computing services. *Spring Integration Extension for Amazon Web Services* provides Spring Integration adapters for the various services @@ -649,13 +649,13 @@ This implementation can also be used for the distributed leader elections using The `com.amazonaws:dynamodb-lock-client` dependency must be present to make a `DynamoDbLockRegistry` working. [Spring Cloud AWS]: https://github.com/spring-cloud/spring-cloud-aws -[AWS SDK for Java]: http://aws.amazon.com/sdkforjava/ -[Amazon Web Services]: http://aws.amazon.com/ -[http://aws.amazon.com/products/]: http://aws.amazon.com/products/ -[http://aws.amazon.com/ses/]: http://aws.amazon.com/ses/ -[http://aws.amazon.com/documentation/ses/]: http://aws.amazon.com/documentation/ses/ +[AWS SDK for Java]: https://aws.amazon.com/sdkforjava/ +[Amazon Web Services]: https://aws.amazon.com/ +[https://aws.amazon.com/products/]: https://aws.amazon.com/products/ +[https://aws.amazon.com/ses/]: https://aws.amazon.com/ses/ +[https://aws.amazon.com/documentation/ses/]: https://aws.amazon.com/documentation/ses/ [FTP/FTPS Adapters Chapter]: https://docs.spring.io/spring-integration/reference/html/ftp.html -[Pull requests]: http://help.github.com/send-pull-requests +[Pull requests]: https://help.github.com/send-pull-requests [contributor guidelines]: https://github.com/spring-projects/spring-integration/blob/master/CONTRIBUTING.adoc [administrator guidelines]: https://github.com/spring-projects/spring-integration/wiki/Administrator-Guidelines [Dynalite]: https://github.com/mhart/dynalite diff --git a/src/api/overview.html b/src/api/overview.html index 86b923a..5b70134 100644 --- a/src/api/overview.html +++ b/src/api/overview.html @@ -5,7 +5,7 @@ This document is the API specification for Spring Integration AWS Support

For further API reference and developer documentation, see the - Spring + Spring Integration reference documentation. That documentation contains more detailed, developer-targeted descriptions, with conceptual overviews, definitions of terms, @@ -13,7 +13,7 @@ This document is the API specification for Spring Integration AWS Support

- Spring + Spring Integration main project page

diff --git a/src/dist/notice.txt b/src/dist/notice.txt index f62045a..607cea5 100644 --- a/src/dist/notice.txt +++ b/src/dist/notice.txt @@ -4,13 +4,13 @@ ======================================================================== This product includes software developed by - the Apache Software Foundation (http://www.apache.org). + the Apache Software Foundation (https://www.apache.org). The end-user documentation included with a redistribution, if any, must include the following acknowledgement: "This product includes software developed by the Spring Framework - Project (http://www.springframework.org)." + Project (https://www.springframework.org)." Alternatively, this acknowledgement may appear in the software itself, if and wherever such third-party acknowledgements normally appear. diff --git a/src/main/resources/org/springframework/integration/aws/config/spring-integration-aws-2.2.xsd b/src/main/resources/org/springframework/integration/aws/config/spring-integration-aws-2.2.xsd index 8442d38..ff56df1 100644 --- a/src/main/resources/org/springframework/integration/aws/config/spring-integration-aws-2.2.xsd +++ b/src/main/resources/org/springframework/integration/aws/config/spring-integration-aws-2.2.xsd @@ -10,7 +10,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/> @@ -745,7 +745,7 @@ to arrive if the are currently no messages on the queue. Higher values will reduce poll request to the system significantly. The value should be between 1 and 20. For more information read the - http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-long-polling.html + https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-long-polling.html ]]> diff --git a/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java b/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java index 0d2000c..e4255fb 100644 --- a/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java +++ b/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java @@ -103,7 +103,7 @@ public class SqsMessageHandlerTests { verify(this.amazonSqs) .sendMessageAsync(sendMessageRequestArgumentCaptor.capture(), any(AsyncHandler.class)); assertThat(sendMessageRequestArgumentCaptor.getValue().getQueueUrl()) - .isEqualTo("http://queue-url.com/foo"); + .isEqualTo("https://queue-url.com/foo"); message = MessageBuilder.withPayload("message").setHeader(AwsHeaders.QUEUE, "bar").build(); this.sqsSendChannel.send(message); @@ -111,7 +111,7 @@ public class SqsMessageHandlerTests { .sendMessageAsync(sendMessageRequestArgumentCaptor.capture(), any(AsyncHandler.class)); assertThat(sendMessageRequestArgumentCaptor.getValue().getQueueUrl()) - .isEqualTo("http://queue-url.com/bar"); + .isEqualTo("https://queue-url.com/bar"); SpelExpressionParser spelExpressionParser = new SpelExpressionParser(); Expression expression = spelExpressionParser.parseExpression("headers.foo"); @@ -123,7 +123,7 @@ public class SqsMessageHandlerTests { SendMessageRequest sendMessageRequestArgumentCaptorValue = sendMessageRequestArgumentCaptor.getValue(); assertThat(sendMessageRequestArgumentCaptorValue.getQueueUrl()) - .isEqualTo("http://queue-url.com/baz"); + .isEqualTo("https://queue-url.com/baz"); Map messageAttributes = sendMessageRequestArgumentCaptorValue.getMessageAttributes(); @@ -152,7 +152,7 @@ public class SqsMessageHandlerTests { verify(this.amazonSqs) .sendMessageAsync(sendMessageRequestArgumentCaptor.capture(), any(AsyncHandler.class)); assertThat(sendMessageRequestArgumentCaptor.getValue().getQueueUrl()) - .isEqualTo("http://queue-url.com/foo"); + .isEqualTo("https://queue-url.com/foo"); } @Configuration @@ -166,7 +166,7 @@ public class SqsMessageHandlerTests { willAnswer(invocation -> { GetQueueUrlRequest getQueueUrlRequest = (GetQueueUrlRequest) invocation.getArguments()[0]; GetQueueUrlResult queueUrl = new GetQueueUrlResult(); - queueUrl.setQueueUrl("http://queue-url.com/" + getQueueUrlRequest.getQueueName()); + queueUrl.setQueueUrl("https://queue-url.com/" + getQueueUrlRequest.getQueueName()); return queueUrl; }) .given(amazonSqs) @@ -175,7 +175,7 @@ public class SqsMessageHandlerTests { willAnswer(invocation -> { CreateQueueRequest createQueueRequest = (CreateQueueRequest) invocation.getArguments()[0]; CreateQueueResult queueUrl = new CreateQueueResult(); - queueUrl.setQueueUrl("http://queue-url.com/" + createQueueRequest.getQueueName()); + queueUrl.setQueueUrl("https://queue-url.com/" + createQueueRequest.getQueueName()); return queueUrl; }) .given(amazonSqs)