Commit 354f8910bf4d79711f2a441ad6eb5470f432e2e8
Committed by
Andrew Shvayka
1 parent
0e4f72b4
Fixed URL templating (#1359)
* fixed conflicts * fixed URL templating * added springfox version * moved dependency declaration * further fix * more fixes * optimized import * reverting to first version to check * reverted to version before new dependency * added dependency with version in correct place * added to dependencyManagement
Showing
4 changed files
with
12 additions
and
2 deletions
... | ... | @@ -264,6 +264,10 @@ |
264 | 264 | <groupId>org.javadelight</groupId> |
265 | 265 | <artifactId>delight-nashorn-sandbox</artifactId> |
266 | 266 | </dependency> |
267 | + <dependency> | |
268 | + <groupId>io.springfox.ui</groupId> | |
269 | + <artifactId>springfox-swagger-ui-rfc6570</artifactId> | |
270 | + </dependency> | |
267 | 271 | </dependencies> |
268 | 272 | |
269 | 273 | <build> | ... | ... |
application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java
... | ... | @@ -17,7 +17,6 @@ package org.thingsboard.server.actors.ruleChain; |
17 | 17 | |
18 | 18 | import akka.actor.ActorContext; |
19 | 19 | import akka.actor.ActorRef; |
20 | -import akka.event.LoggingAdapter; | |
21 | 20 | import org.thingsboard.rule.engine.api.TbContext; |
22 | 21 | import org.thingsboard.rule.engine.api.TbNode; |
23 | 22 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; | ... | ... |
... | ... | @@ -64,7 +64,8 @@ public class SwaggerConfiguration { |
64 | 64 | .paths(apiPaths()) |
65 | 65 | .build() |
66 | 66 | .securitySchemes(newArrayList(jwtTokenKey())) |
67 | - .securityContexts(newArrayList(securityContext())); | |
67 | + .securityContexts(newArrayList(securityContext())) | |
68 | + .enableUrlTemplating(true); | |
68 | 69 | } |
69 | 70 | |
70 | 71 | private ApiKey jwtTokenKey() { | ... | ... |
... | ... | @@ -70,6 +70,7 @@ |
70 | 70 | <surfire.version>2.19.1</surfire.version> |
71 | 71 | <jar-plugin.version>3.0.2</jar-plugin.version> |
72 | 72 | <springfox-swagger.version>2.6.1</springfox-swagger.version> |
73 | + <springfox-swagger-ui-rfc6570.version>1.0.0</springfox-swagger-ui-rfc6570.version> | |
73 | 74 | <bouncycastle.version>1.56</bouncycastle.version> |
74 | 75 | <winsw.version>2.0.1</winsw.version> |
75 | 76 | <hsqldb.version>2.4.0</hsqldb.version> |
... | ... | @@ -794,6 +795,11 @@ |
794 | 795 | <artifactId>bucket4j-core</artifactId> |
795 | 796 | <version>${bucket4j.version}</version> |
796 | 797 | </dependency> |
798 | + <dependency> | |
799 | + <groupId>io.springfox.ui</groupId> | |
800 | + <artifactId>springfox-swagger-ui-rfc6570</artifactId> | |
801 | + <version>${springfox-swagger-ui-rfc6570.version}</version> | |
802 | + </dependency> | |
797 | 803 | </dependencies> |
798 | 804 | </dependencyManagement> |
799 | 805 | ... | ... |