Merge branch 'feature/fix-findbugs-warnings' into next

diff --git a/src/main/java/net/pterodactylus/sone/data/Client.java b/src/main/java/net/pterodactylus/sone/data/Client.java
index ad094f2..612a258 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Client.java
+++ b/src/main/java/net/pterodactylus/sone/data/Client.java
@@ -19,6 +19,8 @@ package net.pterodactylus.sone.data;
 
 import static com.google.common.base.Objects.equal;
 
+import com.google.common.base.Objects;
+
 /**
  * Container for the client information of a {@link Sone}.
  *
@@ -76,4 +78,9 @@ public class Client {
                return equal(getName(), client.getName()) && equal(getVersion(), client.getVersion());
        }
 
+       @Override
+       public int hashCode() {
+               return Objects.hashCode(name, version);
+       }
+
 }

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java b/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java
index fe76846..9a70a14 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java
@@ -19,6 +19,8 @@ package net.pterodactylus.sone.freenet.wot;
 
 import static com.google.common.base.Objects.equal;
 
+import com.google.common.base.Objects;
+
 /**
  * Container class for trust in the web of trust.
  *
@@ -90,6 +92,11 @@ public class Trust {
                return equal(getExplicit(), trust.getExplicit()) && equal(getImplicit(), trust.getImplicit()) && equal(getDistance(), trust.getDistance());
        }
 
+       @Override
+       public int hashCode() {
+               return Objects.hashCode(explicit, implicit, distance);
+       }
+
        /** {@inheritDoc} */
        @Override
        public String toString() {

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index 9ac5dd4..6f5ef85 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -126,7 +126,7 @@ public class WebOfTrustConnector {
         *             if an error occured talking to the Web of Trust plugin
         */
        public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity) throws PluginException {
-               return loadTrustedIdentities(ownIdentity, null);
+               return loadTrustedIdentities(ownIdentity, Optional.<String>absent());
        }
 
        /**

diff --git a/src/main/java/net/pterodactylus/sone/utils/Optionals.java b/src/main/java/net/pterodactylus/sone/utils/Optionals.java
deleted file mode 100644 (file)
index 67132aa..0000000
--- a/src/main/java/net/pterodactylus/sone/utils/Optionals.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.pterodactylus.sone.utils;
-
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-
-/**
- * Helper methods for dealing with {@link Optional}s.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class Optionals {
-
-       public static Predicate<Optional<?>> isPresent() {
-               return new Predicate<Optional<?>>() {
-                       @Override
-                       public boolean apply(Optional<?> input) {
-                               return input.isPresent();
-                       }
-               };
-       }
-
-       public static <T> Function<Optional<T>, T> get() {
-               return new Function<Optional<T>, T>() {
-                       @Override
-                       public T apply(Optional<T> input) {
-                               return input.get();
-                       }
-               };
-       }
-
-}

diff --git a/src/test/java/net/pterodactylus/sone/utils/OptionalsTest.java b/src/test/java/net/pterodactylus/sone/utils/OptionalsTest.java
deleted file mode 100644 (file)
index 0f7dee3..0000000
--- a/src/test/java/net/pterodactylus/sone/utils/OptionalsTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.pterodactylus.sone.utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.FluentIterable;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
-import org.junit.Test;
-
-/**
- * Unit test for {@link Optionals}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class OptionalsTest {
-
-       private final Object object1 = new Object();
-       private final Object object2 = new Object();
-       private final Object object3 = new Object();
-
-       @Test
-       public void canCreateOptionals() {
-               new Optionals();
-       }
-
-       @Test
-       public void isPresentFiltersCorrectOptionals() {
-               List<Optional<Object>> optionals = Arrays.asList(
-                               Optional.of(object1), Optional.absent(),
-                               Optional.of(object2), Optional.absent(),
-                               Optional.of(object3), Optional.absent()
-               );
-               List<Optional<Object>> filteredOptionals =
-                               FluentIterable.from(optionals).filter(Optionals.isPresent()).toList();
-               MatcherAssert.assertThat(filteredOptionals, Matchers.contains(
-                               Optional.of(object1), Optional.of(object2), Optional.of(object3)));
-       }
-
-       @Test
-       public void getReturnsCorrectValues() {
-               List<Optional<Object>> optionals = Arrays.asList(
-                               Optional.of(object1),
-                               Optional.of(object2),
-                               Optional.of(object3)
-               );
-               List<Object> objects = FluentIterable.from(optionals).transform(Optionals.get()).toList();
-               MatcherAssert.assertThat(objects, Matchers.contains(object1, object2, object3));
-       }
-
-}