Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Re-inserted missing LOG field

Rich Turner6e13023235d0
diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
index bc646da31..29fcbd6e3 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
@@ -19,10 +19,6 @@
*/
package org.openremote.agent.protocol.controller;
-import com.google.gwt.json.client.JSONArray;
-import com.google.gwt.json.client.JSONObject;
-import com.google.gwt.json.client.JSONParser;
-import com.google.gwt.json.client.JSONString;
import org.apache.http.conn.HttpHostConnectException;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.openremote.agent.protocol.AbstractProtocol;
@@ -35,8 +31,6 @@ import org.openremote.model.AbstractValueHolder;
import org.openremote.model.asset.AssetAttribute;
import org.openremote.model.asset.agent.ConnectionStatus;
import org.openremote.model.attribute.*;
-import org.openremote.model.util.Pair;
-import org.openremote.model.util.TextUtil;
import org.openremote.model.value.*;
import javax.ws.rs.ProcessingException;
@@ -87,6 +81,8 @@ import static org.openremote.model.util.TextUtil.*;
@SuppressWarnings("JavaDoc")
public class ControllerProtocol extends AbstractProtocol {
+ private static final Logger LOG = Logger.getLogger(ControllerProtocol.class.getName());
+
public static final String PROTOCOL_NAME = PROTOCOL_NAMESPACE + ":controllerClient";
/*--------------- META ITEMS TO BE USED ON PROTOCOL CONFIGURATIONS ---------------*/
@@ -144,7 +140,7 @@ public class ControllerProtocol extends AbstractProtocol {
* (string)
*/
public static final String META_ATTRIBUTE_COMMANDS_MAP = PROTOCOL_NAME + ":commandsMap";
-
+
public static final int HEARTBEAT_DELAY_SECONDS = 5;
protected static final List<MetaItemDescriptorImpl> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays