X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FSimpleFieldSetBuilder.java;h=a974a0cb1971c845723a3e017ae9606188922e20;hp=37d049a8d365892728e18686815ad909ba03f412;hb=faf66247a34f64946990a985d2ea3003465969cb;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..a974a0c 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–2020 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,13 +17,12 @@ package net.pterodactylus.sone.freenet; -import net.pterodactylus.util.validation.Validation; +import static com.google.common.base.Preconditions.checkNotNull; + import freenet.support.SimpleFieldSet; /** * Helper class to construct {@link SimpleFieldSet} objects in a single call. - * - * @author David ‘Bombe’ Roden */ public class SimpleFieldSetBuilder { @@ -46,8 +45,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 +65,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; }