X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FWebOfTrustUpdater.java;h=2ed3487ede4a988c79b4fadfa69154987a678ce3;hb=9a5a165a45db872e9e3a9292387cb3a6aa960992;hp=237c8c40e52a132319cd71920834b958e621f286;hpb=da0926405f52158c071e3b6b93aea5f97efdec15;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 237c8c4..2ed3487 100644
--- a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java
+++ b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java
@@ -360,8 +360,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;
}
@@ -372,14 +372,10 @@ 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));
- }
+ trustee.setTrust(truster, new Trust(score, null, 0));
webOfTrustConnector.setTrust(truster, trustee, score, comment);
} else {
- if (trustee instanceof DefaultIdentity) {
- ((DefaultIdentity) trustee).setTrust(truster, null);
- }
+ trustee.removeTrust(truster);
webOfTrustConnector.removeTrust(truster, trustee);
}
finish(true);
@@ -400,19 +396,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());
}
}
@@ -422,7 +418,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;
@@ -549,7 +546,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;