X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FWebOfTrustUpdater.java;h=d449835b0ba804191c066c4118188c125b7970df;hb=fd560d013c7de7b8c70b65156a41d4a6bc9aeb06;hp=56716d6e7513fd41cf23b78ec30c2df038c8a132;hpb=8993ea0dde792409ad28708b21e41d7a50ae28da;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java
index 56716d6..d449835 100644
--- a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java
+++ b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebOfTrustUpdater.java - Copyright © 2012 David Roden
+ * Sone - WebOfTrustUpdater.java - Copyright © 2013 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,6 +17,8 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Level;
@@ -31,7 +33,8 @@ import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
-import net.pterodactylus.util.validation.Validation;
+
+import com.google.inject.Inject;
 
 /**
  * Updates WebOfTrust identity data in a background thread because communicating
@@ -60,6 +63,7 @@ public class WebOfTrustUpdater extends AbstractService {
 	 * @param webOfTrustConnector
 	 *            The web of trust connector
 	 */
+	@Inject
 	public WebOfTrustUpdater(WebOfTrustConnector webOfTrustConnector) {
 		super("Trust Updater");
 		this.webOfTrustConnector = webOfTrustConnector;
@@ -70,28 +74,6 @@ public class WebOfTrustUpdater extends AbstractService {
 	//
 
 	/**
-	 * Retrieves the trust relation between the truster and the trustee. This
-	 * method will return immediately and perform a trust update in the
-	 * background.
-	 *
-	 * @param truster
-	 *            The identity giving the trust
-	 * @param trustee
-	 *            The identity receiving the trust
-	 */
-	public void getTrust(OwnIdentity truster, Identity trustee) {
-		GetTrustJob getTrustJob = new GetTrustJob(truster, trustee);
-		if (!updateJobs.contains(getTrustJob)) {
-			logger.log(Level.FINER, "Adding Trust Update Job: " + getTrustJob);
-			try {
-				updateJobs.put(getTrustJob);
-			} catch (InterruptedException ie1) {
-				/* the queue is unbounded so it should never block. */
-			}
-		}
-	}
-
-	/**
 	 * Updates the trust relation between the truster and the trustee. This
 	 * method will return immediately and perform a trust update in the
 	 * background.
@@ -312,7 +294,6 @@ public class WebOfTrustUpdater extends AbstractService {
 		 *
 		 * @return {@code true} if this job finished successfully, {@code false}
 		 *         otherwise
-		 *
 		 * @see WebOfTrustUpdater#stop()
 		 */
 		@SuppressWarnings("synthetic-access")
@@ -471,45 +452,6 @@ public class WebOfTrustUpdater extends AbstractService {
 	}
 
 	/**
-	 * Update job that retrieves the trust relation between two identities.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-	 */
-	private class GetTrustJob extends WebOfTrustTrustUpdateJob {
-
-		/**
-		 * Creates a new trust update job.
-		 *
-		 * @param truster
-		 *            The identity giving the trust
-		 * @param trustee
-		 *            The identity receiving the trust
-		 */
-		public GetTrustJob(OwnIdentity truster, Identity trustee) {
-			super(truster, trustee);
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		@SuppressWarnings("synthetic-access")
-		public void run() {
-			try {
-				Trust trust = webOfTrustConnector.getTrust(truster, trustee);
-				if (trustee instanceof DefaultIdentity) {
-					((DefaultIdentity) trustee).setTrust(truster, trust);
-				}
-				finish(true);
-			} catch (PluginException pe1) {
-				logger.log(Level.WARNING, "Could not get Trust value for " + truster + " -> " + trustee + "!", pe1);
-				finish(false);
-			}
-		}
-
-	}
-
-	/**
 	 * Base class for context updates of an {@link OwnIdentity}.
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
@@ -532,9 +474,8 @@ public class WebOfTrustUpdater extends AbstractService {
 		 */
 		@SuppressWarnings("synthetic-access")
 		public WebOfTrustContextUpdateJob(OwnIdentity ownIdentity, String context) {
-			Validation.begin().isNotNull("OwnIdentity", ownIdentity).isNotNull("Context", context).check();
-			this.ownIdentity = ownIdentity;
-			this.context = context;
+			this.ownIdentity = checkNotNull(ownIdentity, "ownIdentity must not be null");
+			this.context = checkNotNull(context, "context must not be null");
 		}
 
 		//