cleanup http header fields

cleanup http header fields

Author: amavashev

src/main/java/com/jkoolcloud/client/api/service/JKQIConstants.java

@@ -16,7 +16,6 @@
 package com.jkoolcloud.client.api.service;
 
 public interface JKQIConstants {
-	static final String CONTENT_TYPE = "content-type";
 	static final String JKOOL_TOKEN = System.getProperty("jkool.api.token");
 
 	static final String JKOOL_STREAM_URL = System.getProperty("jkool.stream.url", "https://data.jkoolcloud.com/JESL");
@@ -26,12 +25,13 @@ public interface JKQIConstants {
 			"wss://jkool.jkoolcloud.com/jkool-service/jkqlasync");
 
 	// HTTP header keys
+	static final String CONTENT_TYPE = "content-type";
 	static final String X_API_KEY = "X-API-Key";
 	static final String X_API_HOSTNAME = "X-API-Host-Name";
 	static final String X_API_HOSTADDR = "X-API-Host-Addr";
 	static final String X_API_RUNTIME = "X-API-Runtime";
 	static final String X_API_VERSION = "X-API-Version";
-	static final String TOKEN_KEY = "token";
+	static final String X_API_TOKEN = "token";
 
 	static final String JK_EVENT_KEY = "event";
 	static final String JK_ACTIVITY_KEY = "activity";

src/main/java/com/jkoolcloud/client/api/service/JKQuery.java

@@ -266,7 +266,7 @@ public Response call(String _query, String _token, String _repo, String _tz, Str
 
 		return target.request(MediaType.APPLICATION_JSON)
 				.header(X_API_KEY, _token)
-				.header(JK_TOKEN_KEY, _token)
+				.header(X_API_TOKEN, _token)
 				.get();
 	}
 
@@ -293,7 +293,7 @@ public HttpResponse get(String query, int maxRows) throws JKStreamException {
 			HttpGet request = new HttpGet(getServiceUrl() + "?" + urlQuery);
 			// optionally, token can be in the header.
 			request.addHeader(X_API_KEY, getToken());
-			request.addHeader(JK_TOKEN_KEY, getToken());
+			request.addHeader(X_API_TOKEN, getToken());
 			request.addHeader(CONTENT_TYPE, MediaType.APPLICATION_JSON);
 			HttpResponse response = httpClient.execute(request);
 			return response;

src/main/java/com/jkoolcloud/client/api/service/JKStream.java

@@ -159,7 +159,7 @@ protected Response post(String path, Object obj) throws JKStreamException {
 				.header(X_API_HOSTADDR, VALUE_HOSTADDR)
 				.header(X_API_RUNTIME, VALUE_VMNAME)
 				.header(X_API_VERSION, VALUE_VERSION)
-				.header(TOKEN_KEY, token)
+				.header(X_API_TOKEN, token)
 				.post(Entity.entity(serialize(obj), MediaType.APPLICATION_JSON));		
 	}