X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FWebOfTrustUpdater.java;h=64d97ad343d60c0cac86d09b23ac93b608ed38ef;hb=7d336ec14294bf661c7257d8cded62201c840d34;hp=dd3de580bfb3e0144525a10ec0bcac5fd2e3c10f;hpb=e284f7b5dcaa7ea1e62a48ff74d44de945ffed26;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 dd3de58..64d97ad 100644 --- a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java +++ b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java @@ -34,6 +34,7 @@ import net.pterodactylus.sone.freenet.wot.WebOfTrustException; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.service.AbstractService; +import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; /** @@ -101,18 +102,6 @@ public class WebOfTrustUpdater extends AbstractService { } /** - * Adds the given context to the given own identity. - * - * @param ownIdentity - * The own identity to add the context to - * @param context - * The context to add - */ - public void addContext(OwnIdentity ownIdentity, String context) { - addContextWait(ownIdentity, context, false); - } - - /** * Adds the given context to the given own identity, waiting for completion of * the operation. * @@ -229,7 +218,7 @@ public class WebOfTrustUpdater extends AbstractService { while (!shouldStop()) { try { WebOfTrustUpdateJob updateJob = updateJobs.take(); - if (shouldStop() || (updateJob == stopJob)) { + if (shouldStop()) { break; } logger.log(Level.FINE, "Running Trust Update Job: " + updateJob); @@ -258,7 +247,8 @@ public class WebOfTrustUpdater extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class WebOfTrustUpdateJob { + @VisibleForTesting + class WebOfTrustUpdateJob implements Runnable { /** Object for synchronization. */ @SuppressWarnings("hiding") @@ -279,6 +269,7 @@ public class WebOfTrustUpdater extends AbstractService { *

* The implementation of this class does nothing. */ + @Override public void run() { /* does nothing. */ } @@ -329,7 +320,8 @@ public class WebOfTrustUpdater extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class SetTrustJob extends WebOfTrustUpdateJob { + @VisibleForTesting + class SetTrustJob extends WebOfTrustUpdateJob { /** The identity giving the trust. */ private final OwnIdentity truster; @@ -357,8 +349,8 @@ public class WebOfTrustUpdater extends AbstractService { * The comment of the trust relation */ public SetTrustJob(OwnIdentity truster, Identity trustee, Integer score, String comment) { - this.truster = truster; - this.trustee = trustee; + this.truster = checkNotNull(truster, "truster must not be null"); + this.trustee = checkNotNull(trustee, "trustee must not be null"); this.score = score; this.comment = comment; } @@ -369,15 +361,11 @@ public class WebOfTrustUpdater extends AbstractService { public void run() { try { if (score != null) { - if (trustee instanceof DefaultIdentity) { - ((DefaultIdentity) trustee).setTrust(truster, new Trust(score, null, 0)); - } webOfTrustConnector.setTrust(truster, trustee, score, comment); + trustee.setTrust(truster, new Trust(score, null, 0)); } else { - if (trustee instanceof DefaultIdentity) { - ((DefaultIdentity) trustee).setTrust(truster, null); - } webOfTrustConnector.removeTrust(truster, trustee); + trustee.removeTrust(truster); } finish(true); } catch (WebOfTrustException wote1) { @@ -397,19 +385,19 @@ public class WebOfTrustUpdater extends AbstractService { 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)); + return updateJob.truster.equals(truster) && updateJob.trustee.equals(trustee); } /** {@inheritDoc} */ @Override public int hashCode() { - return getClass().hashCode() ^ ((truster == null) ? 0 : truster.hashCode()) ^ ((trustee == null) ? 0 : trustee.hashCode()); + return getClass().hashCode() ^ truster.hashCode() ^ 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()); + return String.format("%s[truster=%s,trustee=%s]", getClass().getSimpleName(), truster.getId(), trustee.getId()); } } @@ -419,7 +407,8 @@ public class WebOfTrustUpdater extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class WebOfTrustContextUpdateJob extends WebOfTrustUpdateJob { + @VisibleForTesting + class WebOfTrustContextUpdateJob extends WebOfTrustUpdateJob { /** The own identity whose contexts to manage. */ protected final OwnIdentity ownIdentity; @@ -474,7 +463,8 @@ public class WebOfTrustUpdater extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class AddContextJob extends WebOfTrustContextUpdateJob { + @VisibleForTesting + class AddContextJob extends WebOfTrustContextUpdateJob { /** * Creates a new add-context job. @@ -509,7 +499,8 @@ public class WebOfTrustUpdater extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class RemoveContextJob extends WebOfTrustContextUpdateJob { + @VisibleForTesting + class RemoveContextJob extends WebOfTrustContextUpdateJob { /** * Creates a new remove-context job. @@ -544,7 +535,8 @@ public class WebOfTrustUpdater extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class SetPropertyJob extends WebOfTrustUpdateJob { + @VisibleForTesting + class SetPropertyJob extends WebOfTrustUpdateJob { /** The own identity to update properties on. */ private final OwnIdentity ownIdentity;