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

@@ -264,6 +264,10 @@
             <groupId>org.javadelight</groupId>
             <groupId>org.javadelight</groupId>
             <artifactId>delight-nashorn-sandbox</artifactId>
             <artifactId>delight-nashorn-sandbox</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>io.springfox.ui</groupId>
+            <artifactId>springfox-swagger-ui-rfc6570</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -17,7 +17,6 @@ package org.thingsboard.server.actors.ruleChain;
 
 
 import akka.actor.ActorContext;
 import akka.actor.ActorContext;
 import akka.actor.ActorRef;
 import akka.actor.ActorRef;
-import akka.event.LoggingAdapter;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;

@@ -64,7 +64,8 @@ public class SwaggerConfiguration {
                     .paths(apiPaths())
                     .paths(apiPaths())
                     .build()
                     .build()
                     .securitySchemes(newArrayList(jwtTokenKey()))
                     .securitySchemes(newArrayList(jwtTokenKey()))
-                    .securityContexts(newArrayList(securityContext()));
+                    .securityContexts(newArrayList(securityContext()))
+                    .enableUrlTemplating(true);
       }
       }
 
 
       private ApiKey jwtTokenKey() {
       private ApiKey jwtTokenKey() {

@@ -70,6 +70,7 @@
         <surfire.version>2.19.1</surfire.version>
         <surfire.version>2.19.1</surfire.version>
         <jar-plugin.version>3.0.2</jar-plugin.version>
         <jar-plugin.version>3.0.2</jar-plugin.version>
         <springfox-swagger.version>2.6.1</springfox-swagger.version>
         <springfox-swagger.version>2.6.1</springfox-swagger.version>
+        <springfox-swagger-ui-rfc6570.version>1.0.0</springfox-swagger-ui-rfc6570.version>
         <bouncycastle.version>1.56</bouncycastle.version>
         <bouncycastle.version>1.56</bouncycastle.version>
         <winsw.version>2.0.1</winsw.version>
         <winsw.version>2.0.1</winsw.version>
         <hsqldb.version>2.4.0</hsqldb.version>
         <hsqldb.version>2.4.0</hsqldb.version>
@@ -794,6 +795,11 @@
                 <artifactId>bucket4j-core</artifactId>
                 <artifactId>bucket4j-core</artifactId>
                 <version>${bucket4j.version}</version>
                 <version>${bucket4j.version}</version>
             </dependency>
             </dependency>
+            <dependency>
+                <groupId>io.springfox.ui</groupId>
+                <artifactId>springfox-swagger-ui-rfc6570</artifactId>
+                <version>${springfox-swagger-ui-rfc6570.version}</version>
+            </dependency>
         </dependencies>
         </dependencies>
     </dependencyManagement>
     </dependencyManagement>