X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FWebOfTrustUpdater.java;h=b8060d448ad03ed672a0c22ff43b14682338d8f0;hp=56716d6e7513fd41cf23b78ec30c2df038c8a132;hb=7cb98875e6d24a4f4f54ceaadfa4fbab23183bdb;hpb=8993ea0dde792409ad28708b21e41d7a50ae28da
diff --git a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java
index 56716d6..b8060d4 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")
@@ -351,72 +332,17 @@ public class WebOfTrustUpdater extends AbstractService {
}
/**
- * Base class for WebOfTrust trust update jobs.
+ * Update job that sets the trust relation between two identities.
*
* @author David âBombeâ Roden
*/
- private class WebOfTrustTrustUpdateJob extends WebOfTrustUpdateJob {
+ private class SetTrustJob extends WebOfTrustUpdateJob {
/** The identity giving the trust. */
- protected final OwnIdentity truster;
+ private final OwnIdentity truster;
/** The identity receiving the trust. */
- protected final Identity trustee;
-
- /**
- * Creates a new trust update job.
- *
- * @param truster
- * The identity giving the trust
- * @param trustee
- * The identity receiving the trust
- */
- @SuppressWarnings("synthetic-access")
- public WebOfTrustTrustUpdateJob(OwnIdentity truster, Identity trustee) {
- this.truster = truster;
- this.trustee = trustee;
- }
-
- //
- // OBJECT METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object object) {
- if ((object == null) || !object.getClass().equals(getClass())) {
- return false;
- }
- WebOfTrustTrustUpdateJob updateJob = (WebOfTrustTrustUpdateJob) object;
- return ((truster == null) ? (updateJob.truster == null) : updateJob.truster.equals(truster)) && ((trustee == null) ? (updateJob.trustee == null) : updateJob.trustee.equals(trustee));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode() {
- return getClass().hashCode() ^ ((truster == null) ? 0 : truster.hashCode()) ^ ((trustee == null) ? 0 : trustee.hashCode());
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- return String.format("%s[truster=%s,trustee=%s]", getClass().getSimpleName(), (truster == null) ? null : truster.getId(), (trustee == null) ? null : trustee.getId());
- }
-
- }
-
- /**
- * Update job that sets the trust relation between two identities.
- *
- * @author David âBombeâ Roden
- */
- private class SetTrustJob extends WebOfTrustTrustUpdateJob {
+ private final Identity trustee;
/** The score of the relation. */
private final Integer score;
@@ -438,7 +364,8 @@ public class WebOfTrustUpdater extends AbstractService {
* The comment of the trust relation
*/
public SetTrustJob(OwnIdentity truster, Identity trustee, Integer score, String comment) {
- super(truster, trustee);
+ this.truster = truster;
+ this.trustee = trustee;
this.score = score;
this.comment = comment;
}
@@ -468,43 +395,30 @@ public class WebOfTrustUpdater extends AbstractService {
}
}
- }
+ //
+ // OBJECT METHODS
+ //
- /**
- * Update job that retrieves the trust relation between two identities.
- *
- * @author David âBombeâ Roden
- */
- private class GetTrustJob extends WebOfTrustTrustUpdateJob {
+ /** {@inheritDoc} */
+ @Override
+ public boolean equals(Object object) {
+ if ((object == null) || !object.getClass().equals(getClass())) {
+ return false;
+ }
+ SetTrustJob updateJob = (SetTrustJob) object;
+ return ((truster == null) ? (updateJob.truster == null) : updateJob.truster.equals(truster)) && ((trustee == null) ? (updateJob.trustee == null) : updateJob.trustee.equals(trustee));
+ }
- /**
- * 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
+ public int hashCode() {
+ return getClass().hashCode() ^ ((truster == null) ? 0 : truster.hashCode()) ^ ((trustee == null) ? 0 : trustee.hashCode());
}
- /**
- * {@inheritDoc}
- */
+ /** {@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);
- }
+ public String toString() {
+ return String.format("%s[truster=%s,trustee=%s]", getClass().getSimpleName(), (truster == null) ? null : truster.getId(), (trustee == null) ? null : trustee.getId());
}
}
@@ -532,9 +446,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");
}
//