Merge pull request #572 from szprutamich/master

arturCwiklinsky · web-flow · commit cc47be502d40 · 2025-11-17T13:14:40.000+01:00
Version 3.48
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>3.47.0</version>
+    <version>3.48.0</version>
     <packaging>jar</packaging>
     <name>Bitbar API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -19,13 +19,13 @@
         <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.6</org.springframework.boot.spring-boot-dependencies>
+        <org.springframework.boot.spring-boot-dependencies>3.5.7</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.14.0</org.apache.commons.commons-text.version>
         <org.apache.commons.io.version>2.20.0</org.apache.commons.io.version>
-        <dependency-check-maven.version>12.1.6</dependency-check-maven.version>
-        <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
+        <dependency-check-maven.version>12.1.8</dependency-check-maven.version>
+        <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
         <org.reflections.version>0.10.2</org.reflections.version>
         <okhttp.version>4.12.0</okhttp.version>
         <org.apache.maven.plugins.maven-compiler-plugin>3.14.1</org.apache.maven.plugins.maven-compiler-plugin>
diff --git a/src/main/java/com/testdroid/api/dto/MappingKey.java b/src/main/java/com/testdroid/api/dto/MappingKey.java
@@ -173,6 +173,7 @@ private MappingKey() {
     public static final String HTTP_METHOD = "httpMethod";
     public static final String ICON = "icon";
     public static final String ID = "id";
+    public static final String IMAGE_CORNER_RADIUS = "imageCornerRadius";
     public static final String IMAGE_HEIGHT = "imageHeight";
     public static final String IMAGE_LEFT = "imageLeft";
     public static final String IMAGE_PREFIX = "imagePrefix";
diff --git a/src/main/java/com/testdroid/api/model/APIAdminDeviceType.java b/src/main/java/com/testdroid/api/model/APIAdminDeviceType.java
@@ -19,20 +19,23 @@ public class APIAdminDeviceType extends APIEntity {
 
     private Integer imageWidth;
 
+    private Integer imageCornerRadius;
+
     public APIAdminDeviceType() {
 
     }
 
     public APIAdminDeviceType(
             Long id, Integer frameExtraWidth, Integer imageHeight, Integer imageLeft, String imagePrefix,
-            Integer imageTop, Integer imageWidth) {
+            Integer imageTop, Integer imageWidth, Integer imageCornerRadius) {
         super(id);
         this.frameExtraWidth = frameExtraWidth;
         this.imageHeight = imageHeight;
         this.imageLeft = imageLeft;
         this.imagePrefix = imagePrefix;
         this.imageTop = imageTop;
         this.imageWidth = imageWidth;
+        this.imageCornerRadius = imageCornerRadius;
     }
 
     @Override
@@ -45,6 +48,7 @@ protected <T extends APIEntity> void clone(T from) {
         this.imagePrefix = deviceType.imagePrefix;
         this.imageTop = deviceType.imageTop;
         this.imageWidth = deviceType.imageWidth;
+        this.imageCornerRadius = deviceType.imageCornerRadius;
     }
 
     public String getImagePrefix() {
@@ -94,4 +98,12 @@ public Integer getImageWidth() {
     public void setImageWidth(Integer imageWidth) {
         this.imageWidth = imageWidth;
     }
+
+    public Integer getImageCornerRadius() {
+        return imageCornerRadius;
+    }
+
+    public void setImageCornerRadius(Integer imageCornerRadius) {
+        this.imageCornerRadius = imageCornerRadius;
+    }
 }
diff --git a/src/main/java/com/testdroid/api/model/APIDevice.java b/src/main/java/com/testdroid/api/model/APIDevice.java
@@ -134,6 +134,8 @@ public enum LockReason {
 
     private Integer imageWidth;
 
+    private Integer imageCornerRadius;
+
     private String manufacturer;
 
     private Boolean locked;
@@ -187,9 +189,9 @@ public APIDevice() {
     public APIDevice(
             Long id, String displayName, String manufacturer, String releaseVersion, Integer apiLevel,
             Integer creditsPrice, String imagePrefix, Integer imageTop, Integer imageLeft, Integer imageWidth,
-            Integer imageHeight, Integer frameExtraWidth, OsType osType, Platform platform, Boolean online,
-            Boolean locked, Boolean enabled, String location, Long accountId, String accountName, Integer onlineDevices,
-            Integer availableDevices) {
+            Integer imageHeight, Integer imageCornerRadius, Integer frameExtraWidth, OsType osType, Platform platform,
+            Boolean online, Boolean locked, Boolean enabled, String location, Long accountId, String accountName,
+            Integer onlineDevices, Integer availableDevices) {
         super(id);
         this.displayName = displayName;
         this.manufacturer = manufacturer;
@@ -200,6 +202,7 @@ public APIDevice(
         this.imageLeft = imageLeft;
         this.imageWidth = imageWidth;
         this.imageHeight = imageHeight;
+        this.imageCornerRadius = imageCornerRadius;
         this.frameExtraWidth = frameExtraWidth;
         this.osType = osType;
         this.platform = platform;
@@ -280,6 +283,14 @@ public void setImageHeight(Integer imageHeight) {
         this.imageHeight = imageHeight;
     }
 
+    public Integer getImageCornerRadius() {
+        return imageCornerRadius;
+    }
+
+    public void setImageCornerRadius(Integer imageCornerRadius) {
+        this.imageCornerRadius = imageCornerRadius;
+    }
+
     public Integer getFrameExtraWidth() {
         return frameExtraWidth;
     }
@@ -482,6 +493,7 @@ protected <T extends APIEntity> void clone(T from) {
         this.imagePrefix = apiDevice.imagePrefix;
         this.imageTop = apiDevice.imageTop;
         this.imageWidth = apiDevice.imageWidth;
+        this.imageCornerRadius = apiDevice.imageCornerRadius;
         this.osType = apiDevice.osType;
         this.platform = apiDevice.platform;
         this.softwareVersion = apiDevice.softwareVersion;
diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSession.java b/src/main/java/com/testdroid/api/model/APIDeviceSession.java
@@ -116,8 +116,6 @@ public boolean isSettable() {
 
     private Long deviceInstanceId;
 
-    private Long deviceLogFirstTimestamp;
-
     private Long duration;
 
     private Date endTime;
@@ -175,10 +173,10 @@ public APIDeviceSession() {
     public APIDeviceSession(
             Long id, String externalId, String clientSideId, Long userId, String userEmail, Long accountId,
             APIDeviceSession.Type type, LocalDateTime createTime, LocalDateTime startTime, LocalDateTime installTime,
-            LocalDateTime endTime, Long timeLimit, Long deviceLogFirstTimestamp, APIDeviceSession.State state,
-            Integer testCasePassedCount, Integer testCaseFailedCount, Integer testCaseSkippedCount, Long deviceModelId,
-            String displayName, String deviceManufacturer, Integer creditsPrice, String imagePrefix, Integer imageTop,
-            Integer imageLeft, Integer imageWidth, Integer imageHeight, Integer frameExtraWidth,
+            LocalDateTime endTime, Long timeLimit, APIDeviceSession.State state, Integer testCasePassedCount,
+            Integer testCaseFailedCount, Integer testCaseSkippedCount, Long deviceModelId, String displayName,
+            String deviceManufacturer, Integer creditsPrice, String imagePrefix, Integer imageTop, Integer imageLeft,
+            Integer imageWidth, Integer imageHeight, Integer imageCornerRadius, Integer frameExtraWidth,
             APIDevice.OsType osType, APIDevice.Platform platform, Boolean locked, Boolean enabled,
             String releaseVersion, Integer apiLevel, ExcludeReason excludeReason, Long deviceInstanceId,
             RetryState retryState, Integer autoRetriesLeftCount, Long duration, Long projectId, String projectName,
@@ -196,10 +194,9 @@ public APIDeviceSession(
         this.installTime = TimeConverter.toDate(installTime);
         this.endTime = TimeConverter.toDate(endTime);
         this.device = new APIDevice(deviceModelId, displayName, deviceManufacturer, releaseVersion,
-                apiLevel, creditsPrice, imagePrefix, imageTop, imageLeft, imageWidth, imageHeight, frameExtraWidth,
-                osType, platform, null, locked, enabled, location, null, null, null, null);
+                apiLevel, creditsPrice, imagePrefix, imageTop, imageLeft, imageWidth, imageHeight, imageCornerRadius,
+                frameExtraWidth, osType, platform, null, locked, enabled, location, null, null, null, null);
         this.timeLimit = timeLimit;
-        this.deviceLogFirstTimestamp = deviceLogFirstTimestamp;
         this.state = state;
         this.excludeReason = excludeReason != null ? excludeReason.getDisplayName() : null;
         this.testCaseAllCount = testCasePassedCount + testCaseFailedCount + testCaseSkippedCount;
@@ -304,14 +301,6 @@ public void setInstallTime(Date installTime) {
         this.installTime = installTime;
     }
 
-    public Long getDeviceLogFirstTimestamp() {
-        return deviceLogFirstTimestamp;
-    }
-
-    public void setDeviceLogFirstTimestamp(Long deviceLogFirstTimestamp) {
-        this.deviceLogFirstTimestamp = deviceLogFirstTimestamp;
-    }
-
     public State getState() {
         return state;
     }
@@ -552,7 +541,6 @@ protected <T extends APIEntity> void clone(T from) {
         this.type = apiDeviceSession.type;
         this.device = apiDeviceSession.device;
         this.timeLimit = apiDeviceSession.timeLimit;
-        this.deviceLogFirstTimestamp = apiDeviceSession.deviceLogFirstTimestamp;
         this.state = apiDeviceSession.state;
         this.testCaseAllCount = apiDeviceSession.testCaseAllCount;
         this.testCaseSuccessCount = apiDeviceSession.testCaseSuccessCount;
diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSessionUsage.java b/src/main/java/com/testdroid/api/model/APIDeviceSessionUsage.java
@@ -29,28 +29,34 @@ public enum Type {
 
     private Date createTime;
 
-    private String userName;
-
-    private Long userId;
+    private String deviceModelName;
 
     private Long duration;
 
+    private String osVersion;
+
+    private Long startedById;
+
+    private String startedByName;
+
     private APIDeviceSessionUsage.Type type;
 
-    private String deviceModelName;
+    private Long userId;
 
-    private String osVersion;
+    private String userName;
 
     public APIDeviceSessionUsage() {
 
     }
 
     public APIDeviceSessionUsage(
-            LocalDateTime createTime, String userName, Long userId, Long duration,
-            APIDeviceSessionUsage.Type type, String deviceModelName, String osVersion) {
+            LocalDateTime createTime, String userName, Long userId, String startedByName, Long startedById,
+            Long duration, APIDeviceSessionUsage.Type type, String deviceModelName, String osVersion) {
         this.createTime = TimeConverter.toDate(createTime);
         this.userName = userName;
         this.userId = userId;
+        this.startedByName = startedByName;
+        this.startedById = startedById;
         this.duration = duration;
         this.type = type;
         this.deviceModelName = deviceModelName;
@@ -69,6 +75,8 @@ protected <T extends APIEntity> void clone(T from) {
         this.type = original.type;
         this.deviceModelName = original.deviceModelName;
         this.osVersion = original.osVersion;
+        this.startedByName = original.startedByName;
+        this.startedById = original.startedById;
     }
 
     public Date getCreateTime() {
@@ -126,4 +134,20 @@ public String getOsVersion() {
     public void setOsVersion(String osVersion) {
         this.osVersion = osVersion;
     }
+
+    public String getStartedByName() {
+        return startedByName;
+    }
+
+    public void setStartedByName(String startedByName) {
+        this.startedByName = startedByName;
+    }
+
+    public Long getStartedById() {
+        return startedById;
+    }
+
+    public void setStartedById(Long startedById) {
+        this.startedById = startedById;
+    }
 }
diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSessionUserUsage.java b/src/main/java/com/testdroid/api/model/APIDeviceSessionUserUsage.java
@@ -13,36 +13,58 @@
 @JsonIgnoreProperties(value = {ID, SELF_URI})
 public class APIDeviceSessionUserUsage extends APIEntity {
 
-    private String userName;
-
-    private Long userId;
+    private long devices;
 
     private Long duration;
 
+    private long osVersions;
+
+    private double sessionShare;
+
     private long sessions;
 
-    private long devices;
+    private Long userId;
 
-    private long osVersions;
+    private String userName;
 
-    private double sessionShare;
+    private Long startedById;
+
+    private String startedByName;
 
     public APIDeviceSessionUserUsage() {
 
     }
 
     public APIDeviceSessionUserUsage(
-            Long userId, String userName, Long duration, long sessions, long devices, long osVersions,
-            double sessionShare) {
+            Long userId, String userName, Long startedById, String startedByName, Long duration,
+            long sessions, long devices, long osVersions, double sessionShare) {
         this.userId = userId;
         this.userName = userName;
+        this.startedById = startedById;
+        this.startedByName = startedByName;
         this.duration = duration;
         this.sessions = sessions;
         this.devices = devices;
         this.osVersions = osVersions;
         this.sessionShare = sessionShare;
     }
 
+    @Override
+    @JsonIgnore
+    protected <T extends APIEntity> void clone(T from) {
+        APIDeviceSessionUserUsage original = (APIDeviceSessionUserUsage) from;
+        cloneBase(from);
+        this.userId = original.userId;
+        this.userName = original.userName;
+        this.duration = original.duration;
+        this.sessions = original.sessions;
+        this.devices = original.devices;
+        this.osVersions = original.osVersions;
+        this.sessionShare = original.sessionShare;
+        this.startedByName = original.startedByName;
+        this.startedById = original.startedById;
+    }
+
     public String getUserName() {
         return userName;
     }
@@ -99,17 +121,19 @@ public void setSessionShare(double sessionShare) {
         this.sessionShare = sessionShare;
     }
 
-    @Override
-    @JsonIgnore
-    protected <T extends APIEntity> void clone(T from) {
-        APIDeviceSessionUserUsage original = (APIDeviceSessionUserUsage) from;
-        cloneBase(from);
-        this.userId = original.userId;
-        this.userName = original.userName;
-        this.duration = original.duration;
-        this.sessions = original.sessions;
-        this.devices = original.devices;
-        this.osVersions = original.osVersions;
-        this.sessionShare = original.sessionShare;
+    public Long getStartedById() {
+        return startedById;
+    }
+
+    public void setStartedById(Long startedById) {
+        this.startedById = startedById;
+    }
+
+    public String getStartedByName() {
+        return startedByName;
+    }
+
+    public void setStartedByName(String startedByName) {
+        this.startedByName = startedByName;
     }
 }
diff --git a/src/main/java/com/testdroid/api/model/APIDeviceUsage.java b/src/main/java/com/testdroid/api/model/APIDeviceUsage.java
@@ -21,13 +21,13 @@ public APIDeviceUsage() {
     public APIDeviceUsage(
             Long id, String displayName, String manufacturer, String releaseVersion,
             Integer apiLevel, Integer creditsPrice, String imagePrefix, Integer imageTop, Integer imageLeft,
-            Integer imageWidth, Integer imageHeight, Integer frameExtraWidth, APIDevice.OsType osType,
-            APIDevice.Platform platform, Boolean online, Boolean locked, Boolean enabled, String location,
-            Long totalDeviceSessions, Long failedDeviceSessions) {
+            Integer imageWidth, Integer imageHeight, Integer imageCornerRadius, Integer frameExtraWidth,
+            APIDevice.OsType osType, APIDevice.Platform platform, Boolean online, Boolean locked, Boolean enabled,
+            String location, Long totalDeviceSessions, Long failedDeviceSessions) {
         super(id);
         this.device = new APIDevice(id, displayName, manufacturer, releaseVersion, apiLevel,
-                creditsPrice, imagePrefix, imageTop, imageLeft, imageWidth, imageHeight, frameExtraWidth, osType,
-                platform, online, locked, enabled, location, null, null, null, null);
+                creditsPrice, imagePrefix, imageTop, imageLeft, imageWidth, imageHeight, imageCornerRadius,
+                frameExtraWidth, osType, platform, online, locked, enabled, location, null, null, null, null);
         this.totalDeviceSessions = totalDeviceSessions;
         this.failedDeviceSessions = failedDeviceSessions;
     }
