X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FSimpleFieldSetBuilder.java;h=25088fcb754119c68e19d638dd8d4132c8652360;hp=37d049a8d365892728e18686815ad909ba03f412;hb=0a481aacb47d7c1e90c1c212a58f87af29e3ebb6;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2 diff --git a/src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java b/src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java index 37d049a..25088fc 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java +++ b/src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java @@ -1,5 +1,5 @@ /* - * Sone - SimpleFieldSetBuilder.java - Copyright © 2011 David Roden + * Sone - SimpleFieldSetBuilder.java - Copyright © 2011–2016 David 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 @@ -17,7 +17,8 @@ package net.pterodactylus.sone.freenet; -import net.pterodactylus.util.validation.Validation; +import static com.google.common.base.Preconditions.checkNotNull; + import freenet.support.SimpleFieldSet; /** @@ -46,8 +47,7 @@ public class SimpleFieldSetBuilder { * The simple field set to build */ public SimpleFieldSetBuilder(SimpleFieldSet simpleFieldSet) { - Validation.begin().isNotNull("Simple Field Set", simpleFieldSet).check(); - this.simpleFieldSet = simpleFieldSet; + this.simpleFieldSet = checkNotNull(simpleFieldSet, "simpleFieldSet must not be null"); } /** @@ -67,7 +67,7 @@ public class SimpleFieldSetBuilder { * The simple field set to copy * @return This simple field set builder */ - public SimpleFieldSetBuilder put(@SuppressWarnings("hiding") SimpleFieldSet simpleFieldSet) { + public SimpleFieldSetBuilder put(SimpleFieldSet simpleFieldSet) { this.simpleFieldSet.putAllOverwrite(simpleFieldSet); return this; }