diff --git a/pom.xml b/pom.xml
index df24ab9..d223ba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
com.testdroid
testdroid-api
- 3.29
+ 3.30
jar
Bitbar API v2
https://github.com/bitbar/testdroid-api
@@ -18,7 +18,7 @@
true
true
- 3.2.3
+ 3.2.4
4.4
2.16.0
1.10.0
@@ -122,7 +122,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 3.1.0
+ 3.2.4
sign-artifacts
diff --git a/src/main/java/com/testdroid/api/dto/MappingKey.java b/src/main/java/com/testdroid/api/dto/MappingKey.java
index 336754d..a9b789c 100644
--- a/src/main/java/com/testdroid/api/dto/MappingKey.java
+++ b/src/main/java/com/testdroid/api/dto/MappingKey.java
@@ -366,6 +366,7 @@ private MappingKey() {
public static final String WARNING_DEVICE_COUNT = "warningDeviceCount";
public static final String WIDTH = "width";
public static final String WITHOUT_PRIORITIES = "withoutPriorities";
+ public static final String WITH_ADDRESS = "withAddress";
public static final String WITH_BROWSERS = "withBrowsers";
public static final String WITH_DEDICATED = "withDedicated";
public static final String WITH_DEDICATED_DEVICES_INFO = "withDedicatedDevicesInfo";
@@ -374,12 +375,10 @@ private MappingKey() {
public static final String WITH_PROPERTIES = "withProperties";
public static final String WITH_PUBLIC = "withPublic";
public static final String WITH_ROLE = "withRole";
- public static final String WITH_ROLES = "withRoles";
public static final String WITH_SESSIONS_INFO = "withSessionsInfo";
public static final String WITH_SUPPORTED_CREATORS = "withSupportedCreators";
+ public static final String WITH_USER_INFO = "withUserInfo";
public static final String WITH_VULNERABLE_DATA = "withVulnerableData";
public static final String ZIP = "zip";
-
// @formatter:on
-
}
diff --git a/src/main/java/com/testdroid/api/model/APIAccount.java b/src/main/java/com/testdroid/api/model/APIAccount.java
index b7d0d25..d3b6f90 100644
--- a/src/main/java/com/testdroid/api/model/APIAccount.java
+++ b/src/main/java/com/testdroid/api/model/APIAccount.java
@@ -26,6 +26,8 @@ public class APIAccount extends APIEntity {
private String mainUserEmail;
+ private String name;
+
@JsonInclude(Include.NON_NULL)
private String activeServiceName;
@@ -35,10 +37,12 @@ public class APIAccount extends APIEntity {
public APIAccount() {
}
+ @SuppressWarnings("squid:S107")
public APIAccount(
- Long id, String comment, LocalDateTime createTime, Long mainUserId, String mainUserFirstName,
+ Long id, String name, String comment, LocalDateTime createTime, Long mainUserId, String mainUserFirstName,
String mainUserLastName, String mainUserEmail) {
super(id);
+ this.name = name;
this.comment = comment;
this.createTime = TimeConverter.toDate(createTime);
this.mainUserId = mainUserId;
@@ -49,9 +53,9 @@ public APIAccount(
@SuppressWarnings("squid:S107")
public APIAccount(
- Long id, String comment, LocalDateTime createTime, Long mainUserId, String mainUserFirstName,
+ Long id, String name, String comment, LocalDateTime createTime, Long mainUserId, String mainUserFirstName,
String mainUserLastName, String mainUserEmail, long dedicatedDevicesCount, String activeServiceName) {
- this(id, comment, createTime, mainUserId, mainUserFirstName, mainUserLastName, mainUserEmail);
+ this(id, name, comment, createTime, mainUserId, mainUserFirstName, mainUserLastName, mainUserEmail);
this.dedicatedDevicesCount = dedicatedDevicesCount;
this.activeServiceName = activeServiceName;
}
@@ -104,6 +108,14 @@ public void setMainUserEmail(String mainUserEmail) {
this.mainUserEmail = mainUserEmail;
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
public String getActiveServiceName() {
return activeServiceName;
}
@@ -133,5 +145,6 @@ protected void clone(T from) {
this.activeServiceName = account.activeServiceName;
this.dedicatedDevicesCount = account.dedicatedDevicesCount;
this.comment = account.comment;
+ this.name = account.name;
}
}
diff --git a/src/main/java/com/testdroid/api/model/APICommand.java b/src/main/java/com/testdroid/api/model/APICommand.java
deleted file mode 100644
index cdfe605..0000000
--- a/src/main/java/com/testdroid/api/model/APICommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.testdroid.api.model;
-
-import com.testdroid.api.APIEntity;
-
-/**
- * @author MichaĆ Szpruta
- */
-public class APICommand extends APIEntity {
-
- private String httpMethod;
-
- private int responseCode;
-
- private long timestamp;
-
- private long duration;
-
- private String requestBody;
-
- private String responseBody;
-
- private String uri;
-
- public APICommand() {
- }
-
- public APICommand(
- String httpMethod, int responseCode, long timestamp, long duration, String requestBody,
- String responseBody, String uri) {
- this.httpMethod = httpMethod;
- this.responseCode = responseCode;
- this.timestamp = timestamp;
- this.duration = duration;
- this.requestBody = requestBody;
- this.responseBody = responseBody;
- this.uri = uri;
- }
-
- public String getHttpMethod() {
- return httpMethod;
- }
-
- public void setHttpMethod(String httpMethod) {
- this.httpMethod = httpMethod;
- }
-
- public int getResponseCode() {
- return responseCode;
- }
-
- public void setResponseCode(int responseCode) {
- this.responseCode = responseCode;
- }
-
- public long getTimestamp() {
- return timestamp;
- }
-
- public void setTimestamp(long timestamp) {
- this.timestamp = timestamp;
- }
-
- public long getDuration() {
- return duration;
- }
-
- public void setDuration(long duration) {
- this.duration = duration;
- }
-
- public String getRequestBody() {
- return requestBody;
- }
-
- public void setRequestBody(String requestBody) {
- this.requestBody = requestBody;
- }
-
- public String getResponseBody() {
- return responseBody;
- }
-
- public void setResponseBody(String responseBody) {
- this.responseBody = responseBody;
- }
-
- public String getUri() {
- return uri;
- }
-
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- @Override
- protected void clone(T from) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/src/main/java/com/testdroid/api/util/TypeReferenceFactory.java b/src/main/java/com/testdroid/api/util/TypeReferenceFactory.java
index 300a02a..f835c39 100644
--- a/src/main/java/com/testdroid/api/util/TypeReferenceFactory.java
+++ b/src/main/java/com/testdroid/api/util/TypeReferenceFactory.java
@@ -58,7 +58,6 @@ private TypeReferenceFactory() {
LIST_MAP.put(APIBrowser.class, new TypeReference>() {});
LIST_MAP.put(APICloudInfo.class, new TypeReference>() {});
LIST_MAP.put(APICluster.class, new TypeReference>() {});
- LIST_MAP.put(APICommand.class, new TypeReference>() {});
LIST_MAP.put(APIConnection.class, new TypeReference>() {});
LIST_MAP.put(APIDesktopBrowser.class, new TypeReference>() {});
LIST_MAP.put(APIDesktopBrowserCapabilities.class, new TypeReference>() {});