Remove unnecessary class.
[Sone.git] / src / main / java / net / pterodactylus / sone / core / WebOfTrustUpdater.java
index ded6da9..b8060d4 100644 (file)
@@ -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.
@@ -203,6 +185,41 @@ public class WebOfTrustUpdater extends AbstractService {
                }
        }
 
+       /**
+        * Sets a property on the given own identity.
+        *
+        * @param ownIdentity
+        *            The own identity to set the property on
+        * @param propertyName
+        *            The name of the property to set
+        * @param propertyValue
+        *            The value of the property to set
+        */
+       public void setProperty(OwnIdentity ownIdentity, String propertyName, String propertyValue) {
+               SetPropertyJob setPropertyJob = new SetPropertyJob(ownIdentity, propertyName, propertyValue);
+               if (updateJobs.contains(setPropertyJob)) {
+                       updateJobs.remove(setPropertyJob);
+               }
+               logger.log(Level.FINER, "Adding Property Job: " + setPropertyJob);
+               try {
+                       updateJobs.put(setPropertyJob);
+               } catch (InterruptedException e) {
+                       /* the queue is unbounded so it should never block. */
+               }
+       }
+
+       /**
+        * Removes a property from the given own identity.
+        *
+        * @param ownIdentity
+        *            The own identity to remove the property from
+        * @param propertyName
+        *            The name of the property to remove
+        */
+       public void removeProperty(OwnIdentity ownIdentity, String propertyName) {
+               setProperty(ownIdentity, propertyName, null);
+       }
+
        //
        // SERVICE METHODS
        //
@@ -277,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")
@@ -316,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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
         */
-       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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-        */
-       private class SetTrustJob extends WebOfTrustTrustUpdateJob {
+               private final Identity trustee;
 
                /** The score of the relation. */
                private final Integer score;
@@ -403,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;
                }
@@ -433,43 +395,30 @@ public class WebOfTrustUpdater extends AbstractService {
                        }
                }
 
-       }
+               //
+               // OBJECT METHODS
+               //
 
-       /**
-        * 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 {
+               /** {@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());
                }
 
        }
@@ -497,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");
                }
 
                //
@@ -610,4 +558,113 @@ public class WebOfTrustUpdater extends AbstractService {
 
        }
 
+       /**
+        * Base class for update jobs that deal with properties.
+        *
+        * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+        */
+       private class WebOfTrustPropertyUpdateJob extends WebOfTrustUpdateJob {
+
+               /** The own identity to update properties on. */
+               protected final OwnIdentity ownIdentity;
+
+               /** The name of the property to update. */
+               protected final String propertyName;
+
+               /**
+                * Creates a new property update job.
+                *
+                * @param ownIdentity
+                *            The own identity to update the property on
+                * @param propertyName
+                *            The name of the property to update
+                */
+               @SuppressWarnings("synthetic-access")
+               public WebOfTrustPropertyUpdateJob(OwnIdentity ownIdentity, String propertyName) {
+                       this.ownIdentity = ownIdentity;
+                       this.propertyName = propertyName;
+               }
+
+               //
+               // OBJECT METHODS
+               //
+
+               /**
+                * {@inheritDoc}
+                */
+               @Override
+               public boolean equals(Object object) {
+                       if ((object == null) || !object.getClass().equals(getClass())) {
+                               return false;
+                       }
+                       WebOfTrustPropertyUpdateJob updateJob = (WebOfTrustPropertyUpdateJob) object;
+                       return updateJob.ownIdentity.equals(ownIdentity) && updateJob.propertyName.equals(propertyName);
+               }
+
+               /**
+                * {@inheritDoc}
+                */
+               @Override
+               public int hashCode() {
+                       return getClass().hashCode() ^ ownIdentity.hashCode() ^ propertyName.hashCode();
+               }
+
+               /**
+                * {@inheritDoc}
+                */
+               @Override
+               public String toString() {
+                       return String.format("%s[ownIdentity=%s,propertyName=%s]", getClass().getSimpleName(), ownIdentity, propertyName);
+               }
+
+       }
+
+       /**
+        * WebOfTrust update job that sets a property on an {@link OwnIdentity}.
+        *
+        * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+        */
+       private class SetPropertyJob extends WebOfTrustPropertyUpdateJob {
+
+               /** The value of the property to set. */
+               private final String propertyValue;
+
+               /**
+                * Creates a new set-property job.
+                *
+                * @param ownIdentity
+                *            The own identity to set the property on
+                * @param propertyName
+                *            The name of the property to set
+                * @param propertyValue
+                *            The value of the property to set
+                */
+               public SetPropertyJob(OwnIdentity ownIdentity, String propertyName, String propertyValue) {
+                       super(ownIdentity, propertyName);
+                       this.propertyValue = propertyValue;
+               }
+
+               /**
+                * {@inheritDoc}
+                */
+               @Override
+               @SuppressWarnings("synthetic-access")
+               public void run() {
+                       try {
+                               if (propertyValue == null) {
+                                       webOfTrustConnector.removeProperty(ownIdentity, propertyName);
+                                       ownIdentity.removeProperty(propertyName);
+                               } else {
+                                       webOfTrustConnector.setProperty(ownIdentity, propertyName, propertyValue);
+                                       ownIdentity.setProperty(propertyName, propertyValue);
+                               }
+                               finish(true);
+                       } catch (PluginException pe1) {
+                               logger.log(Level.WARNING, String.format("Could not set Property “%2$s” to “%3$s” on Own Identity %1$s!", ownIdentity, propertyName, propertyValue), pe1);
+                               finish(false);
+                       }
+               }
+
+       }
+
 }