projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract a local variable and use TimeUnit to increase readability.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
Sone.java
diff --git
a/src/main/java/net/pterodactylus/sone/data/Sone.java
b/src/main/java/net/pterodactylus/sone/data/Sone.java
index
9d9d2d7
..
a3e872b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Sone.java
@@
-38,6
+38,8
@@
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.util.logging.Logging;
import com.google.common.base.Predicate;
import net.pterodactylus.util.logging.Logging;
import com.google.common.base.Predicate;
+import com.google.common.hash.Hasher;
+import com.google.common.hash.Hashing;
import freenet.keys.FreenetURI;
import freenet.keys.FreenetURI;
@@
-228,7
+230,7
@@
public class Sone implements Fingerprintable, Comparable<Sone> {
private final List<Album> albums = new CopyOnWriteArrayList<Album>();
/** Sone-specific options. */
private final List<Album> albums = new CopyOnWriteArrayList<Album>();
/** Sone-specific options. */
- private
final
Options options = new Options();
+ private Options options = new Options();
/**
* Creates a new Sone.
/**
* Creates a new Sone.
@@
-895,6
+897,17
@@
public class Sone implements Fingerprintable, Comparable<Sone> {
return options;
}
return options;
}
+ /**
+ * Sets the options of this Sone.
+ *
+ * @param options
+ * The options of this Sone
+ */
+ /* TODO - remove this method again, maybe add an option provider */
+ public void setOptions(Options options) {
+ this.options = options;
+ }
+
//
// FINGERPRINTABLE METHODS
//
//
// FINGERPRINTABLE METHODS
//
@@
-904,46
+917,46
@@
public class Sone implements Fingerprintable, Comparable<Sone> {
*/
@Override
public synchronized String getFingerprint() {
*/
@Override
public synchronized String getFingerprint() {
-
StringBuilder fingerprint = new StringBuild
er();
-
fingerprint.append
(profile.getFingerprint());
+
Hasher hash = Hashing.sha256().newHash
er();
+
hash.putString
(profile.getFingerprint());
-
fingerprint.append
("Posts(");
+
hash.putString
("Posts(");
for (Post post : getPosts()) {
for (Post post : getPosts()) {
-
fingerprint.append("Post(").append(post.getId()).append(')'
);
+
hash.putString("Post(").putString(post.getId()).putString(")"
);
}
}
-
fingerprint.append
(")");
+
hash.putString
(")");
List<PostReply> replies = new ArrayList<PostReply>(getReplies());
Collections.sort(replies, Reply.TIME_COMPARATOR);
List<PostReply> replies = new ArrayList<PostReply>(getReplies());
Collections.sort(replies, Reply.TIME_COMPARATOR);
-
fingerprint.append
("Replies(");
+
hash.putString
("Replies(");
for (PostReply reply : replies) {
for (PostReply reply : replies) {
-
fingerprint.append("Reply(").append(reply.getId()).append(')'
);
+
hash.putString("Reply(").putString(reply.getId()).putString(")"
);
}
}
-
fingerprint.append(')'
);
+
hash.putString(")"
);
List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
Collections.sort(likedPostIds);
List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
Collections.sort(likedPostIds);
-
fingerprint.append
("LikedPosts(");
+
hash.putString
("LikedPosts(");
for (String likedPostId : likedPostIds) {
for (String likedPostId : likedPostIds) {
-
fingerprint.append("Post(").append(likedPostId).append(')'
);
+
hash.putString("Post(").putString(likedPostId).putString(")"
);
}
}
-
fingerprint.append(')'
);
+
hash.putString(")"
);
List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
Collections.sort(likedReplyIds);
List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
Collections.sort(likedReplyIds);
-
fingerprint.append
("LikedReplies(");
+
hash.putString
("LikedReplies(");
for (String likedReplyId : likedReplyIds) {
for (String likedReplyId : likedReplyIds) {
-
fingerprint.append("Reply(").append(likedReplyId).append(')'
);
+
hash.putString("Reply(").putString(likedReplyId).putString(")"
);
}
}
-
fingerprint.append(')'
);
+
hash.putString(")"
);
-
fingerprint.append
("Albums(");
+
hash.putString
("Albums(");
for (Album album : albums) {
for (Album album : albums) {
-
fingerprint.append
(album.getFingerprint());
+
hash.putString
(album.getFingerprint());
}
}
-
fingerprint.append(')'
);
+
hash.putString(")"
);
- return
fingerprint
.toString();
+ return
hash.hash()
.toString();
}
//
}
//