ReVanced-Mirror/jadb
1
0
Fork 0
mirror of https://github.com/revanced/jadb.git synced 2025-02-05 23:16:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from janosvitok/remove-duplicate-code

Browse Source 
Extract common code from Host{ConnectTo/DisconnectFrom}RemoteTcpDevice
This commit is contained in:
Samuel Carlsson 2018-08-03 22:32:47 +02:00 committed by GitHub
commit bad9f11441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 85 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/se/vidstige/jadb/HostConnectToRemoteTcpDevice.java
View File

@ -3,73 +3,27 @@ package se.vidstige.jadb;
import java.io.IOException;
import java.net.InetSocketAddress;
class HostConnectToRemoteTcpDevice {
private final Transport transport;
private final ResponseValidator responseValidator;
class HostConnectToRemoteTcpDevice extends HostConnectionCommand {
HostConnectToRemoteTcpDevice(Transport transport) {
this.transport = transport;
this.responseValidator = new ResponseValidatorImp();
super(transport, new ResponseValidatorImp());
}
//Visible for testing
HostConnectToRemoteTcpDevice(Transport transport, ResponseValidator responseValidator) {
this.transport = transport;
this.responseValidator = responseValidator;
super(transport, responseValidator);
}
InetSocketAddress connect(InetSocketAddress inetSocketAddress)
throws IOException, JadbException, ConnectionToRemoteDeviceException {
transport.send(String.format("host:connect:%s:%d", inetSocketAddress.getHostString(), inetSocketAddress.getPort()));
verifyTransportLevel();
verifyProtocolLevel();
return inetSocketAddress;
return executeHostCommand("connect", inetSocketAddress);
}
private void verifyTransportLevel() throws IOException, JadbException {
transport.verifyResponse();
}
private void verifyProtocolLevel() throws IOException, ConnectionToRemoteDeviceException {
String status = transport.readString();
responseValidator.validate(status);
}
//@VisibleForTesting
interface ResponseValidator {
void validate(String response) throws ConnectionToRemoteDeviceException;
}
static final class ResponseValidatorImp implements ResponseValidator {
static final class ResponseValidatorImp extends ResponseValidatorBase {
private static final String SUCCESSFULLY_CONNECTED = "connected to";
private static final String ALREADY_CONNECTED = "already connected to";
ResponseValidatorImp() {
}
public void validate(String response) throws ConnectionToRemoteDeviceException {
if (!checkIfConnectedSuccessfully(response) && !checkIfAlreadyConnected(response)) {
throw new ConnectionToRemoteDeviceException(extractError(response));
}
}
private boolean checkIfConnectedSuccessfully(String response) {
return response.startsWith(SUCCESSFULLY_CONNECTED);
}
private boolean checkIfAlreadyConnected(String response) {
return response.startsWith(ALREADY_CONNECTED);
}
private String extractError(String response) {
int lastColon = response.lastIndexOf(':');
if (lastColon != -1) {
return response.substring(lastColon, response.length());
} else {
return response;
}
super(SUCCESSFULLY_CONNECTED, ALREADY_CONNECTED);
}
}
}

70
src/se/vidstige/jadb/HostConnectionCommand.java Normal file
View File

@ -0,0 +1,70 @@
package se.vidstige.jadb;
import java.io.IOException;
import java.net.InetSocketAddress;
public class HostConnectionCommand {
private final Transport transport;
private final ResponseValidator responseValidator;
HostConnectionCommand(Transport transport, ResponseValidator responseValidator) {
this.transport = transport;
this.responseValidator = responseValidator;
}
InetSocketAddress executeHostCommand(String command, InetSocketAddress inetSocketAddress)
throws IOException, JadbException, ConnectionToRemoteDeviceException {
transport.send(String.format("host:%s:%s:%d", command, inetSocketAddress.getHostString(), inetSocketAddress.getPort()));
verifyTransportLevel();
verifyProtocolLevel();
return inetSocketAddress;
}
private void verifyTransportLevel() throws IOException, JadbException {
transport.verifyResponse();
}
private void verifyProtocolLevel() throws IOException, ConnectionToRemoteDeviceException {
String status = transport.readString();
responseValidator.validate(status);
}
//@VisibleForTesting
interface ResponseValidator {
void validate(String response) throws ConnectionToRemoteDeviceException;
}
static class ResponseValidatorBase implements ResponseValidator {
private final String successMessage;
private final String errorMessage;
ResponseValidatorBase(String successMessage, String errorMessage) {
this.successMessage = successMessage;
this.errorMessage = errorMessage;
}
public void validate(String response) throws ConnectionToRemoteDeviceException {
if (!checkIfConnectedSuccessfully(response) && !checkIfAlreadyConnected(response)) {
throw new ConnectionToRemoteDeviceException(extractError(response));
}
}
private boolean checkIfConnectedSuccessfully(String response) {
return response.startsWith(successMessage);
}
private boolean checkIfAlreadyConnected(String response) {
return response.startsWith(errorMessage);
}
private String extractError(String response) {
int lastColon = response.lastIndexOf(':');
if (lastColon != -1) {
return response.substring(lastColon, response.length());
} else {
return response;
}
}
}
}

58
src/se/vidstige/jadb/HostDisconnectFromRemoteTcpDevice.java
View File

@ -3,72 +3,28 @@ package se.vidstige.jadb;
import java.io.IOException;
import java.net.InetSocketAddress;
public class HostDisconnectFromRemoteTcpDevice {
private final Transport transport;
private final ResponseValidator responseValidator;
public class HostDisconnectFromRemoteTcpDevice extends HostConnectionCommand {
HostDisconnectFromRemoteTcpDevice(Transport transport) {
this.transport = transport;
this.responseValidator = new ResponseValidatorImp();
super(transport, new ResponseValidatorImp());
}
//Visible for testing
HostDisconnectFromRemoteTcpDevice(Transport transport, ResponseValidator responseValidator) {
this.transport = transport;
this.responseValidator = responseValidator;
super(transport, responseValidator);
}
InetSocketAddress disconnect(InetSocketAddress inetSocketAddress)
throws IOException, JadbException, ConnectionToRemoteDeviceException {
transport.send(String.format("host:disconnect:%s:%d", inetSocketAddress.getHostString(), inetSocketAddress.getPort()));
verifyTransportLevel();
verifyProtocolLevel();
return inetSocketAddress;
return executeHostCommand("disconnect", inetSocketAddress);
}
private void verifyTransportLevel() throws IOException, JadbException {
transport.verifyResponse();
}
private void verifyProtocolLevel() throws IOException, ConnectionToRemoteDeviceException {
String status = transport.readString();
responseValidator.validate(status);
}
//@VisibleForTesting
interface ResponseValidator {
void validate(String response) throws ConnectionToRemoteDeviceException;
}
static final class ResponseValidatorImp implements ResponseValidator {
static final class ResponseValidatorImp extends ResponseValidatorBase {
private static final String SUCCESSFULLY_DISCONNECTED = "disconnected";
private static final String ALREADY_DISCONNECTED = "error: no such device";
ResponseValidatorImp() {
}
public void validate(String response) throws ConnectionToRemoteDeviceException {
if (!checkIfConnectedSuccessfully(response) && !checkIfAlreadyConnected(response)) {
throw new ConnectionToRemoteDeviceException(extractError(response));
}
}
private boolean checkIfConnectedSuccessfully(String response) {
return response.startsWith(SUCCESSFULLY_DISCONNECTED);
}
private boolean checkIfAlreadyConnected(String response) {
return response.startsWith(ALREADY_DISCONNECTED);
}
private String extractError(String response) {
int lastColon = response.lastIndexOf(':');
if (lastColon != -1) {
return response.substring(lastColon, response.length());
} else {
return response;
}
super(SUCCESSFULLY_DISCONNECTED, ALREADY_DISCONNECTED);
}
}
}

2
test/se/vidstige/jadb/HostConnectToRemoteTcpDeviceTest.java
View File

@ -59,7 +59,7 @@ public class HostConnectToRemoteTcpDeviceTest {
//Prepare
Transport transport = mock(Transport.class);
when(transport.readString()).thenReturn("connected to somehost:1");
HostConnectToRemoteTcpDevice.ResponseValidator responseValidator = mock(HostConnectToRemoteTcpDevice.ResponseValidator.class);
HostConnectToRemoteTcpDevice.ResponseValidator responseValidator = mock(HostConnectionCommand.ResponseValidator.class);
doThrow(new ConnectionToRemoteDeviceException("Fake exception")).when(responseValidator).validate(anyString());
InetSocketAddress tcpAddressEntity = new InetSocketAddress("somehost", 1);

2
test/se/vidstige/jadb/HostDisconnectFromRemoteTcpDeviceTest.java
View File

@ -47,7 +47,7 @@ public class HostDisconnectFromRemoteTcpDeviceTest {
//Prepare
Transport transport = mock(Transport.class);
when(transport.readString()).thenReturn("any string");
HostDisconnectFromRemoteTcpDevice.ResponseValidator responseValidator = mock(HostDisconnectFromRemoteTcpDevice.ResponseValidator.class);
HostDisconnectFromRemoteTcpDevice.ResponseValidator responseValidator = mock(HostConnectionCommand.ResponseValidator.class);
doThrow(new ConnectionToRemoteDeviceException("Fake exception")).when(responseValidator).validate(anyString());
InetSocketAddress inetSocketAddress = new InetSocketAddress("host", 1);