From 0cff88b12153041b6eb4c8b95d3b6ae62f3e0780 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 5 Oct 2016 19:36:53 +0200 Subject: [PATCH] Add @Nonnull annotations to FreenetLinkPart, too --- .../pterodactylus/sone/text/FreenetLinkPart.java | 38 +++------------------- .../sone/text/FreenetLinkPartTest.java | 25 ++++++++++++++ 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/text/FreenetLinkPart.java b/src/main/java/net/pterodactylus/sone/text/FreenetLinkPart.java index 829bf0f..493880f 100644 --- a/src/main/java/net/pterodactylus/sone/text/FreenetLinkPart.java +++ b/src/main/java/net/pterodactylus/sone/text/FreenetLinkPart.java @@ -17,6 +17,8 @@ package net.pterodactylus.sone.text; +import javax.annotation.Nonnull; + /** * {@link LinkPart} implementation that stores an additional attribute: if the * link is an SSK or USK link and the post was created by an identity that owns @@ -26,49 +28,17 @@ package net.pterodactylus.sone.text; */ public class FreenetLinkPart extends LinkPart { - /** Whether the link is trusted. */ private final boolean trusted; - /** - * Creates a new freenet link part. - * - * @param link - * The link of the part - * @param text - * The text of the part - * @param trusted - * {@code true} if the link is trusted, {@code false} otherwise - */ - public FreenetLinkPart(String link, String text, boolean trusted) { + public FreenetLinkPart(@Nonnull String link, @Nonnull String text, boolean trusted) { this(link, text, text, trusted); } - /** - * Creates a new freenet link part. - * - * @param link - * The link of the part - * @param text - * The text of the part - * @param title - * The title of the part - * @param trusted - * {@code true} if the link is trusted, {@code false} otherwise - */ - public FreenetLinkPart(String link, String text, String title, boolean trusted) { + public FreenetLinkPart(@Nonnull String link, @Nonnull String text, @Nonnull String title, boolean trusted) { super(link, text, title); this.trusted = trusted; } - // - // ACCESSORS - // - - /** - * Returns whether the link is trusted. - * - * @return {@code true} if the link is trusted, {@code false} otherwise - */ public boolean isTrusted() { return trusted; } diff --git a/src/test/java/net/pterodactylus/sone/text/FreenetLinkPartTest.java b/src/test/java/net/pterodactylus/sone/text/FreenetLinkPartTest.java index 57284bf..f29fdde 100644 --- a/src/test/java/net/pterodactylus/sone/text/FreenetLinkPartTest.java +++ b/src/test/java/net/pterodactylus/sone/text/FreenetLinkPartTest.java @@ -39,4 +39,29 @@ public class FreenetLinkPartTest { assertThat(new FreenetLinkPart("link", "text", true).getTitle(), is("text")); } + @Test(expected = NullPointerException.class) + public void nullIsNotAllowedForLink() { + new FreenetLinkPart(null, "text", "title", true); + } + + @Test(expected = NullPointerException.class) + public void nullIsNotAllowedForText() { + new FreenetLinkPart("link", null, "title", true); + } + + @Test(expected = NullPointerException.class) + public void nullIsNotAllowedForLinkInSecondaryConstructor() { + new FreenetLinkPart(null, "text", true); + } + + @Test(expected = NullPointerException.class) + public void nullIsNotAllowedForTextInSecondaryConstructor() { + new FreenetLinkPart("link", null, true); + } + + @Test(expected = NullPointerException.class) + public void nullIsNotAllowedForTitle() { + new FreenetLinkPart("link", "text", null, true); + } + } -- 2.7.4