From 72420249ffac25cab4c5c9e4ff737f6930a9d14b Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 29 Feb 2020 12:05:39 +0100 Subject: [PATCH] =?utf8?q?=F0=9F=A5=85=20Throw=20specialized=20exception?= =?utf8?q?=20for=20protocol=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../net/pterodactylus/fcp/highlevel/FcpClient.java | 2 +- .../fcp/highlevel/FcpProtocolException.java | 60 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/pterodactylus/fcp/highlevel/FcpProtocolException.java diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java index 0c13505..6d51c92 100644 --- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java +++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java @@ -1304,7 +1304,7 @@ public class FcpClient implements Closeable { */ @Override public void receivedProtocolError(FcpConnection fcpConnection, ProtocolError protocolError) { - fcpException = new FcpException("Protocol error (" + protocolError.getCode() + ", " + protocolError.getCodeDescription()); + fcpException = FcpProtocolException.from(protocolError); completionLatch.countDown(); } diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpProtocolException.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpProtocolException.java new file mode 100644 index 0000000..8df43a0 --- /dev/null +++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpProtocolException.java @@ -0,0 +1,60 @@ +/* + * jFCPlib - FcpProtocolException.java - Copyright © 2020 David ‘Bombe’ Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.fcp.highlevel; + +import net.pterodactylus.fcp.ProtocolError; + +/** + * Specialized FCP exception that signals a {@link ProtocolError}. + */ +public class FcpProtocolException extends FcpException { + + private final int code; + private final String codeDescription; + private final String extraDescription; + private final boolean fatal; + + public FcpProtocolException(int code, String codeDescription, String extraDescription, boolean fatal) { + this.code = code; + this.codeDescription = codeDescription; + this.extraDescription = extraDescription; + this.fatal = fatal; + } + + public int getCode() { + return code; + } + + public String getCodeDescription() { + return codeDescription; + } + + public String getExtraDescription() { + return extraDescription; + } + + public boolean isFatal() { + return fatal; + } + + public static FcpProtocolException from(ProtocolError protocolError) { + return new FcpProtocolException(protocolError.getCode(), protocolError.getCodeDescription(), + protocolError.getExtraDescription(), protocolError.isFatal()); + } + +} -- 2.7.4