Merge pull request #555 from lastverb/master

Version 3.40.0

Author: arturCwiklinsky

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>3.39.0</version>
+    <version>3.40.0</version>
     <packaging>jar</packaging>
     <name>Bitbar API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -18,11 +18,11 @@
         <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.4.2</org.springframework.boot.spring-boot-dependencies>
+        <org.springframework.boot.spring-boot-dependencies>3.4.3</org.springframework.boot.spring-boot-dependencies>
         <org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version>
         <org.apache.commons.io.version>2.18.0</org.apache.commons.io.version>
         <commons-text.version>1.10.0</commons-text.version>
-        <dependency-check-maven.version>12.0.2</dependency-check-maven.version>
+        <dependency-check-maven.version>12.1.0</dependency-check-maven.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <org.reflections.version>0.10.2</org.reflections.version>
         <okhttp.version>4.12.0</okhttp.version>

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

@@ -134,6 +134,8 @@ public ComplexState compute(SubState subState) {
 
     private boolean forceRestore;
 
+    private boolean ownerHasAccountService;
+
     public APIAdminDevice() {
     }
 
@@ -398,6 +400,14 @@ public void setForceRestore(boolean forceRestore) {
         this.forceRestore = forceRestore;
     }
 
+    public boolean isOwnerHasAccountService() {
+        return ownerHasAccountService;
+    }
+
+    public void setOwnerHasAccountService(boolean ownerHasAccountService) {
+        this.ownerHasAccountService = ownerHasAccountService;
+    }
+
     @Override
     @JsonIgnore
     protected <T extends APIEntity> void clone(T from) {
@@ -429,5 +439,6 @@ protected <T extends APIEntity> void clone(T from) {
         this.osType = adminDevice.osType;
         this.platform = adminDevice.platform;
         this.forceRestore = adminDevice.forceRestore;
+        this.ownerHasAccountService = adminDevice.ownerHasAccountService;
     }
 }

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

@@ -22,15 +22,17 @@ public class APIDeviceCleanupConfiguration extends APIEntity {
 
     private Long createdById;
 
-    private APIDevice.OsType osType = APIDevice.OsType.ANDROID;
+    private String description;
 
-    private Date lastModificationTime;
+    private String discriminator;
 
     private Boolean enabled;
 
     private Boolean global;
 
-    private String discriminator;
+    private Date lastModificationTime;
+
+    private APIDevice.OsType osType = APIDevice.OsType.ANDROID;
 
     // For cluster use. Not included in hashCode or equals.
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -42,7 +44,8 @@ public APIDeviceCleanupConfiguration() {
     @SuppressWarnings("squid:S107")
     public APIDeviceCleanupConfiguration(
             Long id, String content, Boolean enabled, LocalDateTime createTime, String createdByEmail, Long createdById,
-            APIDevice.OsType osType, LocalDateTime lastModificationTime, String discriminator, Boolean global) {
+            APIDevice.OsType osType, LocalDateTime lastModificationTime, String discriminator, Boolean global,
+            String description) {
         super(id);
         this.content = content;
         this.enabled = enabled;
@@ -53,6 +56,7 @@ public APIDeviceCleanupConfiguration(
         this.lastModificationTime = TimeConverter.toDate(lastModificationTime);
         this.global = global;
         this.discriminator = discriminator;
+        this.description = description;
     }
 
     public String getContent() {
@@ -135,6 +139,14 @@ public void setForceRestore(Boolean forceRestore) {
         this.forceRestore = forceRestore;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     @Override
     @JsonIgnore
     public <T extends APIEntity> void clone(T from) {
@@ -150,6 +162,7 @@ public <T extends APIEntity> void clone(T from) {
         this.global = deviceCleanupConfiguration.global;
         this.discriminator = deviceCleanupConfiguration.discriminator;
         this.forceRestore = deviceCleanupConfiguration.forceRestore;
+        this.description = deviceCleanupConfiguration.description;
     }
 
     @Override
@@ -169,13 +182,14 @@ public boolean equals(Object o) {
                 Objects.equals(lastModificationTime, that.lastModificationTime) &&
                 Objects.equals(enabled, that.enabled) &&
                 Objects.equals(global, that.global) &&
-                Objects.equals(discriminator, that.discriminator);
+                Objects.equals(discriminator, that.discriminator) &&
+                Objects.equals(description, that.description);
     }
 
     @Override
     public int hashCode() {
         return Objects
                 .hash(content, createTime, createdByEmail, createdById, osType, lastModificationTime, enabled,
-                        global, discriminator);
+                        global, discriminator, description);
     }
 }