Merge pull request #36 from bitmovin/feature/analytics_support

Feature/analytics support

Author: Tigraine

pom.xml

@@ -60,6 +60,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
@@ -89,8 +95,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
 

src/main/java/com/bitmovin/api/BitmovinApi.java

@@ -1,6 +1,7 @@
 package com.bitmovin.api;
 
 import com.bitmovin.api.constants.ApiUrls;
+import com.bitmovin.api.container.AnalyticsContainer;
 import com.bitmovin.api.container.ConfigurationContainer;
 import com.bitmovin.api.container.FilterContainer;
 import com.bitmovin.api.container.InfrastructureContainer;
@@ -58,6 +59,7 @@ public class BitmovinApi
             = new com.fasterxml.jackson.databind.ObjectMapper();
 
     public ConfigurationContainer configuration;
+    public AnalyticsContainer analytics;
     public EncodingResource encoding;
     public FilterContainer filter;
     public InputContainer input;
@@ -182,6 +184,7 @@ private void loadProperties() throws IOException
     private void initContainers()
     {
         this.configuration = new ConfigurationContainer(this.defaultHeaders);
+        this.analytics = new AnalyticsContainer(this.defaultHeaders);
         this.encoding = new EncodingResource(this.defaultHeaders, ApiUrls.encodings, Encoding.class);
         this.filter = new FilterContainer(this.defaultHeaders);
         this.input = new InputContainer(this.defaultHeaders);

src/main/java/com/bitmovin/api/RestClient.java

@@ -1,20 +1,22 @@
 package com.bitmovin.api;
 
+import com.bitmovin.api.analytics.query.AnalyticsQuery;
 import com.bitmovin.api.encoding.analysis.AnalysisDetails;
 import com.bitmovin.api.encoding.status.Message;
 import com.bitmovin.api.encoding.status.Task;
 import com.bitmovin.api.enums.AnswerStatus;
 import com.bitmovin.api.exceptions.BitmovinApiException;
-import com.bitmovin.api.resource.AbstractResourcePatch;
-import com.bitmovin.api.rest.ResponseEnvelope;
 import com.bitmovin.api.http.JsonRestClient;
 import com.bitmovin.api.http.RequestMethod;
 import com.bitmovin.api.http.RestException;
+import com.bitmovin.api.resource.AbstractResourcePatch;
+import com.bitmovin.api.rest.ResponseEnvelope;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
@@ -156,6 +158,13 @@ public static <T> T postRaw(String resource, Map<String, String> additionalHeade
         return request(resource, additionalHeaders, content, classOfT, RequestMethod.POST);
     }
 
+    public static JSONArray postAnalyticsQuery(String resource, Map<String, String> additionalHeaders, AnalyticsQuery query) throws BitmovinApiException, URISyntaxException, UnirestException, JsonProcessingException
+    {
+        ResponseEnvelope responseEnvelope = request(resource, additionalHeaders, query, ResponseEnvelope.class, RequestMethod.POST);
+        JSONObject responseObject = convertToJsonObject(responseEnvelope.getData());
+        return responseObject.getJSONObject("result").getJSONArray("rows");
+    }
+
     public static List<String> getListOfIds(String url, Map<String, String> headers) throws BitmovinApiException, UnirestException, URISyntaxException, JsonProcessingException
     {
         int offset = 0;
@@ -237,6 +246,23 @@ public static <T> List<T> getItems(String url, Map<String, String> headers, Clas
         return items;
     }
 
+    public static <T extends AbstractApiResponse> List<T> postAndGetResults(Map<String, String> headers, String url, T body, Class<T> classOfT) throws BitmovinApiException, UnirestException, URISyntaxException, IOException
+    {
+        List<T> items = new ArrayList<>();
+
+        ResponseEnvelope responseEnvelope = request(url, headers, body, ResponseEnvelope.class, RequestMethod.POST);
+        JSONObject responseObject = convertToJsonObject(responseEnvelope);
+        JSONArray jsonItems = responseObject.getJSONObject("data").getJSONArray("result");
+
+        for (int i = 0; i < jsonItems.length(); i++)
+        {
+            JSONObject idObject = jsonItems.getJSONObject(i);
+            items.add(convertFromJsonObjectToPojo(idObject, classOfT));
+        }
+
+        return items;
+    }
+
     public static <T> List<T> getAllItemsIterative(String url, Map<String, String> headers, Class<T> clazz) throws IOException, BitmovinApiException, UnirestException, URISyntaxException
     {
         Long totalCount = getTotalCount(url, headers);
@@ -246,15 +272,14 @@ public static <T> List<T> getAllItemsIterative(String url, Map<String, String> h
         int offset = 0;
 
         List<T> pageItems;
-        while(items.size() <= totalCount)
+        while (items.size() <= totalCount)
         {
             pageItems = getItems(url, headers, clazz, limit, offset);
-            if(pageItems.size() > 0)
+            if (pageItems.size() > 0)
             {
                 items.addAll(pageItems);
                 offset += pageItems.size();
-            }
-            else
+            } else
             {
                 return items;
             }
@@ -294,15 +319,7 @@ public static <T extends AbstractApiResponse> T post(Map<String, String> headers
         JSONObject responseObject = convertToJsonObject(responseEnvelope);
         item.setStatus(AnswerStatus.valueOf(responseObject.getString("status")));
 
-        //read Messages
-        JSONArray messagesArray = responseObject.getJSONObject("data").getJSONArray("messages");
-        List<Message> messages = new ArrayList<>();
-
-        for (int i = 0; i < messagesArray.length(); i++)
-        {
-            JSONObject idObject = messagesArray.getJSONObject(i);
-            messages.add(convertFromJsonObjectToPojo(idObject, Message.class));
-        }
+        List<Message> messages = readMessagesFromResponse(responseObject);
         item.setMessages(messages);
         return item;
     }
@@ -317,14 +334,7 @@ public static <T extends AbstractApiResponse> T post(Map<String, String> headers
         JSONObject responseObject = convertToJsonObject(responseEnvelope);
         body.setStatus(AnswerStatus.valueOf(responseObject.getString("status")));
 
-        JSONArray messagesArray = responseObject.getJSONObject("data").getJSONArray("messages");
-        List<Message> messages = new ArrayList<>();
-
-        for (int i = 0; i < messagesArray.length(); i++)
-        {
-            JSONObject idObject = messagesArray.getJSONObject(i);
-            messages.add(convertFromJsonObjectToPojo(idObject, Message.class));
-        }
+        List<Message> messages = readMessagesFromResponse(responseObject);
         body.setMessages(messages);
         return body;
     }
@@ -339,16 +349,32 @@ public static <T extends AbstractApiResponse> T patch(Map<String, String> header
         JSONObject responseObject = convertToJsonObject(responseEnvelope);
         item.setStatus(AnswerStatus.valueOf(responseObject.getString("status")));
 
-        JSONArray messagesArray = responseObject.getJSONObject("data").getJSONArray("messages");
+        List<Message> messages = readMessagesFromResponse(responseObject);
+        item.setMessages(messages);
+        return item;
+    }
+
+    private static List<Message> readMessagesFromResponse(JSONObject responseObject)
+    {
         List<Message> messages = new ArrayList<>();
 
-        for (int i = 0; i < messagesArray.length(); i++)
+        try
+        {
+            JSONArray messagesArray = responseObject.getJSONObject("data").getJSONArray("messages");
+            for (int i = 0; i < messagesArray.length(); i++)
+            {
+                JSONObject idObject = messagesArray.getJSONObject(i);
+                messages.add(convertFromJsonObjectToPojo(idObject, Message.class));
+            }
+        } catch (JSONException e)
+        {
+            // Ignore exception on missing messages field.
+            return messages;
+        } catch (IOException e)
         {
-            JSONObject idObject = messagesArray.getJSONObject(i);
-            messages.add(convertFromJsonObjectToPojo(idObject, Message.class));
+            e.printStackTrace();
         }
-        item.setMessages(messages);
-        return item;
+        return messages;
     }