From 3baffe1c43bedf1e0d917db106ad47c892549245 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 23 Oct 2017 15:46:00 -0400 Subject: [PATCH 1/6] Update SNAPSHOT to 1.0.0.RC1 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2fb4e462..d1a4a0d7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC1 spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 67bd22d2..92b32704 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC1 pom Spring Cloud Gateway @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.5.RELEASE diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index d7e990bd..e632533b 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -5,12 +5,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.5.RELEASE spring-cloud-gateway-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC1 pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index f6610837..be808763 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC1 .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index dc66f5c6..5359593c 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC1 .. From f910065e316ca217df43ebe8852fb616f7771a22 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 23 Oct 2017 15:46:22 -0400 Subject: [PATCH 2/6] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d1a4a0d7..2fb4e462 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RC1 + 1.0.0.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 92b32704..67bd22d2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RC1 + 1.0.0.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.3.5.RELEASE + 1.3.5.BUILD-SNAPSHOT diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index e632533b..d7e990bd 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -5,12 +5,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.RELEASE + 1.3.5.BUILD-SNAPSHOT spring-cloud-gateway-dependencies - 1.0.0.RC1 + 1.0.0.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index be808763..f6610837 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RC1 + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index 5359593c..dc66f5c6 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RC1 + 1.0.0.BUILD-SNAPSHOT .. From bf08ba2b3c3b2ecfca2a261bd79c07703c985e61 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 22 Nov 2017 00:55:30 +0000 Subject: [PATCH 3/6] Update SNAPSHOT to 1.0.0.RELEASE --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2fb4e462..a6e06f2d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RELEASE spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 67bd22d2..4cfb462f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RELEASE pom Spring Cloud Gateway @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.6.RELEASE diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index d7e990bd..ff64fb95 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -5,12 +5,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.6.RELEASE spring-cloud-gateway-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RELEASE pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index f6610837..c3efb278 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RELEASE .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index dc66f5c6..2f531930 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RELEASE .. From e420037d4556a6e0450ddc0245074dd5dde8ba40 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 22 Nov 2017 00:56:11 +0000 Subject: [PATCH 4/6] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a6e06f2d..2fb4e462 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 4cfb462f..67bd22d2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.3.6.RELEASE + 1.3.5.BUILD-SNAPSHOT diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index ff64fb95..d7e990bd 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -5,12 +5,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.6.RELEASE + 1.3.5.BUILD-SNAPSHOT spring-cloud-gateway-dependencies - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index c3efb278..f6610837 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index 2f531930..dc66f5c6 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. From 2eb6470822f8c7df4f359f888ee26d61ac3de477 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 22 Nov 2017 00:56:11 +0000 Subject: [PATCH 5/6] Bumping versions to 1.0.1.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2fb4e462..df358f49 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 67bd22d2..61634f49 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.6.RELEASE diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index d7e990bd..1f85a961 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -5,12 +5,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.6.RELEASE spring-cloud-gateway-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index f6610837..ac3d0eb2 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index dc66f5c6..b8acb46a 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-gateway - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT .. From 9b61b3387f1dd50d4528da2c7c9970783862f4c3 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 22 Nov 2017 09:24:38 +0000 Subject: [PATCH 6/6] Don't make assumptions about the UriTemplateHandler Fixes gh-115 --- spring-cloud-gateway-mvc/pom.xml | 5 +++++ .../org/springframework/cloud/gateway/mvc/ProxyExchange.java | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index ac3d0eb2..1b02149f 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -25,6 +25,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-actuator + test + org.springframework.boot spring-boot-configuration-processor diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java index ff67f9e5..efd3a471 100644 --- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java +++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java @@ -66,7 +66,6 @@ import org.springframework.web.context.request.WebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor; -import org.springframework.web.util.AbstractUriTemplateHandler; /** * A @RequestMapping argument type that can proxy the request to a backend. @@ -463,9 +462,7 @@ public class ProxyExchange { NestedTemplate rest = new NestedTemplate(); rest.setMessageConverters(input.getMessageConverters()); rest.setErrorHandler(input.getErrorHandler()); - rest.setDefaultUriVariables( - ((AbstractUriTemplateHandler) input.getUriTemplateHandler()) - .getDefaultUriVariables()); + rest.setUriTemplateHandler(input.getUriTemplateHandler()); rest.setRequestFactory(input.getRequestFactory()); rest.setInterceptors(input.getInterceptors()); return rest;