From 0619c22a663ebba19925458074fc94c97069c4b5 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 26 Mar 2019 03:44:33 -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://route.example.com (UnknownHostException) with 1 occurrences migrated to: https://route.example.com ([https](https://route.example.com) result UnknownHostException). * [ ] http://syslog.example.com (UnknownHostException) with 1 occurrences migrated to: https://syslog.example.com ([https](https://syslog.example.com) result UnknownHostException). * [ ] http://uri.example.com (UnknownHostException) with 1 occurrences migrated to: https://uri.example.com ([https](https://uri.example.com) result UnknownHostException). * [ ] http://example.com/binding/create/schema (404) with 1 occurrences migrated to: https://example.com/binding/create/schema ([https](https://example.com/binding/create/schema) result 404). * [ ] http://example.com/service/create/schema (404) with 1 occurrences migrated to: https://example.com/service/create/schema ([https](https://example.com/service/create/schema) result 404). * [ ] http://example.com/service/update/schema (404) with 1 occurrences migrated to: https://example.com/service/update/schema ([https](https://example.com/service/update/schema) 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://docs.cloudfoundry.org/services/managing-service-brokers.html with 1 occurrences migrated to: https://docs.cloudfoundry.org/services/managing-service-brokers.html ([https](https://docs.cloudfoundry.org/services/managing-service-brokers.html) result 200). * [ ] http://docs.cloudfoundry.org/services/overview.html with 1 occurrences migrated to: https://docs.cloudfoundry.org/services/overview.html ([https](https://docs.cloudfoundry.org/services/overview.html) result 200). * [ ] http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/ with 2 occurrences migrated to: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/ ([https](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/) result 200). * [ ] http://projects.spring.io/spring-boot/ with 1 occurrences migrated to: https://projects.spring.io/spring-boot/ ([https](https://projects.spring.io/spring-boot/) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 1 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://www.cloudfoundry.org with 1 occurrences migrated to: https://www.cloudfoundry.org ([https](https://www.cloudfoundry.org) result 200). * [ ] http://docs.cloudfoundry.org/services/api.html with 5 occurrences migrated to: https://docs.cloudfoundry.org/services/api.html ([https](https://docs.cloudfoundry.org/services/api.html) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 1 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). # Ignored These URLs were intentionally ignored. * http://test.example.com with 2 occurrences --- README.adoc | 14 +++++++------- .../controller/CatalogController.java | 2 +- .../ServiceInstanceBindingController.java | 2 +- .../controller/ServiceInstanceController.java | 2 +- .../NonBindableServiceInstanceBindingService.java | 2 +- .../servicebroker/model/fixture/PlanFixture.java | 6 +++--- .../fixture/ServiceInstanceBindingFixture.java | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.adoc b/README.adoc index dea6b59b..916addad 100644 --- a/README.adoc +++ b/README.adoc @@ -1,17 +1,17 @@ = Overview -This project provides a framework for building a http://projects.spring.io/spring-boot/[Spring Boot] project to quickly implement a http://docs.cloudfoundry.org/services/overview.html[service broker] for http://www.cloudfoundry.org[Cloud Foundry]. +This project provides a framework for building a https://projects.spring.io/spring-boot/[Spring Boot] project to quickly implement a https://docs.cloudfoundry.org/services/overview.html[service broker] for https://www.cloudfoundry.org[Cloud Foundry]. This project replaces https://github.com/cloudfoundry-community/spring-boot-cf-service-broker[Spring Boot CF Service Broker]. == Compatibility -* http://docs.cloudfoundry.org/services/api.html[Service Broker API]: 2.13 +* https://docs.cloudfoundry.org/services/api.html[Service Broker API]: 2.13 == Getting Started -See the http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#getting-started-first-application[Spring Boot documentation] for getting started building a Spring Boot application. +See the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#getting-started-first-application[Spring Boot documentation] for getting started building a Spring Boot application. A sample https://github.com/spring-cloud-samples/cloudfoundry-service-broker[MongoDB service broker] project is available. @@ -74,7 +74,7 @@ For service instance binding/unbinding, provide a Spring bean that implements th === Security -The project includes the https://github.com/spring-projects/spring-boot/tree/master/spring-boot-starters/spring-boot-starter-security[`spring-boot-starter-security`] project. See the http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-security[Spring Boot Security documentation] for configuration options. +The project includes the https://github.com/spring-projects/spring-boot/tree/master/spring-boot-starters/spring-boot-starter-security[`spring-boot-starter-security`] project. See the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-security[Spring Boot Security documentation] for configuration options. The default behavior creates a user called `user` with a generated password that is logged as an `INFO` message during app startup. For example: @@ -98,7 +98,7 @@ By default, the framework will verify the version of the service broker API for == Deploying your broker -Follow the http://docs.cloudfoundry.org/services/managing-service-brokers.html[documentation] to register the broker to Cloud Foundry. +Follow the https://docs.cloudfoundry.org/services/managing-service-brokers.html[documentation] to register the broker to Cloud Foundry. === Build @@ -138,7 +138,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -151,7 +151,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/src/main/java/org/springframework/cloud/servicebroker/controller/CatalogController.java b/src/main/java/org/springframework/cloud/servicebroker/controller/CatalogController.java index c8e4dcd1..a4974992 100644 --- a/src/main/java/org/springframework/cloud/servicebroker/controller/CatalogController.java +++ b/src/main/java/org/springframework/cloud/servicebroker/controller/CatalogController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; /** - * See: http://docs.cloudfoundry.org/services/api.html + * See: https://docs.cloudfoundry.org/services/api.html * * @author sgreenberg@pivotal.io * @author Scott Frederick diff --git a/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceBindingController.java b/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceBindingController.java index a5a468bb..53e121a2 100644 --- a/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceBindingController.java +++ b/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceBindingController.java @@ -29,7 +29,7 @@ import static org.springframework.cloud.servicebroker.model.ServiceBrokerRequest import static org.springframework.cloud.servicebroker.model.ServiceBrokerRequest.ORIGINATING_IDENTITY_HEADER; /** - * See: http://docs.cloudfoundry.org/services/api.html + * See: https://docs.cloudfoundry.org/services/api.html * * @author sgreenberg@pivotal.io */ diff --git a/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceController.java b/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceController.java index 50d98a97..75d84f69 100644 --- a/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceController.java +++ b/src/main/java/org/springframework/cloud/servicebroker/controller/ServiceInstanceController.java @@ -38,7 +38,7 @@ import static org.springframework.cloud.servicebroker.model.ServiceBrokerRequest import static org.springframework.cloud.servicebroker.model.ServiceBrokerRequest.ORIGINATING_IDENTITY_HEADER; /** - * See: http://docs.cloudfoundry.org/services/api.html + * See: https://docs.cloudfoundry.org/services/api.html * * @author sgreenberg@pivotal.io * @author Scott Frederick diff --git a/src/main/java/org/springframework/cloud/servicebroker/service/NonBindableServiceInstanceBindingService.java b/src/main/java/org/springframework/cloud/servicebroker/service/NonBindableServiceInstanceBindingService.java index a5bbefa4..300c6459 100644 --- a/src/main/java/org/springframework/cloud/servicebroker/service/NonBindableServiceInstanceBindingService.java +++ b/src/main/java/org/springframework/cloud/servicebroker/service/NonBindableServiceInstanceBindingService.java @@ -7,7 +7,7 @@ import org.springframework.cloud.servicebroker.model.DeleteServiceInstanceBindin /** * Default implementation of ServiceInstanceBindingService for service brokers that do not support bindable services. * - * See http://docs.cloudfoundry.org/services/api.html#binding + * See https://docs.cloudfoundry.org/services/api.html#binding * * @author Scott Frederick */ diff --git a/src/test/java/org/springframework/cloud/servicebroker/model/fixture/PlanFixture.java b/src/test/java/org/springframework/cloud/servicebroker/model/fixture/PlanFixture.java index 3d43732e..090fac21 100644 --- a/src/test/java/org/springframework/cloud/servicebroker/model/fixture/PlanFixture.java +++ b/src/test/java/org/springframework/cloud/servicebroker/model/fixture/PlanFixture.java @@ -30,15 +30,15 @@ public class PlanFixture { metadata.put("key2", "value2"); Map createServiceSchema = new HashMap<>(); - createServiceSchema.put("$schema", "http://example.com/service/create/schema"); + createServiceSchema.put("$schema", "https://example.com/service/create/schema"); createServiceSchema.put("type", "object"); Map updateServiceSchema = new HashMap<>(); - updateServiceSchema.put("$schema", "http://example.com/service/update/schema"); + updateServiceSchema.put("$schema", "https://example.com/service/update/schema"); updateServiceSchema.put("type", "object"); Map createBindingSchema = new HashMap<>(); - createBindingSchema.put("$schema", "http://example.com/binding/create/schema"); + createBindingSchema.put("$schema", "https://example.com/binding/create/schema"); createBindingSchema.put("type", "object"); ServiceInstanceSchema serviceInstanceSchema = new ServiceInstanceSchema( diff --git a/src/test/java/org/springframework/cloud/servicebroker/model/fixture/ServiceInstanceBindingFixture.java b/src/test/java/org/springframework/cloud/servicebroker/model/fixture/ServiceInstanceBindingFixture.java index 599e4e25..4b81c9a1 100644 --- a/src/test/java/org/springframework/cloud/servicebroker/model/fixture/ServiceInstanceBindingFixture.java +++ b/src/test/java/org/springframework/cloud/servicebroker/model/fixture/ServiceInstanceBindingFixture.java @@ -18,9 +18,9 @@ public class ServiceInstanceBindingFixture { public static final String SERVICE_INSTANCE_BINDING_ID = "service_instance_binding_id"; public static final String SERVICE_INSTANCE_ID = "service-instance-one-id"; - public static final String SYSLOG_DRAIN_URL = "http://syslog.example.com"; + public static final String SYSLOG_DRAIN_URL = "https://syslog.example.com"; public static final String APP_GUID = "app_guid"; - public static final String ROUTE = "http://route.example.com"; + public static final String ROUTE = "https://route.example.com"; public static CreateServiceInstanceBindingRequest buildCreateAppBindingRequest() { return new CreateServiceInstanceBindingRequest( @@ -80,7 +80,7 @@ public class ServiceInstanceBindingFixture { private static Map getCredentials() { Map credentials = new HashMap<>(); - credentials.put("uri","http://uri.example.com"); + credentials.put("uri","https://uri.example.com"); credentials.put("username", "user1"); credentials.put("password", "pwd1"); return credentials;