Merge pull request #469 from szprutamich/master

Version 3.12

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>3.11</version>
+    <version>3.12</version>
     <packaging>jar</packaging>
     <name>Bitbar API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -12,7 +12,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>2.7.6</org.springframework.boot.spring-boot-dependencies>
+        <org.springframework.boot.spring-boot-dependencies>2.7.7</org.springframework.boot.spring-boot-dependencies>
         <org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version>
         <org.apache.commons.io.version>2.11.0</org.apache.commons.io.version>
         <commons-text.version>1.10.0</commons-text.version>

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

@@ -5,7 +5,12 @@
  */
 public class MappingKey {
 
+    private MappingKey() {
+        throw new IllegalStateException("Utility class");
+    }
+
     // @formatter:off
+    public static final String ACCEPT = "accept";
     public static final String ACCESS_GROUP_ID = "accessGroupId";
     public static final String ACCOUNT_ID = "accountId";
     public static final String ACCOUNT_ROLE_ID = "accountRoleId";
@@ -36,6 +41,7 @@ public class MappingKey {
     public static final String AVG_WAITING_TIME = "avgWaitingTime";
     public static final String BATTERY_LEVEL = "batteryLevel";
     public static final String BILLABLE = "billable";
+    public static final String BIOMETRIC_INSTRUMENTATION = "biometricInstrumentation";
     public static final String BLUETOOTH_ON = "bluetoothOn";
     public static final String BODY = "body";
     public static final String BRAINTREE_CLIENT_TOKEN = "braintreeClientToken";
@@ -136,8 +142,6 @@ public class MappingKey {
     public static final String GLOBAL = "global";
     public static final String GLOBAL_DEVICE_LIMIT = "globalDeviceLimit";
     public static final String GLOBAL_PROJECT_LIMIT = "globalProjectLimit";
-    public static final String HANDLER_EMAIL = "handlerEmail";
-    public static final String HANDLER_ID = "handlerId";
     public static final String HASH = "hash";
     public static final String HEIGHT = "height";
     public static final String HOST = "host";
@@ -188,19 +192,19 @@ public class MappingKey {
     public static final String MAIN_USER_ID = "mainUserId";
     public static final String MAIN_USER_LAST_NAME = "mainUserLastName";
     public static final String MANUFACTURER = "manufacturer";
+    public static final String MAX_TOTAL = "maxTotal";
     public static final String MFA_CODE = "mfaCode";
     public static final String MFA_ENABLED = "mfaEnabled";
     public static final String MIMETYPE = "mimetype";
+    public static final String MIN_AVAILABLE = "minAvailable";
     public static final String MOCK_LOCATION_ON = "mockLocationOn";
     public static final String MODE = "mode";
     public static final String MONITORING_ON = "monitoringOn";
     public static final String NAME = "name";
     public static final String NEW_PASSWORD = "newPassword";
     public static final String NOTIFICATION_CHANNEL = "channel";
-    public static final String NOTIFICATION_CONTENT = "notificationContent";
     public static final String NOTIFICATION_DESTINATION = "destination";
     public static final String NOTIFICATION_SCOPE = "scope";
-    public static final String NOTIFICATION_SUBJECT = "notificationSubject";
     public static final String NOT_ARCHIVED = "notArchived";
     public static final String ONLINE = "online";
     public static final String ONLY_MAIN_USERS = "onlyMainUsers";
@@ -260,7 +264,6 @@ public class MappingKey {
     public static final String SELECTOR_ID = "selectorId";
     public static final String SELECTOR_IDS_ARR = "selectorIds[]";
     public static final String SENT = "sent";
-    public static final String SENT_TIME = "sentTime";
     public static final String SERIAL_ID = "serialId";
     public static final String SERVICE_ID = "serviceId";
     public static final String SERVICE_IDS = "serviceIds";

src/main/java/com/testdroid/api/formatter/CurrencyFormatter.java

@@ -9,6 +9,10 @@
  */
 public class CurrencyFormatter {
 
+    private CurrencyFormatter() {
+        throw new IllegalStateException("Utility class");
+    }
+
     public static String format(Long value) {
         return NumberFormat.getCurrencyInstance(Locale.US).format(BigDecimal.valueOf(value, 2));
     }

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

@@ -5,7 +5,7 @@
 import com.testdroid.api.APIEntity;
 
 import javax.xml.bind.annotation.XmlType;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 public class APIAccountConcurrencyStatusMap extends APIEntity {
@@ -18,7 +18,7 @@ public enum Type {
 
     private String mainUserEmail;
 
-    private Map<Type, APIAccountConcurrencyStatus> statusMap = new HashMap<>();
+    private Map<Type, APIAccountConcurrencyStatus> statusMap = new EnumMap<>(Type.class);
 
     public APIAccountConcurrencyStatusMap() {
     }

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

@@ -40,21 +40,24 @@ public enum HttpMethod {
 
     private String body;
 
+    private String accept;
+
     private boolean deprecatedResource;
 
     public APIActivity() {
     }
 
     public APIActivity(
             Long id, LocalDateTime createTime, HttpMethod httpMethod, String userAgent, String parameters, String uri,
-            String body, Long userId, String userEmail, boolean deprecatedResource) {
+            String body, String accept, Long userId, String userEmail, boolean deprecatedResource) {
         super(id);
         this.createTime = TimeConverter.toDate(createTime);
         this.httpMethod = httpMethod;
         this.userAgent = userAgent;
         this.parameters = parameters;
         this.uri = uri;
         this.body = body;
+        this.accept = accept;
         this.userId = userId;
         this.userEmail = userEmail;
         this.deprecatedResource = deprecatedResource;
@@ -124,6 +127,14 @@ public void setBody(String body) {
         this.body = body;
     }
 
+    public String getAccept() {
+        return accept;
+    }
+
+    public void setAccept(String accept) {
+        this.accept = accept;
+    }
+
     public boolean isDeprecatedResource() {
         return deprecatedResource;
     }
@@ -144,6 +155,7 @@ protected <T extends APIEntity> void clone(T from) {
         this.userId = apiActivity.userId;
         this.userEmail = apiActivity.userEmail;
         this.body = apiActivity.body;
+        this.accept = apiActivity.accept;
         this.deprecatedResource = apiActivity.deprecatedResource;
     }
 }

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

@@ -165,6 +165,8 @@ public boolean isSettable() {
 
     private String uiLink;
 
+    private Boolean biometricInstrumentation;
+
     public APIDeviceSession() {
     }
 
@@ -179,7 +181,7 @@ public APIDeviceSession(
             String releaseVersion, Integer apiLevel, ExcludeReason excludeReason, Long deviceInstanceId,
             RetryState retryState, Integer autoRetriesLeftCount, Long deviceTime, Long duration, Long projectId,
             String projectName, Long testRunId, String testRunName, Float successRatio, String name,
-            APIDeviceSessionConfig config) {
+            APIDeviceSessionConfig config, Boolean biometricInstrumentation) {
         super(id);
         this.externalId = externalId;
         this.clientSideId = clientSideId;
@@ -217,6 +219,7 @@ public APIDeviceSession(
         this.successRatio = successRatio;
         this.name = name;
         this.config = config;
+        this.biometricInstrumentation = biometricInstrumentation;
     }
 
     @Override
@@ -509,6 +512,14 @@ public void setClientSideId(String clientSideId) {
         this.clientSideId = clientSideId;
     }
 
+    public Boolean getBiometricInstrumentation() {
+        return biometricInstrumentation;
+    }
+
+    public void setBiometricInstrumentation(Boolean biometricInstrumentation) {
+        this.biometricInstrumentation = biometricInstrumentation;
+    }
+
     @JsonIgnore
     public APIListResource<APIDeviceSessionStep> getDeviceSessionStepsResource() throws APIException {
         return getListResource(createUri(selfURI, "/steps"), APIDeviceSessionStep.class);
@@ -588,5 +599,6 @@ protected <T extends APIEntity> void clone(T from) {
         this.name = apiDeviceSession.name;
         this.config = apiDeviceSession.config;
         this.rowIndex = apiDeviceSession.rowIndex;
+        this.biometricInstrumentation = apiDeviceSession.biometricInstrumentation;
     }
 }

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

@@ -293,7 +293,7 @@ public boolean isProjectLimited() {
         }
     }
 
-    public static abstract class FeatureLicense {
+    public abstract static class FeatureLicense {
 
         boolean enabled;
 

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

@@ -241,7 +241,7 @@ public void setUsedDeviceGroupName(String usedDeviceGroupName) {
         this.usedDeviceGroupName = usedDeviceGroupName;
     }
 
-    public boolean isBiometricInstrumentationEnabled() {
+    public boolean isBiometricInstrumentation() {
         return biometricInstrumentation;
     }
 

src/main/java/com/testdroid/api/util/TimeConverter.java

@@ -13,6 +13,10 @@
  */
 public class TimeConverter {
 
+    private TimeConverter() {
+        throw new IllegalStateException("Utility class");
+    }
+
     public static LocalDateTime toLocalDateTime(Long millis) {
         return millis == null ? null : Instant.ofEpochMilli(millis).atZone(ZoneId.systemDefault()).toLocalDateTime();
     }

src/main/java/com/testdroid/api/util/TypeReferenceFactory.java

@@ -18,6 +18,10 @@
  */
 public class TypeReferenceFactory {
 
+    private TypeReferenceFactory() {
+        throw new IllegalStateException("Utility class");
+    }
+
     private static final Map<Class<? extends APIEntity>, TypeReference<?>> LIST_MAP = new HashMap<>();
 
     static {

src/test/java/com/testdroid/api/dto/ContextTest.java

@@ -18,8 +18,6 @@
 @Tag(UNIT)
 class ContextTest {
 
-    private Context<APIEntity> classUnderTest;
-
     private static Collection<Object[]> data() {
         Object[][] data = new Object[][]{
                 //Count not executed/set we can't relay on it => LIMIT = page_size
@@ -47,9 +45,9 @@ private static Collection<Object[]> data() {
     @MethodSource("data")
     @ParameterizedTest
     void compute(int offset, int limit, Long count, Integer expectedMaxResults) {
-        classUnderTest = new Context<>(APIEntity.class, offset, limit, null, null);
-        Optional.ofNullable(count).ifPresent(classUnderTest::setCount);
-        Optional<Integer> optionalMaxResult = classUnderTest.computeMaxResult();
+        Context<APIEntity> context = new Context<>(APIEntity.class, offset, limit, null, null);
+        Optional.ofNullable(count).ifPresent(context::setCount);
+        Optional<Integer> optionalMaxResult = context.computeMaxResult();
         assertThat(optionalMaxResult).isEqualTo(Optional.ofNullable(expectedMaxResults));
     }
 }