Remove redundant modifiers from classes.

Author: Quintin Willison

lib/src/main/java/io/ably/lib/http/BasePaginatedQuery.java

@@ -282,7 +282,7 @@ public boolean isLast() {
 	 * @param <T>
 	 */
 	private static class SyncResultPage<T> extends ResultPageWrapper<T> implements PaginatedResult<T> {
-		public SyncResultPage(BasePaginatedResult<T> resultBase) {
+		SyncResultPage(BasePaginatedResult<T> resultBase) {
 			super(resultBase);
 		}
 
@@ -301,7 +301,7 @@ public SyncResultPage(BasePaginatedResult<T> resultBase) {
 	 * @param <T>
 	 */
 	private static class AsyncResultPage<T> extends ResultPageWrapper<T> implements AsyncPaginatedResult<T> {
-		public AsyncResultPage(BasePaginatedResult<T> resultBase) {
+		AsyncResultPage(BasePaginatedResult<T> resultBase) {
 			super(resultBase);
 		}
 
@@ -329,7 +329,7 @@ public void next(Callback<AsyncPaginatedResult<T>> callback) {
 	private static class CallbackBridge<T> implements Callback<BasePaginatedResult<T>> {
 		private final Callback<AsyncPaginatedResult<T>> callback;
 
-		public CallbackBridge(Callback<AsyncPaginatedResult<T>> callback) {
+		CallbackBridge(Callback<AsyncPaginatedResult<T>> callback) {
 			this.callback = callback;
 		}
 

lib/src/main/java/io/ably/lib/http/HttpCore.java

@@ -517,7 +517,7 @@ private Proxy getProxy(String host) {
 	/**
 	 * Interface for an entity that supplies an httpCore request body
 	 */
-	public static interface RequestBody {
+	public interface RequestBody {
 		byte[] getEncoded();
 		String getContentType();
 	}
@@ -526,15 +526,15 @@ public static interface RequestBody {
 	 * Interface for an entity that performs type-specific processing on an httpCore response body
 	 * @param <T>
 	 */
-	public static interface BodyHandler<T> {
+	public interface BodyHandler<T> {
 		T[] handleResponseBody(String contentType, byte[] body) throws AblyException;
 	}
 
 	/**
 	 * Interface for an entity that performs type-specific processing on an httpCore response
 	 * @param <T>
 	 */
-	public static interface ResponseHandler<T> {
+	public interface ResponseHandler<T> {
 		T handleResponse(Response response, ErrorInfo error) throws AblyException;
 	}
 

lib/src/main/java/io/ably/lib/realtime/ChannelBase.java

@@ -1070,7 +1070,7 @@ private class ChannelStateCompletionListener implements ChannelStateListener {
 		private final ChannelState successState;
 		private final ChannelState failureState;
 
-		public ChannelStateCompletionListener(CompletionListener completionListener, ChannelState successState, ChannelState failureState) {
+		ChannelStateCompletionListener(CompletionListener completionListener, ChannelState successState, ChannelState failureState) {
 			this.completionListener = completionListener;
 			this.successState = successState;
 			this.failureState = failureState;

lib/src/main/java/io/ably/lib/realtime/ChannelState.java

@@ -13,7 +13,7 @@ public enum ChannelState {
 	suspended(ChannelEvent.suspended);
 
 	final private ChannelEvent event;
-	private ChannelState(ChannelEvent event) {
+	ChannelState(ChannelEvent event) {
 		this.event = event;
 	}
 	public ChannelEvent getChannelEvent() {

lib/src/main/java/io/ably/lib/realtime/ChannelStateListener.java

@@ -53,7 +53,7 @@ static ChannelStateChange createUpdateEvent(ErrorInfo reason, boolean resumed) {
 		}
 	}
 
-	static class Multicaster extends io.ably.lib.util.Multicaster<ChannelStateListener> implements ChannelStateListener {
+	class Multicaster extends io.ably.lib.util.Multicaster<ChannelStateListener> implements ChannelStateListener {
 		@Override
 		public void onChannelStateChanged(ChannelStateChange stateChange) {
 			for(ChannelStateListener member : members)
@@ -63,7 +63,7 @@ public void onChannelStateChanged(ChannelStateChange stateChange) {
 		}
 	}
 
-	static class Filter implements ChannelStateListener {
+	class Filter implements ChannelStateListener {
 		@Override
 		public void onChannelStateChanged(ChannelStateChange stateChange) {
 			if(stateChange.current == this.state)

lib/src/main/java/io/ably/lib/realtime/ConnectionState.java

@@ -14,10 +14,10 @@ public enum ConnectionState {
 	failed(ConnectionEvent.failed);
 
 	final private ConnectionEvent event;
-	private ConnectionState(ConnectionEvent event) {
+	ConnectionState(ConnectionEvent event) {
 		this.event = event;
 	}
 	public ConnectionEvent getConnectionEvent() {
 		return event;
 	}
-}
+}

lib/src/main/java/io/ably/lib/realtime/Presence.java

@@ -662,7 +662,7 @@ private BasePaginatedQuery.ResultRequest<PresenceMessage> historyImpl(Param[] pa
 	private static class QueuedPresence {
 		public PresenceMessage msg;
 		public CompletionListener listener;
-		public QueuedPresence(PresenceMessage msg, CompletionListener listener) { this.msg = msg; this.listener = listener; }
+		QueuedPresence(PresenceMessage msg, CompletionListener listener) { this.msg = msg; this.listener = listener; }
 	}
 
 	private final Map<String, QueuedPresence> pendingPresence = new HashMap<String, QueuedPresence>();
@@ -992,7 +992,7 @@ synchronized List<PresenceMessage> endSync() {
 					members.remove(itemKey);
 				}
 				residualMembers = null;
-	
+
 				/* finish, notifying any waiters */
 				syncInProgress = false;
 			}

lib/src/main/java/io/ably/lib/rest/AblyBase.java

@@ -72,7 +72,7 @@ public AblyBase(ClientOptions options) throws AblyException {
 		auth = new Auth(this, options);
 		httpCore = new HttpCore(options, auth);
 		http = new Http(new AsyncHttpScheduler(httpCore, options), new SyncHttpScheduler(httpCore));
-		
+
 		channels = new InternalChannels();
 
 		platform = new Platform();
@@ -91,10 +91,10 @@ public interface Channels extends ReadOnlyMap<String, Channel> {
 	}
 
 	private class InternalChannels extends InternalMap<String, Channel> implements Channels {
-		public InternalChannels() {
+		InternalChannels() {
 			super(new HashMap<String, Channel>());
 		}
-		
+
 		@Override
 		public Channel get(String channelName) {
 			try {

lib/src/main/java/io/ably/lib/rest/Auth.java

@@ -1001,7 +1001,7 @@ private static boolean equalNullableStrings(String one, String two) {
 		return (one == null) ? (two == null) : one.equals(two);
 	}
 
-	private static final String hmac(String text, String key) {
+	private static String hmac(String text, String key) {
 		try {
 			Mac mac = Mac.getInstance("HmacSHA256");
 			mac.init(new SecretKeySpec(key.getBytes(Charset.forName("UTF-8")), "HmacSHA256"));

lib/src/main/java/io/ably/lib/types/ChannelMode.java

@@ -10,17 +10,17 @@ public enum ChannelMode {
 	publish(Flag.publish),
 	subscribe(Flag.subscribe),
 	presence_subscribe(Flag.presence_subscribe);
-	
+
 	private final int mask;
-	
-	private ChannelMode(final Flag flag) {
+
+	ChannelMode(final Flag flag) {
 		mask = flag.getMask();
 	}
-	
+
 	public int getMask() {
 		return mask;
 	}
-	
+
 	public static Set<ChannelMode> toSet(final int flags) {
 		final Set<ChannelMode> set = new HashSet<>();
 		for (final ChannelMode mode : ChannelMode.values()) {