ericek111/ts3j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exception propagation

Browse Source
This commit is contained in:
Manevolent
2019-05-29 11:50:40 -04:00
parent 299a0457bd
commit a86381a47b
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/github/manevolent/ts3j/command/response/AbstractCommandResponse.java
+28 -8
View File
@@ -1,5 +1,6 @@
package com.github.manevolent.ts3j.command.response;
import com.github.manevolent.ts3j.command.CommandException;
import com.github.manevolent.ts3j.command.MultiCommand;
import com.github.manevolent.ts3j.util.Ts3Debugging;
@@ -22,21 +23,40 @@ public abstract class AbstractCommandResponse<T> implements CommandResponse<T> {
* Completes the command without any post-mapping processing, lowering overhead.
*/
@Override
public void complete()
throws ExecutionException, InterruptedException {
future.get();
public void complete() throws InterruptedException, CommandException {
try {
future.get();
} catch (ExecutionException ex) {
if (ex.getCause() != null && ex.getCause() instanceof CommandException)
throw (CommandException) ex.getCause();
else
throw new RuntimeException(ex);
}
}
@Override
public T get(long timeoutMillis)
throws TimeoutException, ExecutionException, InterruptedException {
return map(future.get(timeoutMillis, TimeUnit.MILLISECONDS));
throws TimeoutException, InterruptedException, CommandException {
try {
return map(future.get(timeoutMillis, TimeUnit.MILLISECONDS));
} catch (ExecutionException ex) {
if (ex.getCause() != null && ex.getCause() instanceof CommandException)
throw (CommandException) ex.getCause();
else
throw new RuntimeException(ex);
}
}
@Override
public T get()
throws ExecutionException, InterruptedException {
return map(future.get());
public T get() throws InterruptedException, CommandException {
try {
return map(future.get());
} catch (ExecutionException ex) {
if (ex.getCause() != null && ex.getCause() instanceof CommandException)
throw (CommandException) ex.getCause();
else
throw new RuntimeException(ex);
}
}
public void completeSuccess(Iterable<MultiCommand> commands) {
src/main/java/com/github/manevolent/ts3j/command/response/CommandResponse.java
+4 -4
View File
@@ -1,6 +1,7 @@
package com.github.manevolent.ts3j.command.response;
import com.github.manevolent.ts3j.command.Command;
import com.github.manevolent.ts3j.command.CommandException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -9,12 +10,11 @@ public interface CommandResponse<T> {
Command getCommand();
default void complete()
throws ExecutionException, InterruptedException {
default void complete() throws InterruptedException, CommandException {
get();
}
T get(long timeoutMillis) throws TimeoutException, ExecutionException, InterruptedException;
T get() throws ExecutionException, InterruptedException;
T get(long timeoutMillis) throws TimeoutException, InterruptedException, CommandException;
T get() throws InterruptedException, CommandException;
}
src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java
+19 -19
View File
@@ -887,7 +887,7 @@ public class LocalTeamspeakClientSocket
*/
public void clientAddPermission(int clientDatabaseId, Permission... permission)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
MultiCommand command = new MultiCommand(
"clientaddperm",
ProtocolRole.CLIENT,
@@ -905,7 +905,7 @@ public class LocalTeamspeakClientSocket
}
public void clientDeletePermission(int clientDatabaseId, Permission... permission)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
MultiCommand command = new MultiCommand(
"clientdelperm",
ProtocolRole.CLIENT,
@@ -923,7 +923,7 @@ public class LocalTeamspeakClientSocket
}
public void channelAddPermission(int channelId, Permission... permission)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
MultiCommand command = new MultiCommand(
"channeladdperm",
ProtocolRole.CLIENT,
@@ -941,7 +941,7 @@ public class LocalTeamspeakClientSocket
}
public void channelClientAddPermission(int channelId, int clientDatabaseId, Permission... permission)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
MultiCommand command = new MultiCommand(
"channelclientaddperm",
ProtocolRole.CLIENT,
@@ -960,7 +960,7 @@ public class LocalTeamspeakClientSocket
}
public void channelClientDeletePermission(int channelId, int clientDatabaseId, Permission... permission)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
MultiCommand command = new MultiCommand(
"channeldelperm",
ProtocolRole.CLIENT,
@@ -1008,7 +1008,7 @@ public class LocalTeamspeakClientSocket
specifies the ID of the recipient, whether it be a virtual server, a channel or a client.
*/
public void sendServerMessage(String message)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("sendtextmessage", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("targetmode", Integer.toString(3)));
@@ -1023,7 +1023,7 @@ public class LocalTeamspeakClientSocket
specifies the ID of the recipient, whether it be a virtual server, a channel or a client.
*/
public void sendChannelMessage(int channelId, String message)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("sendtextmessage", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("targetmode", Integer.toString(2)));
@@ -1038,7 +1038,7 @@ public class LocalTeamspeakClientSocket
specifies the ID of the recipient, whether it be a virtual server, a channel or a client.
*/
public void sendPrivateMessage(int clientId, String message)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("sendtextmessage", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("targetmode", Integer.toString(1)));
@@ -1054,7 +1054,7 @@ public class LocalTeamspeakClientSocket
channel has no password, the parameter can be omitted.
*/
public void clientMove(int clientId, int channelId, String password)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("clientmove", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("cid", Integer.toString(channelId)));
@@ -1065,7 +1065,7 @@ public class LocalTeamspeakClientSocket
}
public void joinChannel(int channelId, String password)
throws InterruptedException, ExecutionException, TimeoutException, IOException {
throws InterruptedException, TimeoutException, IOException, CommandException {
clientMove(getClientId(), channelId, password);
}
@@ -1075,7 +1075,7 @@ public class LocalTeamspeakClientSocket
channel has no password, the parameter can be omitted.
*/
public Iterable<Channel> listChannels()
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("channellist", ProtocolRole.CLIENT);
return executeCommand(command, x -> new Channel(x.toMap())).get();
@@ -1087,14 +1087,14 @@ public class LocalTeamspeakClientSocket
channel has no password, the parameter can be omitted.
*/
public Iterable<Client> listClients()
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("clientlist", ProtocolRole.CLIENT);
return executeCommand(command, x -> new Client(x.toMap())).get();
}
public void serverGroupAddClient(int groupId, int clientDatabaseId)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("servergroupaddclient", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("sgid", Integer.toString(groupId)));
@@ -1104,7 +1104,7 @@ public class LocalTeamspeakClientSocket
}
public void serverGroupRemoveClient(int groupId, int clientDatabaseId)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("servergroupdelclient", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("sgid", Integer.toString(groupId)));
@@ -1119,7 +1119,7 @@ public class LocalTeamspeakClientSocket
channel has no password, the parameter can be omitted.
*/
public void clientPoke(int clientId, String message)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("clientpoke", ProtocolRole.CLIENT);
command.add(new CommandSingleParameter("clid", Integer.toString(clientId)));
@@ -1135,7 +1135,7 @@ public class LocalTeamspeakClientSocket
and may only have a maximum of 40 characters.
*/
public void kick(Collection<Integer> clientIds, String message)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
MultiCommand command = new MultiCommand(
"clientkick",
ProtocolRole.CLIENT,
@@ -1151,13 +1151,13 @@ public class LocalTeamspeakClientSocket
executeCommand(command).complete();
}
public void subscribeAll() throws IOException, TimeoutException, ExecutionException, InterruptedException {
public void subscribeAll() throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand("channelsubscribeall", ProtocolRole.CLIENT);
executeCommand(command).get();
}
public Client getClientInfo(int clientId)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand(
"clientinfo",
ProtocolRole.CLIENT,
@@ -1178,7 +1178,7 @@ public class LocalTeamspeakClientSocket
}
public Channel getChannelInfo(int channelId)
throws IOException, TimeoutException, ExecutionException, InterruptedException {
throws IOException, TimeoutException, InterruptedException, CommandException {
Command command = new SingleCommand(
"channelinfo",
ProtocolRole.CLIENT,
src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
+1 -1
View File
@@ -13,7 +13,7 @@ public class ServerConnectionTest {
public static void main(String[] args) throws Exception {
Ts3Debugging.setEnabled(true);
LocalIdentity identity = LocalIdentity.read(new File("ident.ini"));
LocalIdentity identity = LocalIdentity.generateNew(10);
LocalTeamspeakClientSocket client = new LocalTeamspeakClientSocket();
client.setIdentity(identity);