Merge pull request #306 from szprutamich/master

Version 2.16
bitbar · Jun 7, 2016 · 51ac28b · 51ac28b
2 parents ed87273 + 0ab8d64
commit 51ac28b
Show file tree

Hide file tree

Showing 37 changed files with 949 additions and 417 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>2.9</version>
+    <version>2.16</version>
     <packaging>jar</packaging>
     <name>Testdroid API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -39,14 +39,6 @@
     </licenses>
     <build>
         <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>fixtures/*.zip</include>
-                    <include>fixtures/*.apk</include>
-                </includes>
-            </resource>
             <resource>
                 <filtering>false</filtering>
                 <directory>src/main/java</directory>
@@ -132,19 +124,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.5</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.stream</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0-2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/src/main/java/com/testdroid/api/APIDeviceQueryBuilder.java b/src/main/java/com/testdroid/api/APIDeviceQueryBuilder.java
@@ -1,9 +1,10 @@
 package com.testdroid.api;
 
 import com.testdroid.api.model.APIDevice;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,10 +50,15 @@ public APIDeviceQueryBuilder search(String search) {
     }
 
     @Override
-    public APIDeviceQueryBuilder sort(Class<? extends APIEntity> type, APISort.SortItem... sortItems) {
+    public APIDeviceQueryBuilder sort(Class<? extends APIEntity> type, List<APISort.SortItem> sortItems) {
         return (APIDeviceQueryBuilder) super.sort(type, sortItems);
     }
 
+    @Override
+    public APIDeviceQueryBuilder filter(List<APIFilter.APIFilterItem> filterItems) {
+        return (APIDeviceQueryBuilder) super.filter(filterItems);
+    }
+
     @Override
     protected Map<String, Object> build() {
         Map<String, Object> result = super.build();

diff --git a/src/main/java/com/testdroid/api/APIEntity.java b/src/main/java/com/testdroid/api/APIEntity.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonView;
 import com.testdroid.api.model.*;
 import com.testdroid.api.model.jrjc.*;
-import com.testdroid.api.um.model.APIService;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -57,9 +56,11 @@
         APIProject.class,
         APIProjectJobConfig.class,
         APIProjectSharing.class,
+        APIProjectTypeExtended.class,
         APIRole.class,
         APIService.class,
         APIScreenshot.class,
+        APIScreenshotExtended.class,
         APISoftwareVersion.class,
         APITag.class,
         APITestCaseRun.class,
@@ -89,7 +90,7 @@
         APIJiraPriority.class,
         APIJiraProject.class,
         APIJiraServerInfo.class,
-        APIDeviceRunDataAvailability.class,
+        APIDeviceSessionDataAvailability.class,
         APITestRunDataAvailability.class,
         APIUserDeviceTime.class,
         APIDeviceTimeEntry.class,
@@ -197,7 +198,7 @@ protected <T extends APIEntity> APIListResource<T> getListResource(
             limit = 10;
         }
         return new APIListResource<T>(client, uri, new APIQueryBuilder().offset(offset).limit(limit).search
-                (search).sort(type, sort.getItems()));
+                (search).sort(type, sort.getSorts()));
     }
 
     @JsonIgnore

diff --git a/src/main/java/com/testdroid/api/APIExceptionMessage.java b/src/main/java/com/testdroid/api/APIExceptionMessage.java
@@ -8,18 +8,16 @@
  * @author Łukasz Kajda <[email protected]>
  */
 @XmlRootElement
-public class APIExceptionMessage {
-
-    private String message;
+public class APIExceptionMessage extends APIMessage {
 
     private Integer statusCode;
 
     public APIExceptionMessage() {
     }
 
     public APIExceptionMessage(Integer statusCode, String message) {
+        super(message);
         this.statusCode = statusCode;
-        this.message = message;
     }
 
     public Integer getStatusCode() {
@@ -30,12 +28,4 @@ public void setStatusCode(Integer statusCode) {
         this.statusCode = statusCode;
     }
 
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-}
+}
diff --git a/src/main/java/com/testdroid/api/APIExportable.java b/src/main/java/com/testdroid/api/APIExportable.java
diff --git a/src/main/java/com/testdroid/api/APIFilter.java b/src/main/java/com/testdroid/api/APIFilter.java
@@ -0,0 +1,98 @@
+package com.testdroid.api;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Michał Szpruta <[email protected]>
+ */
+public class APIFilter {
+
+    private List<APIFilterItem> filterItems;
+
+    public APIFilter() {
+        this.filterItems = Collections.emptyList();
+    }
+
+    public APIFilter(List<APIFilterItem> filterItems) {
+        this.filterItems = filterItems;
+    }
+
+    public static APIFilter create(List<APIFilterItem> filterItems) {
+        return new APIFilter(filterItems);
+    }
+
+    public String serialize() {
+        List<String> resultItems = new ArrayList<String>();
+        for (APIFilterItem item : filterItems) {
+            resultItems.add(item.serialize());
+        }
+        return StringUtils.join(resultItems, ";");
+    }
+
+    public static class APIFilterItem {
+
+        public static enum Operand {
+            GT,
+            AFTER,
+            LT,
+            BEFORE,
+            ON,
+            EQ,
+            ISNULL,
+            IN,
+            NOTIN,
+            INORNULL,
+            BEFOREORNULL,
+            BEFOREOREQUAL,
+            AFTERORNULL
+        }
+
+        public static enum Type {
+            N,
+            D,
+            S,
+            B,
+            LN,
+            LD,
+            LS,
+            LB
+        }
+
+        private String fieldName;
+
+        private Operand operand;
+
+        private Type type;
+
+        private Object[] values;
+
+        public APIFilterItem(Type type, String fieldName, Operand operand, Object... values) {
+            this.type = type;
+            this.fieldName = fieldName;
+            this.operand = operand;
+            this.values = values;
+        }
+
+        private String serialize() {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(type.name().toLowerCase());
+            stringBuilder.append("_");
+            stringBuilder.append(fieldName);
+            stringBuilder.append("_");
+            stringBuilder.append(operand.name().toLowerCase());
+            if (values.length > 0) {
+                stringBuilder.append("_");
+                for (Object object : values) {
+                    stringBuilder.append(object);
+                    stringBuilder.append("|");
+                }
+                stringBuilder.setLength(stringBuilder.length() - 1);
+            }
+            return stringBuilder.toString();
+        }
+    }
+}
diff --git a/src/main/java/com/testdroid/api/APIKeyClient.java b/src/main/java/com/testdroid/api/APIKeyClient.java
@@ -442,7 +442,7 @@ public APIListResource<APIDevice> getDevices(
         APIDeviceQueryBuilder builder = new APIDeviceQueryBuilder().offset((int) offset).limit((int) limit)
                 .search(search).filterWithDeviceFilters(filters);
         if (sort != null) {
-            builder.sort(APIDevice.class, sort.getItems());
+            builder.sort(APIDevice.class, sort.getSorts());
         }
         return new APIListResource<APIDevice>(this, DEVICES_URI, builder);
     }

diff --git a/src/main/java/com/testdroid/api/APIMessage.java b/src/main/java/com/testdroid/api/APIMessage.java
@@ -0,0 +1,28 @@
+package com.testdroid.api;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Michał Szpruta <[email protected]>
+ */
+@XmlRootElement
+public class APIMessage {
+
+    private String message;
+
+    public APIMessage() {
+    }
+
+    public APIMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}
diff --git a/src/main/java/com/testdroid/api/APIQueryBuilder.java b/src/main/java/com/testdroid/api/APIQueryBuilder.java
@@ -1,6 +1,7 @@
 package com.testdroid.api;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,11 +29,14 @@ public class APIQueryBuilder {
      */
     private APISort sort;
 
+    private APIFilter filter;
+
     public APIQueryBuilder() {
         this.offset = 0;
         this.limit = 10;
         this.search = null;
         this.sort = null;
+        this.filter = null;
     }
 
     public APIQueryBuilder offset(long offset) {
@@ -56,8 +60,13 @@ public APIQueryBuilder search(String search) {
         return this;
     }
 
-    public APIQueryBuilder sort(Class<? extends APIEntity> type, APISort.SortItem... sortItems) {
-        this.sort = APISort.create(type, sortItems);
+    public APIQueryBuilder sort(Class<? extends APIEntity> type, List<APISort.SortItem> sortItems) {
+        this.sort = APISort.create(sortItems);
+        return this;
+    }
+
+    public APIQueryBuilder filter(List<APIFilter.APIFilterItem> filterItems) {
+        this.filter = APIFilter.create(filterItems);
         return this;
     }
 
@@ -67,6 +76,7 @@ protected Map<String, Object> build() {
             put("offset", offset);
             put("search", search);
             put("sort", sort != null ? sort.serialize() : null);
+            put("filter", filter != null ? filter.serialize() : null);
         }};
     }
 }