Make post reply returned by provider optional.
[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / AbstractSoneCommand.java
index 8714417..1617523 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Sone - FcpInterface.java - Copyright © 2011 David Roden
+ * Sone - AbstractSoneCommand.java - Copyright © 2011–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
@@ -22,6 +22,9 @@ import java.util.List;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
+import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
@@ -29,7 +32,10 @@ import net.pterodactylus.sone.freenet.fcp.AbstractCommand;
 import net.pterodactylus.sone.freenet.fcp.Command;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.sone.template.SoneAccessor;
-import net.pterodactylus.util.filter.Filters;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Collections2;
+
 import freenet.node.FSParseException;
 import freenet.support.SimpleFieldSet;
 
@@ -107,7 +113,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            The text to encode
         * @return The encoded text
         */
-       protected String encodeString(String text) {
+       protected static String encodeString(String text) {
                return text.replaceAll("\\\\", "\\\\").replaceAll("\n", "\\\\n").replaceAll("\r", "\\\\r");
        }
 
@@ -128,16 +134,40 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *             or if the Sone ID is invalid
         */
        protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly) throws FcpException {
-               try {
-                       String soneId = simpleFieldSet.getString(parameterName);
-                       Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false);
-                       if (sone == null) {
-                               throw new FcpException("Could not load Sone from “" + soneId + "”.");
-                       }
-                       return sone;
-               } catch (FSParseException fspe1) {
-                       throw new FcpException("Could not load Sone ID from “" + parameterName + "”.", fspe1);
+               return getSone(simpleFieldSet, parameterName, localOnly, true);
+       }
+
+       /**
+        * Returns a Sone whose ID is a parameter in the given simple field set.
+        *
+        * @param simpleFieldSet
+        *            The simple field set containing the ID of the Sone
+        * @param parameterName
+        *            The name under which the Sone ID is stored in the simple field
+        *            set
+        * @param localOnly
+        *            {@code true} to only return local Sones, {@code false} to
+        *            return any Sones
+        * @param mandatory
+        *            {@code true} if a valid Sone ID is required, {@code false}
+        *            otherwise
+        * @return The Sone, or {@code null} if {@code mandatory} is {@code false}
+        *         and the Sone ID is invalid
+        * @throws FcpException
+        *             if there is no Sone ID stored under the given parameter name,
+        *             or if {@code mandatory} is {@code true} and the Sone ID is
+        *             invalid
+        */
+       protected Sone getSone(SimpleFieldSet simpleFieldSet, String parameterName, boolean localOnly, boolean mandatory) throws FcpException {
+               String soneId = simpleFieldSet.get(parameterName);
+               if (mandatory && (soneId == null)) {
+                       throw new FcpException("Could not load Sone ID from “" + parameterName + "”.");
                }
+               Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false);
+               if (mandatory && (sone == null)) {
+                       throw new FcpException("Could not load Sone from “" + soneId + "”.");
+               }
+               return sone;
        }
 
        /**
@@ -156,7 +186,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
        protected Post getPost(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
                try {
                        String postId = simpleFieldSet.getString(parameterName);
-                       Post post = core.getPost(postId, false);
+                       Post post = core.getPost(postId);
                        if (post == null) {
                                throw new FcpException("Could not load post from “" + postId + "”.");
                        }
@@ -179,20 +209,55 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *             if there is no reply ID stored under the given parameter
         *             name, or if the reply ID is invalid
         */
-       protected Reply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
+       protected PostReply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
                try {
                        String replyId = simpleFieldSet.getString(parameterName);
-                       Reply reply = core.getReply(replyId, false);
-                       if (reply == null) {
+                       Optional<PostReply> reply = core.getPostReply(replyId);
+                       if (!reply.isPresent()) {
                                throw new FcpException("Could not load reply from “" + replyId + "”.");
                        }
-                       return reply;
+                       return reply.get();
                } catch (FSParseException fspe1) {
                        throw new FcpException("Could not reply ID from “" + parameterName + "”.", fspe1);
                }
        }
 
        /**
+        * Creates a simple field set from the given Sone, including {@link Profile}
+        * information.
+        *
+        * @param sone
+        *            The Sone to encode
+        * @param prefix
+        *            The prefix for the field names (may be empty but not {@code
+        *            null})
+        * @param localSone
+        *            An optional local Sone that is used for Sone-specific data,
+        *            such as if the Sone is followed by the local Sone
+        * @return The simple field set containing the given Sone
+        */
+       protected static SimpleFieldSet encodeSone(Sone sone, String prefix, Sone localSone) {
+               SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
+
+               soneBuilder.put(prefix + "Name", sone.getName());
+               soneBuilder.put(prefix + "NiceName", SoneAccessor.getNiceName(sone));
+               soneBuilder.put(prefix + "LastUpdated", sone.getTime());
+               if (localSone != null) {
+                       soneBuilder.put(prefix + "Followed", String.valueOf(localSone.hasFriend(sone.getId())));
+               }
+               Profile profile = sone.getProfile();
+               soneBuilder.put(prefix + "Field.Count", profile.getFields().size());
+               int fieldIndex = 0;
+               for (Field field : profile.getFields()) {
+                       soneBuilder.put(prefix + "Field." + fieldIndex + ".Name", field.getName());
+                       soneBuilder.put(prefix + "Field." + fieldIndex + ".Value", field.getValue());
+                       ++fieldIndex;
+               }
+
+               return soneBuilder.get();
+       }
+
+       /**
         * Creates a simple field set from the given collection of Sones.
         *
         * @param sones
@@ -202,7 +267,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            {@code null})
         * @return The simple field set containing the given Sones
         */
-       protected SimpleFieldSet encodeSones(Collection<? extends Sone> sones, String prefix) {
+       protected static SimpleFieldSet encodeSones(Collection<? extends Sone> sones, String prefix) {
                SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
 
                int soneIndex = 0;
@@ -244,7 +309,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                postBuilder.put(encodeLikes(core.getLikes(post), prefix + "Likes."));
 
                if (includeReplies) {
-                       List<Reply> replies = core.getReplies(post);
+                       List<PostReply> replies = core.getReplies(post);
                        postBuilder.put(encodeReplies(replies, prefix));
                }
 
@@ -273,7 +338,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                        String postPrefix = prefix + postIndex++;
                        postBuilder.put(encodePost(post, postPrefix + ".", includeReplies));
                        if (includeReplies) {
-                               postBuilder.put(encodeReplies(Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLIES_FILTER), postPrefix + "."));
+                               postBuilder.put(encodeReplies(Collections2.filter(core.getReplies(post), Reply.FUTURE_REPLY_FILTER), postPrefix + "."));
                        }
                }
 
@@ -290,12 +355,12 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            {@code null})
         * @return The simple field set containing the replies
         */
-       protected SimpleFieldSet encodeReplies(Collection<? extends Reply> replies, String prefix) {
+       protected static SimpleFieldSet encodeReplies(Collection<? extends PostReply> replies, String prefix) {
                SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
 
                int replyIndex = 0;
                replyBuilder.put(prefix + "Replies.Count", replies.size());
-               for (Reply reply : replies) {
+               for (PostReply reply : replies) {
                        String replyPrefix = prefix + "Replies." + replyIndex++ + ".";
                        replyBuilder.put(replyPrefix + "ID", reply.getId());
                        replyBuilder.put(replyPrefix + "Sone", reply.getSone().getId());
@@ -317,7 +382,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            {@code null})
         * @return The simple field set containing the likes
         */
-       protected SimpleFieldSet encodeLikes(Collection<? extends Sone> likes, String prefix) {
+       protected static SimpleFieldSet encodeLikes(Collection<? extends Sone> likes, String prefix) {
                SimpleFieldSetBuilder likesBuilder = new SimpleFieldSetBuilder();
 
                int likeIndex = 0;
@@ -330,4 +395,16 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                return likesBuilder.get();
        }
 
+       //
+       // OBJECT METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public String toString() {
+               return getClass().getName() + "[writeAccess=" + writeAccess + "]";
+       }
+
 }