From 93101d290b36c4b31c6e7daee1319af1f23de179 Mon Sep 17 00:00:00 2001 From: Mieras Made Date: Tue, 11 Sep 2018 20:15:06 +0200 Subject: [PATCH] #100 Various methods can be made less accessible to increase encapsulation --- src/se/vidstige/jadb/DeviceWatcher.java | 2 +- src/se/vidstige/jadb/SyncTransport.java | 4 ++-- src/se/vidstige/jadb/Transport.java | 2 +- src/se/vidstige/jadb/server/AdbProtocolHandler.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/se/vidstige/jadb/DeviceWatcher.java b/src/se/vidstige/jadb/DeviceWatcher.java index 2f219a0..4984f4b 100644 --- a/src/se/vidstige/jadb/DeviceWatcher.java +++ b/src/se/vidstige/jadb/DeviceWatcher.java @@ -19,7 +19,7 @@ public class DeviceWatcher implements Runnable { } @SuppressWarnings("squid:S2189") // watcher is stopped by closing transport - public void watch() { + private void watch() { try { while (true) { listener.onDetect(connection.parseDevices(transport.readString())); diff --git a/src/se/vidstige/jadb/SyncTransport.java b/src/se/vidstige/jadb/SyncTransport.java index 22787fe..8748e6d 100644 --- a/src/se/vidstige/jadb/SyncTransport.java +++ b/src/se/vidstige/jadb/SyncTransport.java @@ -45,11 +45,11 @@ public class SyncTransport { } } - public int readInt() throws IOException { + private int readInt() throws IOException { return Integer.reverseBytes(input.readInt()); } - public String readString(int length) throws IOException { + private String readString(int length) throws IOException { byte[] buffer = new byte[length]; input.readFully(buffer); return new String(buffer, StandardCharsets.UTF_8); diff --git a/src/se/vidstige/jadb/Transport.java b/src/se/vidstige/jadb/Transport.java index d3a8a93..fd42c8f 100644 --- a/src/se/vidstige/jadb/Transport.java +++ b/src/se/vidstige/jadb/Transport.java @@ -47,7 +47,7 @@ class Transport { return new String(responseBuffer, StandardCharsets.UTF_8); } - public String getCommandLength(String command) { + private String getCommandLength(String command) { return String.format("%04x", command.length()); } diff --git a/src/se/vidstige/jadb/server/AdbProtocolHandler.java b/src/se/vidstige/jadb/server/AdbProtocolHandler.java index fc71a13..cfb36da 100644 --- a/src/se/vidstige/jadb/server/AdbProtocolHandler.java +++ b/src/se/vidstige/jadb/server/AdbProtocolHandler.java @@ -211,7 +211,7 @@ class AdbProtocolHandler implements Runnable { return String.format("%04x", command.length()); } - public void send(DataOutput writer, String response) throws IOException { + private void send(DataOutput writer, String response) throws IOException { writer.writeBytes(getCommandLength(response)); writer.writeBytes(response); }