Merge pull request #524 from szprutamich/master

Version 3.30
bitbar · May 14, 2024 · a194d8a · a194d8a
2 parents 8342ec6 + 876aaa2
commit a194d8a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 109 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>3.29</version>
+    <version>3.30</version>
     <packaging>jar</packaging>
     <name>Bitbar API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -18,7 +18,7 @@
         <jacoco-maven-plugin.skip>true</jacoco-maven-plugin.skip>
         <!-- disable default deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
-        <org.springframework.boot.spring-boot-dependencies>3.2.3</org.springframework.boot.spring-boot-dependencies>
+        <org.springframework.boot.spring-boot-dependencies>3.2.4</org.springframework.boot.spring-boot-dependencies>
         <org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version>
         <org.apache.commons.io.version>2.16.0</org.apache.commons.io.version>
         <commons-text.version>1.10.0</commons-text.version>
@@ -122,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>

diff --git 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
@@ -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 <T extends APIEntity> 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
diff --git 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<APIList<APIBrowser>>() {});
         LIST_MAP.put(APICloudInfo.class, new TypeReference<APIList<APICloudInfo>>() {});
         LIST_MAP.put(APICluster.class, new TypeReference<APIList<APICluster>>() {});
-        LIST_MAP.put(APICommand.class, new TypeReference<APIList<APICommand>>() {});
         LIST_MAP.put(APIConnection.class, new TypeReference<APIList<APIConnection>>() {});
         LIST_MAP.put(APIDesktopBrowser.class, new TypeReference<APIList<APIDesktopBrowser>>() {});
         LIST_MAP.put(APIDesktopBrowserCapabilities.class, new TypeReference<APIList<APIDesktopBrowserCapabilities>>() {});