projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicate-field detection.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
fcp
/
AbstractSoneCommand.java
diff --git
a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index
108a80f
..
58be3da
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/
src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@
-17,6
+17,8
@@
package net.pterodactylus.sone.fcp;
package net.pterodactylus.sone.fcp;
+import static com.google.common.collect.FluentIterable.from;
+
import java.util.Collection;
import java.util.List;
import java.util.Collection;
import java.util.List;
@@
-33,12
+35,11
@@
import net.pterodactylus.sone.freenet.fcp.Command;
import net.pterodactylus.sone.freenet.fcp.FcpException;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.freenet.fcp.FcpException;
import net.pterodactylus.sone.template.SoneAccessor;
-import com.google.common.base.Optional;
-import com.google.common.collect.Collections2;
-
import freenet.node.FSParseException;
import freenet.support.SimpleFieldSet;
import freenet.node.FSParseException;
import freenet.support.SimpleFieldSet;
+import com.google.common.base.Optional;
+
/**
* Abstract base implementation of a {@link Command} with Sone-related helper
* methods.
/**
* Abstract base implementation of a {@link Command} with Sone-related helper
* methods.
@@
-186,7
+187,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
protected Post getPost(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
try {
String postId = simpleFieldSet.getString(parameterName);
protected Post getPost(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
try {
String postId = simpleFieldSet.getString(parameterName);
- Optional<Post> post = core.getPost(postId);
+ Optional<Post> post = core.get
Database().get
Post(postId);
if (!post.isPresent()) {
throw new FcpException("Could not load post from “" + postId + "”.");
}
if (!post.isPresent()) {
throw new FcpException("Could not load post from “" + postId + "”.");
}
@@
-212,7
+213,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
protected PostReply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
try {
String replyId = simpleFieldSet.getString(parameterName);
protected PostReply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
try {
String replyId = simpleFieldSet.getString(parameterName);
- Optional<PostReply> reply = core.getPostReply(replyId);
+ Optional<PostReply> reply = core.get
Database().get
PostReply(replyId);
if (!reply.isPresent()) {
throw new FcpException("Could not load reply from “" + replyId + "”.");
}
if (!reply.isPresent()) {
throw new FcpException("Could not load reply from “" + replyId + "”.");
}
@@
-301,7
+302,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
postBuilder.put(prefix + "ID", post.getId());
postBuilder.put(prefix + "Sone", post.getSone().getId());
postBuilder.put(prefix + "ID", post.getId());
postBuilder.put(prefix + "Sone", post.getSone().getId());
- if (post.
hasRecipi
ent()) {
+ if (post.
getRecipientId().isPres
ent()) {
postBuilder.put(prefix + "Recipient", post.getRecipientId().get());
}
postBuilder.put(prefix + "Time", post.getTime());
postBuilder.put(prefix + "Recipient", post.getRecipientId().get());
}
postBuilder.put(prefix + "Time", post.getTime());
@@
-309,7
+310,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
if (includeReplies) {
postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
if (includeReplies) {
- List<PostReply> replies =
core.getReplies(post
);
+ List<PostReply> replies =
post.getReplies(
);
postBuilder.put(encodeReplies(replies, prefix));
}
postBuilder.put(encodeReplies(replies, prefix));
}
@@
-338,7
+339,7
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
String postPrefix = prefix + postIndex++;
postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
if (includeReplies) {
String postPrefix = prefix + postIndex++;
postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
if (includeReplies) {
- postBuilder.put(encodeReplies(
Collections2.filter(core.getReplies(post), Reply.FUTURE_REPLY_FILTER
), postPrefix + "."));
+ postBuilder.put(encodeReplies(
from(post.getReplies()).filter(Reply.FUTURE_REPLY_FILTER).toList(
), postPrefix + "."));
}
}
}
}
@@
-399,9
+400,6
@@
public abstract class AbstractSoneCommand extends AbstractCommand {
// OBJECT METHODS
//
// OBJECT METHODS
//
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getClass().getName() + "[writeAccess=" + writeAccess + "]";
@Override
public String toString() {
return getClass().getName() + "[writeAccess=" + writeAccess + "]";