Merge pull request #585 from arturCwiklinsky/master

Version 3.51

Author: szprutamich

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>3.50.0</version>
+    <version>3.51.0</version>
     <packaging>jar</packaging>
     <name>Bitbar API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -19,7 +19,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.5.9</org.springframework.boot.spring-boot-dependencies>
+        <org.springframework.boot.spring-boot-dependencies>3.5.10</org.springframework.boot.spring-boot-dependencies>
         <org.apache.commons.collections4.version>4.5.0</org.apache.commons.collections4.version>
         <org.apache.commons.commons-rng-simple.version>1.6</org.apache.commons.commons-rng-simple.version>
         <org.apache.commons.commons-text.version>1.15.0</org.apache.commons.commons-text.version>

src/main/java/com/testdroid/api/AbstractAPIClient.java

@@ -234,8 +234,8 @@ private RequestBody buildRequestBody(Object body, Map<String, String> fileExtraP
             requestBody = RequestBody.create(IOUtils.toByteArray(inputStream), mediaType);
         } else if (body instanceof APIEntity entity) {
             requestBody = RequestBody.create(OBJECT_MAPPER.writeValueAsString(entity), APPLICATION_JSON);
-        } else if (body instanceof RequestBody) {
-            requestBody = (RequestBody) body;
+        } else if (body instanceof RequestBody rb) {
+            requestBody = rb;
         } else if (body instanceof Map map) {
             requestBody = buildFromMap(map);
         } else if (body == null) {

src/main/java/com/testdroid/api/dto/MappingKey.java

@@ -36,7 +36,6 @@ private MappingKey() {
     public static final String ANDROID_ENABLED = "androidEnabled";
     public static final String API_KEY = "apiKey";
     public static final String API_LEVEL = "apiLevel";
-    public static final String ARCHITECTURE = "architecture";
     public static final String ARCHIVE_TIME = "archiveTime";
     public static final String ARCHIVING_ITEM_COUNT = "archivingItemCount";
     public static final String ARCHIVING_STRATEGY = "archivingStrategy";
@@ -48,11 +47,9 @@ private MappingKey() {
     public static final String BLUETOOTH_ON = "bluetoothOn";
     public static final String BODY = "body";
     public static final String BRAINTREE_ID = "braintreeId";
-    public static final String BROWSER_IDS_ARR = "browserIds[]";
+    public static final String BROWSERS_MATCHED = "browsersMatched";
     public static final String BROWSER_NAME = "browserName";
     public static final String BROWSER_VERSION = "browserVersion";
-    public static final String BUILD_ENABLED = "buildEnabled";
-    public static final String BUILD_LIMIT = "buildLimit";
     public static final String CAN_RUN_FROM_UI = "canRunFromUI";
     public static final String CARD_NUMBER = "cardNumber";
     public static final String CENT_PRICE = "centPrice";
@@ -181,7 +178,6 @@ private MappingKey() {
     public static final String INCLUDE_FRAMEWORKS = "includeFrameworks";
     public static final String INIT_STEP = "initStep";
     public static final String INPUT_TYPE = "inputType";
-    public static final String INSTALL_URL = "installUrl";
     public static final String INTERNAL_STORAGE = "internalStorage";
     public static final String INTERNET_ACCESS = "internetAccess";
     public static final String IN_USE = "inUse";

src/main/java/com/testdroid/api/model/APIAdminDevice.java

@@ -136,6 +136,8 @@ public ComplexState compute(SubState subState) {
 
     private boolean ownerHasAccountService;
 
+    private boolean browsersMatched;
+
     public APIAdminDevice() {
     }
 
@@ -155,7 +157,7 @@ public APIAdminDevice(
             String clusterIpAddress, String clusterRegion, String clusterLocation, LocalDateTime lastOnlineTime,
             Long accountId, String accountName, LocalDateTime dedicationEndTime, String comment, String location,
             Long testTimeLimit, Boolean locked, APIDevice.OsType osType, APIDevice.Platform platform,
-            Boolean forceRestore) {
+            Boolean forceRestore, boolean browsersMatched) {
         super(id);
         this.name = name;
         this.manufacturer = manufacturer;
@@ -185,6 +187,7 @@ public APIAdminDevice(
         this.osType = osType;
         this.platform = platform;
         this.forceRestore = forceRestore;
+        this.browsersMatched = browsersMatched;
     }
 
     public String getName() {
@@ -408,6 +411,14 @@ public void setOwnerHasAccountService(boolean ownerHasAccountService) {
         this.ownerHasAccountService = ownerHasAccountService;
     }
 
+    public boolean isBrowsersMatched() {
+        return browsersMatched;
+    }
+
+    public void setBrowsersMatched(boolean browsersMatched) {
+        this.browsersMatched = browsersMatched;
+    }
+
     @Override
     @JsonIgnore
     protected <T extends APIEntity> void clone(T from) {
@@ -440,5 +451,6 @@ protected <T extends APIEntity> void clone(T from) {
         this.platform = adminDevice.platform;
         this.forceRestore = adminDevice.forceRestore;
         this.ownerHasAccountService = adminDevice.ownerHasAccountService;
+        this.browsersMatched = adminDevice.browsersMatched;
     }
 }

src/main/java/com/testdroid/api/model/APIBrowser.java

@@ -15,25 +15,15 @@ public class APIBrowser extends APIEntity {
 
     private APIDevice.OsType osType;
 
-    private String architecture;
-
-    private String installUrl;
-
-    private Boolean install;
-
     public APIBrowser() {
     }
 
-    public APIBrowser(
-            Long id, String name, String displayName, String version, APIDevice.OsType osType, String architecture,
-            String installUrl) {
+    public APIBrowser(Long id, String name, String displayName, String version, APIDevice.OsType osType) {
         super(id);
         this.name = name;
         this.displayName = displayName;
         this.version = version;
         this.osType = osType;
-        this.architecture = architecture;
-        this.installUrl = installUrl;
     }
 
     public String getName() {
@@ -68,30 +58,6 @@ public void setOsType(APIDevice.OsType osType) {
         this.osType = osType;
     }
 
-    public String getInstallUrl() {
-        return installUrl;
-    }
-
-    public void setInstallUrl(String installUrl) {
-        this.installUrl = installUrl;
-    }
-
-    public String getArchitecture() {
-        return architecture;
-    }
-
-    public void setArchitecture(String architecture) {
-        this.architecture = architecture;
-    }
-
-    public Boolean getInstall() {
-        return install;
-    }
-
-    public void setInstall(Boolean install) {
-        this.install = install;
-    }
-
     @Override
     protected <T extends APIEntity> void clone(T from) {
         APIBrowser original = (APIBrowser) from;
@@ -100,8 +66,5 @@ protected <T extends APIEntity> void clone(T from) {
         this.displayName = original.displayName;
         this.version = original.version;
         this.osType = original.osType;
-        this.architecture = original.architecture;
-        this.installUrl = original.installUrl;
-        this.install = original.install;
     }
 }

src/main/java/com/testdroid/api/model/APIDevice.java

@@ -177,7 +177,7 @@ public enum LockReason {
     /**
      * @deprecated with support for multi account owners it does not make sense anymore
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     private String mainUserEmail;
 
     private LockReason lockReason;

src/main/java/com/testdroid/api/model/APIUserDeviceTime.java

@@ -105,8 +105,6 @@ private TypeReferenceFactory() {
         LIST_MAP.put(APITestRunDataAvailability.class, new TypeReference<APIList<APITestRunDataAvailability>>() {});
         LIST_MAP.put(APITestRunParameter.class, new TypeReference<APIList<APITestRunParameter>>() {});
         LIST_MAP.put(APIUser.class, new TypeReference<APIList<APIUser>>() {});
-        LIST_MAP.put(APIUserDeviceTime.class, new TypeReference<APIList<APIUserDeviceTime>>() {});
-        LIST_MAP.put(APIUserDeviceTimeSummary.class, new TypeReference<APIList<APIUserDeviceTimeSummary>>() {});
         LIST_MAP.put(APIUserFile.class, new TypeReference<APIList<APIUserFile>>() {});
         LIST_MAP.put(APIUserFileProperty.class, new TypeReference<APIList<APIUserFileProperty>>() {});
         LIST_MAP.put(APIUserFileTag.class, new TypeReference<APIList<APIUserFileTag>>() {});
@@ -188,7 +186,6 @@ private TypeReferenceFactory() {
         MAP.put(APITestRunDataAvailability.class, new TypeReference<APITestRunDataAvailability>() {});
         MAP.put(APITestRunParameter.class, new TypeReference<APITestRunParameter>() {});
         MAP.put(APIUser.class, new TypeReference<APIUser>() {});
-        MAP.put(APIUserDeviceTimeSummary.class, new TypeReference<APIUserDeviceTimeSummary>() {});
         MAP.put(APIUserFile.class, new TypeReference<APIUserFile>() {});
         MAP.put(APIUserFileProperty.class, new TypeReference<APIUserFileProperty>() {});
         MAP.put(APIUserPreference.class, new TypeReference<APIUserPreference>() {});

src/main/java/com/testdroid/api/model/APIUserDeviceTimeSummary.java

@@ -84,7 +84,6 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
                     APITestRunDataAvailability.class,
                     APITestRunParameter.class,
                     APIUser.class,
-                    APIUserDeviceTimeSummary.class,
                     APIUserFile.class,
                     APIUserFileProperty.class,
                     APIUserPreference.class,