Code cleanup and java 7 support

Author: umajeric

README.md

@@ -19,6 +19,22 @@ The Java SDK for interacting with the Databox Push API v 2.0.
 		System.err.println(e.getLocalizedMessage());
 	}
 ```
+
+### Sending multiple metrics at once
+
+```java
+	String TOKEN = "your_token_goes_here";
+	Databox notification = new Databox(TOKEN);
+	try {
+		List<Databox.KPI> kpis = new ArrayList<Databox.KPI>();
+		kpis.add(new Databox.KPI().setKey("my_first_key").setValue(1201.41));
+		kpis.add(new Databox.KPI().setKey("my_second_key").setValue(8249));
+		notification.push(kpis);
+	} catch (Exception e) {
+		logger.error(e.getLocalizedMessage(), e);
+	}
+```
+
 ## License
 
 `databox-sdk` is licensed under the Apache License, Version 2.0 - see the [LICENSE](http://www.apache.org/licenses/LICENSE-2.0) file for details

build.gradle

@@ -7,6 +7,12 @@ repositories {
   mavenCentral()
 }
 
+allprojects {
+  apply plugin: 'java'
+  sourceCompatibility = 1.7
+  targetCompatibility = 1.7
+}
+
 dependencies {
   compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.+'
   testCompile group: 'junit', name: 'junit', version: '4.+'

src/main/java/com/databox/sdk/Databox.java

@@ -25,6 +25,7 @@
 public class Databox {
 	static final Logger logger = LoggerFactory.getLogger(Databox.class);
 	private static final String DEFAULT_HOST = "https://push2new.databox.com";
+	private static final String CLIENT_VERSION = "2.0";
 
 	private final String _token;
 	private String _host;
@@ -81,7 +82,7 @@ private boolean push(String rawData) {
 			conn = (HttpURLConnection) url.openConnection();
 			conn.setRequestMethod("POST");
 			conn.setRequestProperty("Content-Type", "application/json");
-			conn.setRequestProperty("User-Agent", "java-sdk");
+			conn.setRequestProperty("User-Agent", "Databox/" + CLIENT_VERSION);
 
 			String encodedBytes = base64Encode((_token + ":").getBytes("UTF-8"));
 			String authorization = "Basic " + encodedBytes;
@@ -113,8 +114,8 @@ private boolean push(String rawData) {
 			logger.info(input.toString() + ": " + rawData);
 			return true;
 		} catch (Exception e) {
-			logger.error("Not send: " + rawData);
 			logger.error(e.getLocalizedMessage(), e);
+			throw new RuntimeException(e);
 		} finally {
 			if (conn != null) {
 				conn.disconnect();
@@ -127,7 +128,6 @@ private boolean push(String rawData) {
 				}
 			}
 		}
-		return false;
 	}
 
 	public void setHost(String host) {
@@ -183,7 +183,7 @@ public static class KPI {
 		private String key;
 		private Object value;
 		private Date date;
-		private Map<String, Object> attributes = new HashMap<String, Object>();
+		private Map<String, Object> attributes = new HashMap<>();
 
 		static {
 			SDF = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");

src/test/java/com/databox/sdk/DataboxTest.java

@@ -3,6 +3,8 @@
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -19,9 +21,9 @@
 public class DataboxTest extends TestCase {
 	private static final Logger logger = LoggerFactory.getLogger(DataboxTest.class);
 
-	private static final String TOKEN = "mj2dx0y7xk0g4wwos8o884cc0gs0woow";
+	private static final String TOKEN = "my_api_key";
 
-	public void testTrigger() throws IOException {
+	public void testPush() throws IOException {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
 		Databox notification = new Databox(TOKEN);
 		try {
@@ -31,4 +33,16 @@ public void testTrigger() throws IOException {
 		}
 	}
 
+	public void testPushArray() throws IOException {
+		Databox notification = new Databox(TOKEN);
+		try {
+			List<Databox.KPI> kpis = new ArrayList<>();
+			kpis.add(new Databox.KPI().setKey("my_first_key").setValue(1201.41));
+			kpis.add(new Databox.KPI().setKey("my_second_key").setValue(8249));
+			notification.push(kpis);
+		} catch (Exception e) {
+			logger.error(e.getLocalizedMessage(), e);
+		}
+	}
+
 }