Skip to content

Commit dc44c50

Browse files
szprutamichszprutamich
authored
Merge pull request #569 from szprutamich/master
Version 3.45
2 parents bbb1b73 + 103a391 commit dc44c50

16 files changed

Lines changed: 407 additions & 42 deletions

‎pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.testdroid</groupId>
55
<artifactId>testdroid-api</artifactId>
6-
<version>3.44.0</version>
6+
<version>3.45.0</version>
77
<packaging>jar</packaging>
88
<name>Bitbar API v2</name>
99
<url>https://github.com/bitbar/testdroid-api</url>
@@ -19,15 +19,15 @@
1919
<jacoco-maven-plugin.skip>true</jacoco-maven-plugin.skip>
2020
<!-- disable default deployment -->
2121
<maven.deploy.skip>true</maven.deploy.skip>
22-
<org.springframework.boot.spring-boot-dependencies>3.5.3</org.springframework.boot.spring-boot-dependencies>
22+
<org.springframework.boot.spring-boot-dependencies>3.5.4</org.springframework.boot.spring-boot-dependencies>
2323
<org.apache.commons.collections4.version>4.5.0</org.apache.commons.collections4.version>
24-
<org.apache.commons.io.version>2.19.0</org.apache.commons.io.version>
25-
<commons-text.version>1.13.1</commons-text.version>
24+
<org.apache.commons.commons-rng-simple.version>1.6</org.apache.commons.commons-rng-simple.version>
25+
<org.apache.commons.commons-text.version>1.14.0</org.apache.commons.commons-text.version>
26+
<org.apache.commons.io.version>2.20.0</org.apache.commons.io.version>
2627
<dependency-check-maven.version>12.1.3</dependency-check-maven.version>
2728
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
2829
<org.reflections.version>0.10.2</org.reflections.version>
2930
<okhttp.version>4.12.0</okhttp.version>
30-
<commons-rng-simple.version>1.6</commons-rng-simple.version>
3131
</properties>
3232
<scm>
3333
<connection>scm:git:git://github.com:bitbar/testdroid-api.git</connection>
@@ -205,12 +205,12 @@
205205
<dependency>
206206
<groupId>org.apache.commons</groupId>
207207
<artifactId>commons-text</artifactId>
208-
<version>${commons-text.version}</version>
208+
<version>${org.apache.commons.commons-text.version}</version>
209209
</dependency>
210210
<dependency>
211211
<groupId>org.apache.commons</groupId>
212212
<artifactId>commons-rng-simple</artifactId>
213-
<version>${commons-rng-simple.version}</version>
213+
<version>${org.apache.commons.commons-rng-simple.version}</version>
214214
</dependency>
215215
<dependency>
216216
<groupId>com.fasterxml.jackson.core</groupId>

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

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
package com.testdroid.api.dto;
2-
32
/**
43
* @author Michał Szpruta <michal.szpruta@bitbar.com>
54
*/
@@ -19,17 +18,17 @@ private MappingKey() {
1918
public static final String ACCOUNT_SERVICE_ID = "accountServiceId";
2019
public static final String ACCOUNT_SERVICE_IDS = "accountServiceIds";
2120
public static final String ACCOUNT_SERVICE_NAME = "activeServiceName";
22-
public static final String ACTIVATE_TIME = "activateTime";
2321
public static final String ACTIVATED = "activated";
2422
public static final String ACTIVATED_BY_ID = "activatedById";
2523
public static final String ACTIVATED_BY_NAME = "activatedByName";
24+
public static final String ACTIVATE_TIME = "activateTime";
2625
public static final String ACTIVE = "active";
2726
public static final String ACTIVE_ONLY = "activeOnly";
28-
public static final String ADD_LABEL_TO_DEVICES = "addLabelToDevices";
2927
public static final String ADDITIONAL_HOURS = "additionalHours";
3028
public static final String ADDITIONAL_HOURS_PAYMENT_DATE = "additionalHoursPaymentDate";
3129
public static final String ADDITIONAL_HOURS_PRICE = "additionalHoursPrice";
3230
public static final String ADDRESS = "address";
31+
public static final String ADD_LABEL_TO_DEVICES = "addLabelToDevices";
3332
public static final String ALARM_ON = "alarmOn";
3433
public static final String ALWAYS_VALID = "alwaysValid";
3534
public static final String ANDROID_DEVICE_LIMIT = "androidDeviceLimit";
@@ -74,21 +73,22 @@ private MappingKey() {
7473
public static final String CONTENT = "content";
7574
public static final String COUNT = "count";
7675
public static final String COUNTRY = "country";
77-
public static final String CREATE_TIME = "createTime";
7876
public static final String CREATED_BY_EMAIL = "createdByEmail";
7977
public static final String CREATED_BY_ID = "createdById";
78+
public static final String CREATE_TIME = "createTime";
8079
public static final String CREDITS_PRICE = "creditsPrice";
8180
public static final String CURRENT_STEP_TYPE = "currentStepType";
8281
public static final String CUSTOM_PLAN = "customPlan";
8382
public static final String CVV = "cvv";
8483
public static final String DATA = "data";
8584
public static final String DAY = "day";
8685
public static final String DAYS = "days";
87-
public static final String DEACTIVATE_REASON = "deactivateReason";
8886
public static final String DEACTIVATED_BY_ID = "deactivatedById";
8987
public static final String DEACTIVATED_BY_NAME = "deactivatedByName";
88+
public static final String DEACTIVATE_REASON = "deactivateReason";
9089
public static final String DEDICATED = "dedicated";
9190
public static final String DEDICATED_DEVICES_COUNT = "dedicatedDevicesCount";
91+
public static final String DEDICATED_DEVICES_TEST_TIMEOUT = "dedicatedDevicesTestTimeout";
9292
public static final String DEDICATION_END_TIME = "dedicationEndTime";
9393
public static final String DELETE_TIME = "deleteTime";
9494
public static final String DEPRECATED_RESOURCE = "deprecatedResource";
@@ -134,34 +134,35 @@ private MappingKey() {
134134
public static final String EXPIRE_TIME = "expireTime";
135135
public static final String EXTERNAL_ID = "externalId";
136136
public static final String EXTERNAL_STORAGE = "externalStorage";
137-
public static final String FAILED_DEVICE_SESSIONS = "failedDeviceSessions";
138137
public static final String FAILED_DEVICES = "failedDevices";
138+
public static final String FAILED_DEVICE_SESSIONS = "failedDeviceSessions";
139139
public static final String FAILED_RATIO = "failedRatio";
140-
public static final String FAILED_TEST_CASE_COUNT = "failedTestCaseCount";
141140
public static final String FAILED_TESTS = "failedTests";
141+
public static final String FAILED_TEST_CASE_COUNT = "failedTestCaseCount";
142142
public static final String FIELD = "field";
143143
public static final String FILE = "file";
144+
public static final String FILENAME = "filename";
144145
public static final String FILE_ID = "fileId";
145146
public static final String FILE_TAGS_ARR = "fileTags[]";
146-
public static final String FILENAME = "filename";
147147
public static final String FINGERPRINT = "fingerprint";
148-
public static final String FINISH_TIME_MS = "finishTimeMS";
149148
public static final String FINISHED = "finished";
150149
public static final String FINISHED_DEVICE_COUNT = "finishedDeviceCount";
150+
public static final String FINISH_TIME_MS = "finishTimeMS";
151151
public static final String FIRST_NAME = "firstName";
152152
public static final String FLASH_ON = "flashOn";
153+
public static final String FORCE_RESTORE = "forceRestore";
153154
public static final String FOR_PROJECTS = "forProjects";
154155
public static final String FOR_WHOLE_ACCOUNT = "forWholeAccount";
155-
public static final String FORCE_RESTORE = "forceRestore";
156-
public static final String FRAME_EXTRA_WIDTH = "frameExtraWidth";
157156
public static final String FRAMEWORK_ID = "frameworkId";
158157
public static final String FRAMEWORK_NAME = "frameworkName";
159158
public static final String FRAMEWORK_QUEUE_WAIT = "frameworkQueueWait";
159+
public static final String FRAME_EXTRA_WIDTH = "frameExtraWidth";
160160
public static final String FREE_TRIAL = "freeTrial";
161161
public static final String FROM_TIME = "fromTime";
162162
public static final String GLOBAL = "global";
163163
public static final String GLOBAL_DEVICE_LIMIT = "globalDeviceLimit";
164164
public static final String GLOBAL_PROJECT_LIMIT = "globalProjectLimit";
165+
public static final String GROUPING = "grouping";
165166
public static final String GROUP_ID = "groupId";
166167
public static final String HASH = "hash";
167168
public static final String HEIGHT = "height";
@@ -174,16 +175,16 @@ private MappingKey() {
174175
public static final String IMAGE_PREFIX = "imagePrefix";
175176
public static final String IMAGE_TOP = "imageTop";
176177
public static final String IMAGE_WIDTH = "imageWidth";
177-
public static final String IN_USE = "inUse";
178-
public static final String INCLUDE_DEVICE_GROUPS = "includeDeviceGroups";
179178
public static final String INCLUDE_DEVICES = "includeDevices";
179+
public static final String INCLUDE_DEVICE_GROUPS = "includeDeviceGroups";
180180
public static final String INCLUDE_FRAMEWORKS = "includeFrameworks";
181181
public static final String INIT_STEP = "initStep";
182182
public static final String INPUT_TYPE = "inputType";
183183
public static final String INSPECTOR_ENABLED = "inspectorEnabled";
184184
public static final String INSTALL_URL = "installUrl";
185185
public static final String INTERNAL_STORAGE = "internalStorage";
186186
public static final String INTERNET_ACCESS = "internetAccess";
187+
public static final String IN_USE = "inUse";
187188
public static final String IOS_DEVICE_LIMIT = "iosDeviceLimit";
188189
public static final String IOS_ENABLED = "iosEnabled";
189190
public static final String IOS_PROJECT_LIMIT = "iosProjectLimit";
@@ -229,12 +230,12 @@ private MappingKey() {
229230
public static final String NEW_PASSWORD = "newPassword";
230231
public static final String NOT_ARCHIVED = "notArchived";
231232
public static final String NUMBER = "number";
232-
public static final String ON_DATE = "onDate";
233233
public static final String ONLINE = "online";
234234
public static final String ONLY_MAIN_USERS = "onlyMainUsers";
235235
public static final String ONLY_WITH_BROWSERS = "onlyWithBrowsers";
236236
public static final String ONLY_WITH_DEDICATED_DEVICES = "onlyWithDedicatedDevices";
237237
public static final String ONLY_WITH_DISABLED_SERVICES = "onlyWithDisabledServices";
238+
public static final String ON_DATE = "onDate";
238239
public static final String ORGANIZATION = "organization";
239240
public static final String ORIGINAL_NAME = "originalName";
240241
public static final String OS_TYPE = "osType";
@@ -274,21 +275,21 @@ private MappingKey() {
274275
public static final String RESOURCE_ID = "resourceId";
275276
public static final String RESTART = "restart";
276277
public static final String RETENTION_STRATEGY = "retentionStrategy";
277-
public static final String RETRY_STATE = "retryState";
278278
public static final String RETRYABLE = "retryable";
279+
public static final String RETRY_STATE = "retryState";
279280
public static final String ROLE_ID = "roleId";
280281
public static final String ROLE_IDS_ARR = "roleIds[]";
281-
public static final String RUN_ID = "runId";
282282
public static final String RUNNING = "running";
283283
public static final String RUNNING_DEVICE_COUNT = "runningDeviceCount";
284+
public static final String RUN_ID = "runId";
284285
public static final String SAMPLE_APP_ID = "sampleAppId";
285286
public static final String SAMPLE_TEST_ID = "sampleTestId";
286287
public static final String SCHEDULER = "scheduler";
287288
public static final String SCOPE = "scope";
288-
public static final String SCREEN_LOCKED = "screenLocked";
289-
public static final String SCREEN_RESOLUTION = "screenResolution";
290289
public static final String SCREENSHOT_FILE_ID = "screenshotsFileId";
291290
public static final String SCREENSHOT_ID = "screenshotId";
291+
public static final String SCREEN_LOCKED = "screenLocked";
292+
public static final String SCREEN_RESOLUTION = "screenResolution";
292293
public static final String SDCARD_PRESENT = "sdcardPresent";
293294
public static final String SECURED = "secured";
294295
public static final String SELECTOR_ID = "selectorId";
@@ -300,6 +301,7 @@ private MappingKey() {
300301
public static final String SERVICE_IDS = "serviceIds";
301302
public static final String SERVICE_NAME = "serviceName";
302303
public static final String SERVICE_PRICE = "servicePrice";
304+
public static final String SESSION_TYPE = "sessionType";
303305
public static final String SHARED_BY_EMAIL = "sharedByEmail";
304306
public static final String SHOW_STATISTICS = "showStatistics";
305307
public static final String SIMPLE = "simple";
@@ -311,11 +313,11 @@ private MappingKey() {
311313
public static final String SLM_LICENSE_ID = "slmLicenseId";
312314
public static final String SLM_ORGANIZATION_ID = "slmOrganizationId";
313315
public static final String SSID = "ssid";
316+
public static final String STARTED_BY_DISPLAY_NAME = "startedByDisplayName";
317+
public static final String STARTED_BY_ID = "startedById";
314318
public static final String START_BILLING_PERIOD = "startBillingPeriod";
315319
public static final String START_TIME = "startTime";
316320
public static final String START_TIME_MS = "startTimeMS";
317-
public static final String STARTED_BY_DISPLAY_NAME = "startedByDisplayName";
318-
public static final String STARTED_BY_ID = "startedById";
319321
public static final String STATE = "state";
320322
public static final String STATE_CHANGE_TIME = "stateChangeTime";
321323
public static final String STATE_TIME = "stateTime";
@@ -325,8 +327,8 @@ private MappingKey() {
325327
public static final String SUBSCRIPTION_END = "subscriptionEnd";
326328
public static final String SUBSCRIPTION_START = "subscriptionStart";
327329
public static final String SUCCEEDED_DEVICE_COUNT = "succeededDeviceCount";
328-
public static final String SUCCESS_RATIO = "successRatio";
329330
public static final String SUCCESSFUL_TEST_CASE_COUNT = "successfulTestCaseCount";
331+
public static final String SUCCESS_RATIO = "successRatio";
330332
public static final String SYNC = "sync";
331333
public static final String TAG = "tag";
332334
public static final String TAG_ARR = "tag[]";
@@ -339,25 +341,24 @@ private MappingKey() {
339341
public static final String TEST_TIMEOUT = "testTimeout";
340342
public static final String TEST_TIME_LIMIT = "testTimeLimit";
341343
public static final String TETHERING_ON = "tetheringOn";
344+
public static final String TIMEOUTED_DEVICE_COUNT = "timeoutedDeviceCount";
342345
public static final String TIME_LIMIT = "timeLimit";
343346
public static final String TIME_ZONE = "timeZone";
344-
public static final String TIMEOUTED_DEVICE_COUNT = "timeoutedDeviceCount";
345-
public static final String TIMESTAMP = "timestamp";
346-
public static final String TO_TIME = "toTime";
347347
public static final String TOTAL = "total";
348348
public static final String TOTAL_DEVICE_SESSIONS = "totalDeviceSessions";
349349
public static final String TOTAL_PRICE = "totalPrice";
350350
public static final String TOTAL_TESTS = "totalTests";
351+
public static final String TO_TIME = "toTime";
351352
public static final String TUNNEL_ID = "tunnelId";
352353
public static final String TURN_MAINTENANCE = "turnMaintenance";
353354
public static final String TYPE = "type";
354355
public static final String TYPE_ID = "typeId";
355356
public static final String UNIT = "unit";
356357
public static final String UNIT_COUNT = "unitCount";
357358
public static final String UNLOCK_GESTURE = "unlockGesture";
358-
public static final String UPDATE_TIME = "updateTime";
359359
public static final String UPDATED_BY_DISPLAY_NAME = "updatedByDisplayName";
360360
public static final String UPDATED_BY_ID = "updatedById";
361+
public static final String UPDATE_TIME = "updateTime";
361362
public static final String URI = "uri";
362363
public static final String URL = "url";
363364
public static final String URL_SCHEMA = "urlSchema";
@@ -369,11 +370,13 @@ private MappingKey() {
369370
public static final String USER_EMAIL = "userEmail";
370371
public static final String USER_ID = "userId";
371372
public static final String USER_NAME = "userName";
373+
public static final String UTILIZATION_TYPE = "utilizationType";
372374
public static final String VALUE = "value";
373375
public static final String VERSION = "version";
374376
public static final String WAITING_DEVICE_COUNT = "waitingDeviceCount";
375377
public static final String WARNING_DEVICE_COUNT = "warningDeviceCount";
376378
public static final String WIDTH = "width";
379+
public static final String WITHOUT_PRIORITIES = "withoutPriorities";
377380
public static final String WITH_BROWSERS = "withBrowsers";
378381
public static final String WITH_DEDICATED = "withDedicated";
379382
public static final String WITH_DEDICATED_DEVICES_INFO = "withDedicatedDevicesInfo";
@@ -386,7 +389,6 @@ private MappingKey() {
386389
public static final String WITH_SUPPORTED_CREATORS = "withSupportedCreators";
387390
public static final String WITH_USER_INFO = "withUserInfo";
388391
public static final String WITH_VULNERABLE_DATA = "withVulnerableData";
389-
public static final String WITHOUT_PRIORITIES = "withoutPriorities";
390392
public static final String ZIP = "zip";
391393
// @formatter:on
392394
}

‎src/main/java/com/testdroid/api/model/APIAccountPreference.java‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,40 @@ public class APIAccountPreference extends APIEntity implements Serializable {
2121

2222
private Long testTimeout;
2323

24+
private Long dedicatedDevicesTestTimeout;
25+
2426
private Long defaultTestTimeout;
2527

2628
public List<String> getAllowedFileExtensions() {
2729
return allowedFileExtensions;
2830
}
2931

30-
public APIAccountPreference setAllowedFileExtensions(List<String> allowedFileExtensions) {
32+
public void setAllowedFileExtensions(List<String> allowedFileExtensions) {
3133
this.allowedFileExtensions = allowedFileExtensions;
32-
return this;
3334
}
3435

3536
public Long getTestTimeout() {
3637
return testTimeout;
3738
}
3839

39-
public APIAccountPreference setTestTimeout(Long testTimeout) {
40+
public void setTestTimeout(Long testTimeout) {
4041
this.testTimeout = testTimeout;
41-
return this;
42+
}
43+
44+
public Long getDedicatedDevicesTestTimeout() {
45+
return dedicatedDevicesTestTimeout;
46+
}
47+
48+
public void setDedicatedDevicesTestTimeout(Long dedicatedDevicesTestTimeout) {
49+
this.dedicatedDevicesTestTimeout = dedicatedDevicesTestTimeout;
4250
}
4351

4452
public Long getDefaultTestTimeout() {
4553
return defaultTestTimeout;
4654
}
4755

48-
public APIAccountPreference setDefaultTestTimeout(Long defaultTestTimeout) {
56+
public void setDefaultTestTimeout(Long defaultTestTimeout) {
4957
this.defaultTestTimeout = defaultTestTimeout;
50-
return this;
5158
}
5259

5360
@Override
@@ -63,6 +70,7 @@ protected <T extends APIEntity> void clone(T from) {
6370
cloneBase(from);
6471
this.allowedFileExtensions = prototype.allowedFileExtensions;
6572
this.testTimeout = prototype.testTimeout;
73+
this.dedicatedDevicesTestTimeout = prototype.dedicatedDevicesTestTimeout;
6674
this.defaultTestTimeout = prototype.defaultTestTimeout;
6775
}
6876

@@ -76,11 +84,12 @@ public boolean equals(Object o) {
7684
}
7785
return Objects.equals(allowedFileExtensions, that.allowedFileExtensions)
7886
&& Objects.equals(testTimeout, that.testTimeout)
87+
&& Objects.equals(dedicatedDevicesTestTimeout, that.dedicatedDevicesTestTimeout)
7988
&& Objects.equals(defaultTestTimeout, that.defaultTestTimeout);
8089
}
8190

8291
@Override
8392
public int hashCode() {
84-
return Objects.hash(allowedFileExtensions, testTimeout, defaultTestTimeout);
93+
return Objects.hash(allowedFileExtensions, testTimeout, dedicatedDevicesTestTimeout, defaultTestTimeout);
8594
}
8695
}

0 commit comments

Comments
 (0)