Merge branch 'partial-rewrite' into less-critical

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / FcpInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 8959b6a..f420c67 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FcpInterface.java - Copyright © 2011 David Roden
+ * Sone - FcpInterface.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
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.fcp;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,9 +29,10 @@ import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
-import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.validation.Validation;
+
+import com.google.inject.Inject;
+
 import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.PluginNotFoundException;
 import freenet.pluginmanager.PluginReplySender;
@@ -80,10 +83,12 @@ public class FcpInterface {
         * @param core
         *            The core
         */
+       @Inject
        public FcpInterface(Core core) {
                commands.put("Version", new VersionCommand(core));
                commands.put("GetLocalSones", new GetLocalSonesCommand(core));
                commands.put("GetSones", new GetSonesCommand(core));
+               commands.put("GetSone", new GetSoneCommand(core));
                commands.put("GetPost", new GetPostCommand(core));
                commands.put("GetPosts", new GetPostsCommand(core));
                commands.put("GetPostFeed", new GetPostFeedCommand(core));
@@ -118,8 +123,7 @@ public class FcpInterface {
         *            The action level for which full FCP access is required
         */
        public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
-               Validation.begin().isNotNull("FullAccessRequired", fullAccessRequired).check();
-               this.fullAccessRequired = fullAccessRequired;
+               this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
        }
 
        //
@@ -171,8 +175,9 @@ public class FcpInterface {
                        try {
                                Response response = command.execute(parameters, data, AccessType.values()[accessType]);
                                sendReply(pluginReplySender, identifier, response);
-                       } catch (FcpException fe1) {
-                               sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
+                       } catch (Exception e1) {
+                               logger.log(Level.WARNING, "Could not process FCP command “%s”.", command);
+                               sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + e1.getMessage()));
                        }
                } catch (PluginNotFoundException pnfe1) {
                        logger.log(Level.WARNING, "Could not find destination plugin: " + pluginReplySender);
@@ -195,7 +200,7 @@ public class FcpInterface {
         * @throws PluginNotFoundException
         *             if the plugin can not be found
         */
-       private void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
+       private static void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
                SimpleFieldSet replyParameters = response.getReplyParameters();
                if (identifier != null) {
                        replyParameters.putOverwrite("Identifier", identifier);