X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Ffcp%2FCommand.java;h=63fc8ebd669f68270ee1c73f63d4648575bbc51f;hb=refs%2Ftags%2Fv79;hp=2a083eefc6f05afcbab2e6ea5fc2fd533900c11c;hpb=2ed3a952a6756c0cc50dbe157b5454ec2ae8385a;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/freenet/fcp/Command.java b/src/main/java/net/pterodactylus/sone/freenet/fcp/Command.java
index 2a083ee..63fc8eb 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/fcp/Command.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/fcp/Command.java
@@ -1,5 +1,5 @@
/*
- * Sone - Command.java - Copyright © 2011 David Roden
+ * Sone - Command.java - Copyright © 2011â2019 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
@@ -19,13 +19,10 @@ package net.pterodactylus.sone.freenet.fcp;
import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
import freenet.support.SimpleFieldSet;
-import freenet.support.api.Bucket;
/**
* Implementation of an FCP interface for other clients or plugins to
* communicate with Sone.
- *
- * @author David âBombeâ Roden
*/
public interface Command {
@@ -35,20 +32,14 @@ public interface Command {
*
* @param parameters
* The parameters of the comand
- * @param data
- * The data of the command (may be {@code null})
- * @param accessType
- * The access type
* @return A reply to send back to the plugin
* @throws FcpException
* if an error processing the parameters occurs
*/
- public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException;
+ public Response execute(SimpleFieldSet parameters) throws FcpException;
/**
* The access type of the request.
- *
- * @author David âBombeâ Roden
*/
public static enum AccessType {
@@ -65,68 +56,26 @@ public interface Command {
/**
* Interface for command replies.
- *
- * @author David âBombeâ Roden
*/
public static class Response {
+ /** The message name of the reponse. */
+ private final String messageName;
+
/** The reply parameters. */
private final SimpleFieldSet replyParameters;
- /** The reply data, may be {@code null}. */
- private final byte[] data;
-
- /** The data bucket, may be {@code null}. */
- private final Bucket bucket;
-
- /**
- * Creates a new reply with the given parameters.
- *
- * @param replyParameters
- * The reply parameters
- */
- public Response(SimpleFieldSet replyParameters) {
- this(replyParameters, null, null);
- }
-
/**
* Creates a new reply with the given parameters.
*
+ * @param messageName
+ * The message name
* @param replyParameters
* The reply parameters
- * @param data
- * The data of the reply (may be {@code null})
*/
- public Response(SimpleFieldSet replyParameters, byte[] data) {
- this(replyParameters, data, null);
- }
-
- /**
- * Creates a new reply with the given parameters.
- *
- * @param replyParameters
- * The reply parameters
- * @param bucket
- * The bucket of the reply (may be {@code null})
- */
- public Response(SimpleFieldSet replyParameters, Bucket bucket) {
- this(replyParameters, null, bucket);
- }
-
- /**
- * Creates a new reply with the given parameters.
- *
- * @param replyParameters
- * The reply parameters
- * @param data
- * The data of the reply (may be {@code null})
- * @param bucket
- * The bucket of the reply (may be {@code null})
- */
- private Response(SimpleFieldSet replyParameters, byte[] data, Bucket bucket) {
+ public Response(String messageName, SimpleFieldSet replyParameters) {
+ this.messageName = messageName;
this.replyParameters = replyParameters;
- this.data = data;
- this.bucket = bucket;
}
/**
@@ -135,46 +84,7 @@ public interface Command {
* @return The reply parameters
*/
public SimpleFieldSet getReplyParameters() {
- return replyParameters;
- }
-
- /**
- * Returns whether the reply has reply data.
- *
- * @see #getData()
- * @return {@code true} if this reply has data, {@code false} otherwise
- */
- public boolean hasData() {
- return data != null;
- }
-
- /**
- * Returns the data of the reply.
- *
- * @return The data of the reply
- */
- public byte[] getData() {
- return data;
- }
-
- /**
- * Returns whether the reply has a data bucket.
- *
- * @see #getBucket()
- * @return {@code true} if the reply has a data bucket, {@code false}
- * otherwise
- */
- public boolean hasBucket() {
- return bucket != null;
- }
-
- /**
- * Returns the data bucket of the reply.
- *
- * @return The data bucket of the reply
- */
- public Bucket getBucket() {
- return bucket;
+ return new SimpleFieldSetBuilder(replyParameters).put("Message", messageName).get();
}
}
@@ -182,8 +92,6 @@ public interface Command {
/**
* Response implementation that can return an error message and an optional
* error code.
- *
- * @author David âBombeâ Roden
*/
public class ErrorResponse extends Response {
@@ -194,7 +102,7 @@ public interface Command {
* The error message
*/
public ErrorResponse(String message) {
- super(new SimpleFieldSetBuilder().put("ErrorMessage", message).get());
+ super("Error", new SimpleFieldSetBuilder().put("ErrorMessage", message).get());
}
/**
@@ -206,7 +114,7 @@ public interface Command {
* The error message
*/
public ErrorResponse(int code, String message) {
- super(new SimpleFieldSetBuilder().put("ErrorMessage", message).put("ErrorCode", code).get());
+ super("Error", new SimpleFieldSetBuilder().put("ErrorMessage", message).put("ErrorCode", code).get());
}
}