From 7ba82aef3be961cfc3c6f0df0a9b9bb25faf32dd Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Wed, 26 Sep 2018 17:21:18 +0300
Subject: [PATCH] Fixes to configuration

---
 .../server/service/script/NashornJsInvokeService.java     | 6 +++---
 .../thingsboard/server/kafka/TbKafkaRequestTemplate.java  | 8 ++++----
 .../org/thingsboard/server/kafka/TbKafkaSettings.java     | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/script/NashornJsInvokeService.java b/application/src/main/java/org/thingsboard/server/service/script/NashornJsInvokeService.java
index eadbf2838c..a50ab278da 100644
--- a/application/src/main/java/org/thingsboard/server/service/script/NashornJsInvokeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/script/NashornJsInvokeService.java
@@ -29,13 +29,13 @@ public class NashornJsInvokeService extends AbstractNashornJsInvokeService {
     @Value("${js.local.use_js_sandbox}")
     private boolean useJsSandbox;
 
-    @Value("${js.local.js_sandbox.monitor_thread_pool_size}")
+    @Value("${js.local.monitor_thread_pool_size}")
     private int monitorThreadPoolSize;
 
-    @Value("${js.local.js_sandbox.max_cpu_time}")
+    @Value("${js.local.max_cpu_time}")
     private long maxCpuTime;
 
-    @Value("${js.local.js_sandbox.max_errors}")
+    @Value("${js.local.max_errors}")
     private int maxErrors;
 
     @Override
diff --git a/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaRequestTemplate.java b/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaRequestTemplate.java
index be8c087060..dd1a47a693 100644
--- a/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaRequestTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaRequestTemplate.java
@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2018 The Thingsboard Authors
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaSettings.java b/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaSettings.java
index 757902f174..0bfa646715 100644
--- a/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaSettings.java
+++ b/common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaSettings.java
@@ -36,7 +36,7 @@ public class TbKafkaSettings {
     public static final String RESPONSE_TOPIC_HEADER = "responseTopic";
 
 
-    @Value("${kafka.bootstrap.server}")
+    @Value("${kafka.bootstrap.servers}")
     private String servers;
 
     @Value("${kafka.acks}")
@@ -54,7 +54,7 @@ public class TbKafkaSettings {
     @Value("${kafka.buffer.memory}")
     private long bufferMemory;
 
-    @Value("${kafka.other:null}")
+    @Value("${kafka.other:#{null}}")
     private List<TbKafkaProperty> other;
 
     public Properties toProps() {