Version 2.84 add read and parsing ADB version

Author: snieguu

pom.xml

@@ -10,17 +10,15 @@
 
  <groupId>com.bitbar</groupId>
  <artifactId>remote-device-client</artifactId>
- <version>0.3.4</version>
+ <version>2.84</version>
  <packaging>jar</packaging>
 
  <properties>
  <java.version>1.8</java.version>
- <testdroid-api.version>2.78</testdroid-api.version>
- <jackson.version>2.9.9</jackson.version>
+ <testdroid-api.version>2.84</testdroid-api.version>
  <cli.version>1.3.1</cli.version>
  <jsch.version>0.1.54</jsch.version>
- <springboot.version>2.0.4.RELEASE</springboot.version>
- <slf4j.version>1.7.13</slf4j.version>
+ <springboot.version>2.2.0.RELEASE</springboot.version>
  </properties>
 
  <dependencies>
@@ -46,25 +44,26 @@
  </exclusions>
  </dependency>
  <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}.2</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <version>${springboot.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>commons-cli</groupId>
  <artifactId>commons-cli</artifactId>
  <version>${cli.version}</version>
  </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
  </dependencies>
 
  <build>

src/main/java/com/bitbar/remotedevice/RemoteDeviceClientMain.java

@@ -1,5 +1,6 @@
 package com.bitbar.remotedevice;
 
+import com.bitbar.remotedevice.android.ADBVersionParser;
 import com.bitbar.remotedevice.android.PortForwardingParameters;
 import com.bitbar.remotedevice.android.RemoteAndroidDeviceSession;
 import com.bitbar.remotedevice.api.APIClientManager;
@@ -15,12 +16,15 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
@@ -47,6 +51,23 @@ public class RemoteDeviceClientMain {
 
  private static Object keyboardLock = new Object();
 
+ private static String ADB_VERSION;
+
+ static {
+ try {
+ ProcessBuilder ps = new ProcessBuilder("adb", "version");
+ Process process = ps.start();
+ String output = IOUtils.toString(process.getInputStream(), StandardCharsets.UTF_8.name());
+ ADB_VERSION = new ADBVersionParser().parse(output);
+ process.waitFor();
+ } catch (IOException | InterruptedException exc) {
+ LOGGER.error("Error", exc);
+ System.exit(1);
+ } finally {
+ LOGGER.info(String.format("ADB version detected: %s", ADB_VERSION));
+ }
+ }
+
  private RemoteDeviceClientMain(CommandLine commandLine) throws RequiredParameterIsEmptyException, APIException {
  String cloudUrl = commandLine.getOptionValue(CommandLineParameter.CLOUD_URI.getArgument());
  String apiKey = commandLine.getOptionValue(CommandLineParameter.API_KEY.getArgument());
@@ -174,8 +195,7 @@ private void connect(CommandLine commandLine)
  private void checkPortFree(int port) throws PortNotFreeException {
  try (ServerSocket serverSocket = new ServerSocket()) {
  serverSocket.setReuseAddress(false);
- serverSocket.bind(new InetSocketAddress(InetAddress.getByName("localhost"),
- port));
+ serverSocket.bind(new InetSocketAddress(InetAddress.getByName("localhost"), port));
  } catch (Exception e) {
  throw new PortNotFreeException();
  }

src/main/java/com/bitbar/remotedevice/android/ADBVersionParser.java

@@ -0,0 +1,16 @@
+package com.bitbar.remotedevice.android;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ADBVersionParser {
+
+ private static final Pattern ADB_VERSION_PATTERN = Pattern.compile("(\\d+\\.\\d+\\.\\d+)");
+
+ private static final String UNKNOWN_VERSION = "UNKNOWN";
+
+ public String parse(String input) {
+ Matcher matcher = ADB_VERSION_PATTERN.matcher(input);
+ return matcher.find() ? matcher.group(1) : UNKNOWN_VERSION;
+ }
+}

src/main/java/com/bitbar/remotedevice/api/APIClientManager.java

@@ -11,12 +11,14 @@
 import com.testdroid.api.filter.NumberFilterEntry;
 import com.testdroid.api.filter.StringFilterEntry;
 import com.testdroid.api.model.*;
+import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 
 import static com.bitbar.remotedevice.StaticParameters.DEVICE_SESSIONS_URI;
 import static com.bitbar.remotedevice.StaticParameters.RELEASE_DS_URI;
+import static com.testdroid.api.dto.MappingKey.LABEL_IDS_ARR;
 
 public class APIClientManager {
 
@@ -61,8 +63,9 @@ public List<APIDevice> getSupportedDevices() throws APIException {
  Context<APIDevice> ctx = new Context<>(APIDevice.class);
  ctx.getFilters().add(new ListStringFilterEntry(MappingKey.OS_TYPE, Operand.IN,
  Arrays.asList(APIDevice.OsType.ANDROID.getDisplayName(), APIDevice.OsType.IOS.getDisplayName())));
- getRemoteSessionsLabelId().ifPresent(val ->
- ctx.setExtraParams(Collections.singletonMap(MappingKey.LABEL_IDS_ARR, val)));
+ getRemoteSessionsLabelId().ifPresent(val -> ctx.setExtraParams(
+ new HashSetValuedHashMap<>(Collections.singletonMap(LABEL_IDS_ARR, val))
+ ));
  ctx.setLimit(0);
  List<APISort.SortItem> sortItems = new ArrayList<>();
  sortItems.add(new APISort.SortItem(MappingKey.DISPLAY_NAME, APISort.Type.ASC));

src/test/java/com/bitbar/remotedevice/android/ADBVersionParserTest.java

@@ -0,0 +1,37 @@
+package com.bitbar.remotedevice.android;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ADBVersionParserTest {
+
+ private static Collection<Object[]> data() {
+ Object[][] data = new Object[][]{
+ {"1.0.32"},
+ {"1.0.41"}
+ };
+ return Arrays.asList(data);
+ }
+
+ @ParameterizedTest
+ @MethodSource("data")
+ void parse(String version) throws IOException{
+ ADBVersionParser classUnderTest = new ADBVersionParser();
+ assertThat(classUnderTest.parse(getStringFromFile(version))).isEqualTo(version);
+ }
+
+ private static String getStringFromFile(String version) throws IOException {
+ try (InputStream inputStream = ADBVersionParserTest.class.getResourceAsStream("/adb-version-output/" + version)) {
+ return IOUtils.toString(inputStream, UTF_8);
+ }
+ }
+}

src/test/resources/adb-version-output/1.0.32

@@ -0,0 +1,2 @@
+Android Debug Bridge version 1.0.32
+Revision eac51f2bb6a8-android

src/test/resources/adb-version-output/1.0.41

@@ -0,0 +1,3 @@
+Android Debug Bridge version 1.0.41
+Version 28.0.3-5475833
+Installed as /usr/local/bin/adb