From d6c78911aad40060c76ddcadb543f6f0eed73a11 Mon Sep 17 00:00:00 2001 From: Tobias Eidelpes Date: Sun, 6 Dec 2020 20:14:50 +0100 Subject: [PATCH] Change UnknownDomain exception name --- src/main/java/dslab/exception/UnknownDomain.java | 7 ------- .../java/dslab/exception/UnknownDomainException.java | 7 +++++++ src/main/java/dslab/transfer/TransferServer.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 src/main/java/dslab/exception/UnknownDomain.java create mode 100644 src/main/java/dslab/exception/UnknownDomainException.java diff --git a/src/main/java/dslab/exception/UnknownDomain.java b/src/main/java/dslab/exception/UnknownDomain.java deleted file mode 100644 index 4f49b0d..0000000 --- a/src/main/java/dslab/exception/UnknownDomain.java +++ /dev/null @@ -1,7 +0,0 @@ -package dslab.exception; - -public class UnknownDomain extends Exception { - public UnknownDomain(String errorMessage) { - super(errorMessage); - } -} diff --git a/src/main/java/dslab/exception/UnknownDomainException.java b/src/main/java/dslab/exception/UnknownDomainException.java new file mode 100644 index 0000000..3636cd4 --- /dev/null +++ b/src/main/java/dslab/exception/UnknownDomainException.java @@ -0,0 +1,7 @@ +package dslab.exception; + +public class UnknownDomainException extends Exception { + public UnknownDomainException(String errorMessage) { + super(errorMessage); + } +} diff --git a/src/main/java/dslab/transfer/TransferServer.java b/src/main/java/dslab/transfer/TransferServer.java index 9ad5026..5b359ec 100644 --- a/src/main/java/dslab/transfer/TransferServer.java +++ b/src/main/java/dslab/transfer/TransferServer.java @@ -15,7 +15,7 @@ import dslab.ComponentFactory; import dslab.Email; import dslab.Message; import dslab.exception.MalformedInputException; -import dslab.exception.UnknownDomain; +import dslab.exception.UnknownDomainException; import dslab.util.Config; public class TransferServer implements ITransferServer, Runnable { @@ -171,7 +171,7 @@ public class TransferServer implements ITransferServer, Runnable { replayMessage(msg, port); sent.put(recipient.getDomain(), true); } - } catch (UnknownDomain e) { + } catch (UnknownDomainException e) { sendErrorMail(msg, e.getMessage()); } } @@ -210,11 +210,11 @@ public class TransferServer implements ITransferServer, Runnable { } } - private int domainLookup(Email email) throws UnknownDomain { + private int domainLookup(Email email) throws UnknownDomainException { logger.info("Performing domain lookup for address " + email.toString()); if (this.mailboxServers.containsKey(email.getDomain())) return this.mailboxServers.get(email.getDomain()); - throw new UnknownDomain("error domain not found: " + email.getDomain()); + throw new UnknownDomainException("error domain not found: " + email.getDomain()); } private void sendErrorMail(Message msg, String error) { @@ -223,7 +223,7 @@ public class TransferServer implements ITransferServer, Runnable { int port; try { port = domainLookup(errorMessage.getFrom()); - } catch (UnknownDomain e) { + } catch (UnknownDomainException e) { logger.severe("Sending error mail failed because sender domain is unknown"); return; }