From 66bcdbd6bbb5254ad91bcd25a6cd215d46bbc935 Mon Sep 17 00:00:00 2001 From: Emelyanov Alexandr Date: Tue, 19 Feb 2019 12:06:05 +0500 Subject: [PATCH 1/6] bumping snapshot version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 19faa03..ca99fc0 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'maven-publish' // project properties group 'ru.reliabletech' def libName = 'zuul-springfox-swagger' -version '0.2.0' +version '0.2.1-SNAPSHO' sourceCompatibility = 1.8 def currentDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE) From 387b0d1f888225dc075573428e73c33e8959400b Mon Sep 17 00:00:00 2001 From: Emelyanov Alexandr Date: Tue, 19 Feb 2019 12:22:49 +0500 Subject: [PATCH 2/6] SNAPSHO -> SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ca99fc0..c7ec52c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'maven-publish' // project properties group 'ru.reliabletech' def libName = 'zuul-springfox-swagger' -version '0.2.1-SNAPSHO' +version '0.2.1-SNAPSHOT' sourceCompatibility = 1.8 def currentDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE) From cf152f9f05222a249fa2a62b8a07a5cd8e56eb75 Mon Sep 17 00:00:00 2001 From: Emelyanov Alexandr Date: Tue, 19 Feb 2019 12:37:51 +0500 Subject: [PATCH 3/6] SNAPSHO -> SNAPSHOT --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8240511..c83f46c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_install: before_deploy: - ./gradlew generatePomFileForMavenPublication deploy: + skip_cleanup: true key: secure: Koqvbo26cGgG5QHR9zSGojtvkVtRMxkd3rTejEyWHXnmjbDAnWVLeJf81pz6Vn2lrHbZkCHx+Ec4t3Cptq+v5fXlrgKtjYUORirMK4KWKT0ZLwE41oFo37Y8YVtRLlUiIk7BIteUbY6+p9HTlcQE60TCo9DugVX6Kn8c5tvBtukjckq3uL2/K+IIhtVbHCL6IEMKlQ0O0Wzvhe2m2qTIhAyCjnHgrTM9TxWYqxU5K0ShpL/OgySzXPcJPxy49jPDjp1FmtiMU/Lu5L7l1pzJ8vfWay7rfwJuu0VOy4cCno+8NFNEz5To08eDSIMsHovyqD7CnWkOOeEp9Vkd+D/Td1m2+7xX4UO1HqPmoTaSi2JrBo6FLDdfW+MWd5QGFsSP66hRSaEVV6AicgC1qreFqQQJKxl7XeLlXBt/HCN3qMhh0mKWggN76gnVV9yQY3n1QmtxLR3xgn8DC4xcAepYiDyUsxibVk1k5q1YHmGTpn2AfkrxhB5Dw97f/T8FrG2iO32NopieiugKh7Ln60TEsgDzsscyVic9OGEhQpCHVBI34jSO+/alh8ui+ULcNpreltJNk+tQAGejvMqDTEcYpAXKcuij2CzlFGchnBXnVnJquXP9i/s0s8k/VxARlrY8zUy2AM2lOq0LjNCEPm1whstv2lM2WmUi8mUwdzCFngI= provider: bintray @@ -15,6 +16,7 @@ deploy: user: lex on: develop deploy: + skip_cleanup: true key: secure: Koqvbo26cGgG5QHR9zSGojtvkVtRMxkd3rTejEyWHXnmjbDAnWVLeJf81pz6Vn2lrHbZkCHx+Ec4t3Cptq+v5fXlrgKtjYUORirMK4KWKT0ZLwE41oFo37Y8YVtRLlUiIk7BIteUbY6+p9HTlcQE60TCo9DugVX6Kn8c5tvBtukjckq3uL2/K+IIhtVbHCL6IEMKlQ0O0Wzvhe2m2qTIhAyCjnHgrTM9TxWYqxU5K0ShpL/OgySzXPcJPxy49jPDjp1FmtiMU/Lu5L7l1pzJ8vfWay7rfwJuu0VOy4cCno+8NFNEz5To08eDSIMsHovyqD7CnWkOOeEp9Vkd+D/Td1m2+7xX4UO1HqPmoTaSi2JrBo6FLDdfW+MWd5QGFsSP66hRSaEVV6AicgC1qreFqQQJKxl7XeLlXBt/HCN3qMhh0mKWggN76gnVV9yQY3n1QmtxLR3xgn8DC4xcAepYiDyUsxibVk1k5q1YHmGTpn2AfkrxhB5Dw97f/T8FrG2iO32NopieiugKh7Ln60TEsgDzsscyVic9OGEhQpCHVBI34jSO+/alh8ui+ULcNpreltJNk+tQAGejvMqDTEcYpAXKcuij2CzlFGchnBXnVnJquXP9i/s0s8k/VxARlrY8zUy2AM2lOq0LjNCEPm1whstv2lM2WmUi8mUwdzCFngI= provider: bintray From 79a390206e5507b1a82154c0e0cce7e79e374e9c Mon Sep 17 00:00:00 2001 From: Emelyanov Alexandr Date: Mon, 4 Mar 2019 10:31:10 +0500 Subject: [PATCH 4/6] fix deploy descriptor --- README.MD | 4 ++-- descriptor.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.MD b/README.MD index ba0f8a3..27dada6 100644 --- a/README.MD +++ b/README.MD @@ -7,7 +7,7 @@ Repository contains library for using springfox swagger UI under ZUUL proxy ## Requirements - - Gradle 3.x, or 4.x. + - Gradle 5.x. - Java 8 or later ## License information @@ -78,7 +78,7 @@ dependencies { ## Build -Gradle tasks may be running via `gradle` wrapper - `gradlew`(gradle v4.3.1) from project root folder. +Gradle tasks may be running via `gradle` wrapper - `gradlew` from project root folder. * build: `gradle clean build` diff --git a/descriptor.json b/descriptor.json index c799f5c..2d7c0f4 100644 --- a/descriptor.json +++ b/descriptor.json @@ -23,7 +23,7 @@ }, "files":[ {"includePattern": "build/libs/(.*)", "uploadPattern": "ru/reliabletech/zuul-springfox-swagger/${version}/\$1"}, - {"includePattern": "build/publications/maven/pom-default.xml", "uploadPattern": "ru/reliabletech/zuul-springfox-swagger/${version}/pom-${version}.xml"} + {"includePattern": "build/publications/maven/pom-default.xml", "uploadPattern": "ru/reliabletech/zuul-springfox-swagger/${version}/zuul-springfox-swagger-${version}.pom"} ], "publish": true } From 514c6c886115b701646a21d06c2b7d8e5cf09249 Mon Sep 17 00:00:00 2001 From: Emelyanov Alexandr Date: Mon, 4 Mar 2019 10:33:52 +0500 Subject: [PATCH 5/6] fix path construction --- .../zuul/swagger/props/ServicesSwaggerInfo.java | 3 ++- .../zuul/swagger/service/GenericSwaggerService.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/reliabletech/zuul/swagger/props/ServicesSwaggerInfo.java b/src/main/java/ru/reliabletech/zuul/swagger/props/ServicesSwaggerInfo.java index f9c57ff..cae14ae 100644 --- a/src/main/java/ru/reliabletech/zuul/swagger/props/ServicesSwaggerInfo.java +++ b/src/main/java/ru/reliabletech/zuul/swagger/props/ServicesSwaggerInfo.java @@ -53,6 +53,7 @@ public Optional getServiceUrl(String route) { public Optional getServicePath(String route) { return Optional.ofNullable(routes.get(route)) - .map(ServiceInfo::getPath); + .map(ServiceInfo::getPath) + .map(path -> path.replaceAll("^/", "").replaceAll("/\\*\\*", "")); } } \ No newline at end of file diff --git a/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java b/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java index 9c89576..fafc68a 100644 --- a/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java +++ b/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java @@ -28,7 +28,12 @@ public class GenericSwaggerService implements SwaggerService { public ObjectNode getSwaggerDoc(String route) { ObjectNode swaggerDocumentation = getOriginalSwaggerDoc(route); swaggerDocumentation.set("host", new TextNode("")); - swaggerDocumentation.set("basePath", new TextNode(servicesSwaggerInfo.getPrefix() + routeService.getPath(route))); + String path = new StringBuilder().append(servicesSwaggerInfo.getPrefix()) + .append("/") + .append(routeService.getPath(route)) + .toString() + .replaceAll("[/]+", "/"); + swaggerDocumentation.set("basePath", new TextNode(path)); return swaggerDocumentation; } From 60bc62b04d0eb02e8b10f7e5ad16d6566bd7e9e8 Mon Sep 17 00:00:00 2001 From: Emelyanov Alexandr Date: Mon, 4 Mar 2019 10:34:59 +0500 Subject: [PATCH 6/6] bump version to 0.2.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c7ec52c..8668ced 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'maven-publish' // project properties group 'ru.reliabletech' def libName = 'zuul-springfox-swagger' -version '0.2.1-SNAPSHOT' +version '0.2.1' sourceCompatibility = 1.8 def currentDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)