From 05e52ccf3f6e8f2645031cfd3b35f3f71d3a2b82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 24 Nov 2015 21:29:37 +0100 Subject: [PATCH] Expose lots of constructors and accessors --- src/main/java/net/pterodactylus/fcp/AddPeer.java | 15 ++++ src/main/java/net/pterodactylus/fcp/AllData.java | 2 +- .../fcp/CloseConnectionDuplicateClientName.java | 2 +- .../java/net/pterodactylus/fcp/ConfigData.java | 2 +- src/main/java/net/pterodactylus/fcp/DataFound.java | 2 +- .../net/pterodactylus/fcp/EndListPeerNotes.java | 2 +- .../java/net/pterodactylus/fcp/EndListPeers.java | 2 +- .../fcp/EndListPersistentRequests.java | 2 +- .../java/net/pterodactylus/fcp/FCPPluginReply.java | 2 +- .../net/pterodactylus/fcp/FinishedCompression.java | 2 +- src/main/java/net/pterodactylus/fcp/GetConfig.java | 5 ++ src/main/java/net/pterodactylus/fcp/GetFailed.java | 2 +- src/main/java/net/pterodactylus/fcp/GetNode.java | 7 ++ .../java/net/pterodactylus/fcp/GetPluginInfo.java | 20 +++--- .../net/pterodactylus/fcp/IdentifierCollision.java | 2 +- src/main/java/net/pterodactylus/fcp/ListPeer.java | 7 ++ .../java/net/pterodactylus/fcp/ListPeerNotes.java | 5 ++ .../java/net/pterodactylus/fcp/ModifyConfig.java | 5 ++ .../java/net/pterodactylus/fcp/ModifyPeer.java | 47 +++++++----- .../java/net/pterodactylus/fcp/ModifyPeerNote.java | 29 ++++---- src/main/java/net/pterodactylus/fcp/NodeData.java | 2 +- src/main/java/net/pterodactylus/fcp/NodeHello.java | 2 +- src/main/java/net/pterodactylus/fcp/Peer.java | 2 +- src/main/java/net/pterodactylus/fcp/PeerNote.java | 2 +- .../java/net/pterodactylus/fcp/PeerRemoved.java | 2 +- .../java/net/pterodactylus/fcp/PersistentGet.java | 2 +- .../java/net/pterodactylus/fcp/PersistentPut.java | 2 +- .../net/pterodactylus/fcp/PersistentPutDir.java | 2 +- .../fcp/PersistentRequestModified.java | 2 +- .../fcp/PersistentRequestRemoved.java | 2 +- .../java/net/pterodactylus/fcp/PluginInfo.java | 13 +++- .../java/net/pterodactylus/fcp/ProtocolError.java | 2 +- src/main/java/net/pterodactylus/fcp/PutFailed.java | 2 +- .../java/net/pterodactylus/fcp/PutFetchable.java | 2 +- .../java/net/pterodactylus/fcp/PutSuccessful.java | 2 +- .../java/net/pterodactylus/fcp/RemovePeer.java | 13 ++-- .../java/net/pterodactylus/fcp/SSKKeypair.java | 2 +- .../java/net/pterodactylus/fcp/SimpleProgress.java | 10 ++- .../net/pterodactylus/fcp/StartedCompression.java | 2 +- .../java/net/pterodactylus/fcp/SubscribeUSK.java | 83 +++++++++++++++++++--- .../net/pterodactylus/fcp/SubscribedUSKUpdate.java | 2 +- .../net/pterodactylus/fcp/TestDDAComplete.java | 2 +- .../java/net/pterodactylus/fcp/TestDDAReply.java | 2 +- .../java/net/pterodactylus/fcp/URIGenerated.java | 2 +- .../pterodactylus/fcp/UnknownNodeIdentifier.java | 2 +- 45 files changed, 230 insertions(+), 93 deletions(-) diff --git a/src/main/java/net/pterodactylus/fcp/AddPeer.java b/src/main/java/net/pterodactylus/fcp/AddPeer.java index f098106..696a017 100644 --- a/src/main/java/net/pterodactylus/fcp/AddPeer.java +++ b/src/main/java/net/pterodactylus/fcp/AddPeer.java @@ -46,6 +46,11 @@ public class AddPeer extends FcpMessage { setField("File", file); } + public AddPeer(String identifier, String file) { + this(file); + setField("Identifier", identifier); + } + /** * Creates a new “AddPeer” request that reads the noderef of the peer from * the given URL. @@ -58,6 +63,11 @@ public class AddPeer extends FcpMessage { setField("URL", String.valueOf(url)); } + public AddPeer(String identifier, URL url) { + this(url); + setField("Identifier", identifier); + } + /** * Creates a new “AddPeer” request that adds the peer given by the noderef. * @@ -69,6 +79,11 @@ public class AddPeer extends FcpMessage { setNodeRef(nodeRef); } + public AddPeer(String identifier, NodeRef nodeRef) { + this(nodeRef); + setField("Identifier", identifier); + } + // // PRIVATE METHODS // diff --git a/src/main/java/net/pterodactylus/fcp/AllData.java b/src/main/java/net/pterodactylus/fcp/AllData.java index b4daa27..621e993 100644 --- a/src/main/java/net/pterodactylus/fcp/AllData.java +++ b/src/main/java/net/pterodactylus/fcp/AllData.java @@ -44,7 +44,7 @@ public class AllData extends BaseMessage implements Identifiable { * @param payloadInputStream * The payload */ - AllData(FcpMessage receivedMessage, InputStream payloadInputStream) { + public AllData(FcpMessage receivedMessage, InputStream payloadInputStream) { super(receivedMessage); this.payloadInputStream = payloadInputStream; } diff --git a/src/main/java/net/pterodactylus/fcp/CloseConnectionDuplicateClientName.java b/src/main/java/net/pterodactylus/fcp/CloseConnectionDuplicateClientName.java index db0ff0d..14775ae 100644 --- a/src/main/java/net/pterodactylus/fcp/CloseConnectionDuplicateClientName.java +++ b/src/main/java/net/pterodactylus/fcp/CloseConnectionDuplicateClientName.java @@ -32,7 +32,7 @@ public class CloseConnectionDuplicateClientName extends BaseMessage { * @param receivedMessage * The received message */ - CloseConnectionDuplicateClientName(FcpMessage receivedMessage) { + public CloseConnectionDuplicateClientName(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/ConfigData.java b/src/main/java/net/pterodactylus/fcp/ConfigData.java index 4eb7954..c05eb9f 100644 --- a/src/main/java/net/pterodactylus/fcp/ConfigData.java +++ b/src/main/java/net/pterodactylus/fcp/ConfigData.java @@ -32,7 +32,7 @@ public class ConfigData extends BaseMessage { * @param receivedMessage * The received message */ - ConfigData(FcpMessage receivedMessage) { + public ConfigData(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/DataFound.java b/src/main/java/net/pterodactylus/fcp/DataFound.java index 742f6ac..c00709a 100644 --- a/src/main/java/net/pterodactylus/fcp/DataFound.java +++ b/src/main/java/net/pterodactylus/fcp/DataFound.java @@ -33,7 +33,7 @@ public class DataFound extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - DataFound(FcpMessage receivedMessage) { + public DataFound(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/EndListPeerNotes.java b/src/main/java/net/pterodactylus/fcp/EndListPeerNotes.java index 31a52af..88e8525 100644 --- a/src/main/java/net/pterodactylus/fcp/EndListPeerNotes.java +++ b/src/main/java/net/pterodactylus/fcp/EndListPeerNotes.java @@ -33,7 +33,7 @@ public class EndListPeerNotes extends BaseMessage { * @param fcpMessage * The received message */ - EndListPeerNotes(FcpMessage fcpMessage) { + public EndListPeerNotes(FcpMessage fcpMessage) { super(fcpMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/EndListPeers.java b/src/main/java/net/pterodactylus/fcp/EndListPeers.java index bb98f23..5a505d0 100644 --- a/src/main/java/net/pterodactylus/fcp/EndListPeers.java +++ b/src/main/java/net/pterodactylus/fcp/EndListPeers.java @@ -31,7 +31,7 @@ public class EndListPeers extends BaseMessage implements Identifiable { * @param receivedMessage * The message that was received */ - EndListPeers(FcpMessage receivedMessage) { + public EndListPeers(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/EndListPersistentRequests.java b/src/main/java/net/pterodactylus/fcp/EndListPersistentRequests.java index baa8de2..702cc95 100644 --- a/src/main/java/net/pterodactylus/fcp/EndListPersistentRequests.java +++ b/src/main/java/net/pterodactylus/fcp/EndListPersistentRequests.java @@ -33,7 +33,7 @@ public class EndListPersistentRequests extends BaseMessage { * @param receivedMessage * The received message */ - EndListPersistentRequests(FcpMessage receivedMessage) { + public EndListPersistentRequests(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/FCPPluginReply.java b/src/main/java/net/pterodactylus/fcp/FCPPluginReply.java index 44e96ba..0ed55f0 100644 --- a/src/main/java/net/pterodactylus/fcp/FCPPluginReply.java +++ b/src/main/java/net/pterodactylus/fcp/FCPPluginReply.java @@ -42,7 +42,7 @@ public class FCPPluginReply extends BaseMessage implements Identifiable { * @param payloadInputStream * The optional input stream for the payload */ - FCPPluginReply(FcpMessage receivedMessage, InputStream payloadInputStream) { + public FCPPluginReply(FcpMessage receivedMessage, InputStream payloadInputStream) { super(receivedMessage); this.payloadInputStream = payloadInputStream; } diff --git a/src/main/java/net/pterodactylus/fcp/FinishedCompression.java b/src/main/java/net/pterodactylus/fcp/FinishedCompression.java index 91c0341..d6c3ac7 100644 --- a/src/main/java/net/pterodactylus/fcp/FinishedCompression.java +++ b/src/main/java/net/pterodactylus/fcp/FinishedCompression.java @@ -33,7 +33,7 @@ public class FinishedCompression extends BaseMessage implements Identifiable { * @param receivedMessage * The message that was recevied */ - FinishedCompression(FcpMessage receivedMessage) { + public FinishedCompression(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/GetConfig.java b/src/main/java/net/pterodactylus/fcp/GetConfig.java index 230a790..3e381bf 100644 --- a/src/main/java/net/pterodactylus/fcp/GetConfig.java +++ b/src/main/java/net/pterodactylus/fcp/GetConfig.java @@ -33,6 +33,11 @@ public class GetConfig extends FcpMessage { super("GetConfig"); } + public GetConfig(String identifer) { + this(); + setField("Identifier", identifer); + } + /** * Sets whether the {@link ConfigData} result message shall include the * current values. diff --git a/src/main/java/net/pterodactylus/fcp/GetFailed.java b/src/main/java/net/pterodactylus/fcp/GetFailed.java index 01ec1c8..10c22b5 100644 --- a/src/main/java/net/pterodactylus/fcp/GetFailed.java +++ b/src/main/java/net/pterodactylus/fcp/GetFailed.java @@ -38,7 +38,7 @@ public class GetFailed extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - GetFailed(FcpMessage receivedMessage) { + public GetFailed(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/GetNode.java b/src/main/java/net/pterodactylus/fcp/GetNode.java index 3419860..0a84acf 100644 --- a/src/main/java/net/pterodactylus/fcp/GetNode.java +++ b/src/main/java/net/pterodactylus/fcp/GetNode.java @@ -49,7 +49,14 @@ public class GetNode extends FcpMessage { * true to include volatile data in the noderef */ public GetNode(Boolean giveOpennetRef, Boolean withPrivate, Boolean withVolatile) { + this(null, giveOpennetRef, withPrivate, withVolatile); + } + + public GetNode(String identifier, Boolean giveOpennetRef, Boolean withPrivate, Boolean withVolatile) { super("GetNode"); + if (identifier != null) { + setField("Identifier", identifier); + } if (giveOpennetRef != null) { setField("GiveOpennetRef", String.valueOf(giveOpennetRef)); } diff --git a/src/main/java/net/pterodactylus/fcp/GetPluginInfo.java b/src/main/java/net/pterodactylus/fcp/GetPluginInfo.java index 8ad5392..12e446e 100644 --- a/src/main/java/net/pterodactylus/fcp/GetPluginInfo.java +++ b/src/main/java/net/pterodactylus/fcp/GetPluginInfo.java @@ -26,20 +26,20 @@ package net.pterodactylus.fcp; */ public class GetPluginInfo extends FcpMessage { - /** - * Creates a new “GetPluginInfo” message. - * - * @param pluginName - * The name of the plugin - * @param identifier - * The identifier of the request - */ - public GetPluginInfo(String pluginName, String identifier) { + public GetPluginInfo(String identifier) { super("GetPluginInfo"); - setField("PluginName", pluginName); setField("Identifier", identifier); } + public GetPluginInfo(String pluginName, String identifier) { + this(identifier); + setField("PluginName", pluginName); + } + + public void setPluginName(String pluginName) { + setField("PluginName", pluginName); + } + /** * Sets whether detailed information about the plugin is wanted. * diff --git a/src/main/java/net/pterodactylus/fcp/IdentifierCollision.java b/src/main/java/net/pterodactylus/fcp/IdentifierCollision.java index 5ce6f4a..bd28d67 100644 --- a/src/main/java/net/pterodactylus/fcp/IdentifierCollision.java +++ b/src/main/java/net/pterodactylus/fcp/IdentifierCollision.java @@ -33,7 +33,7 @@ public class IdentifierCollision extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - IdentifierCollision(FcpMessage receivedMessage) { + public IdentifierCollision(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/ListPeer.java b/src/main/java/net/pterodactylus/fcp/ListPeer.java index e96a389..2984e6c 100644 --- a/src/main/java/net/pterodactylus/fcp/ListPeer.java +++ b/src/main/java/net/pterodactylus/fcp/ListPeer.java @@ -35,7 +35,14 @@ public class ListPeer extends FcpMessage { * The identifier of the node to get details about */ public ListPeer(String nodeIdentifier) { + this(null, nodeIdentifier); + } + + public ListPeer(String identifier, String nodeIdentifier) { super("ListPeer"); + if (identifier != null) { + setField("Identifier", identifier); + } setField("NodeIdentifier", nodeIdentifier); } diff --git a/src/main/java/net/pterodactylus/fcp/ListPeerNotes.java b/src/main/java/net/pterodactylus/fcp/ListPeerNotes.java index 82e3399..9080830 100644 --- a/src/main/java/net/pterodactylus/fcp/ListPeerNotes.java +++ b/src/main/java/net/pterodactylus/fcp/ListPeerNotes.java @@ -38,4 +38,9 @@ public class ListPeerNotes extends FcpMessage { setField("NodeIdentifier", nodeIdentifier); } + public ListPeerNotes(String identifier, String nodeIdentifier) { + this(nodeIdentifier); + setField("Identifier", identifier); + } + } diff --git a/src/main/java/net/pterodactylus/fcp/ModifyConfig.java b/src/main/java/net/pterodactylus/fcp/ModifyConfig.java index 412b818..687ee16 100644 --- a/src/main/java/net/pterodactylus/fcp/ModifyConfig.java +++ b/src/main/java/net/pterodactylus/fcp/ModifyConfig.java @@ -32,6 +32,11 @@ public class ModifyConfig extends FcpMessage { super("ModifyConfig"); } + public ModifyConfig(String identifier) { + this(); + setField("Identifier", identifier); + } + /** * Sets the option with the given name to the given value. * diff --git a/src/main/java/net/pterodactylus/fcp/ModifyPeer.java b/src/main/java/net/pterodactylus/fcp/ModifyPeer.java index dfc5aa2..f1905e7 100644 --- a/src/main/java/net/pterodactylus/fcp/ModifyPeer.java +++ b/src/main/java/net/pterodactylus/fcp/ModifyPeer.java @@ -25,32 +25,45 @@ package net.pterodactylus.fcp; */ public class ModifyPeer extends FcpMessage { - /** - * Creates a new “ModifyPeer” request. All Boolean parameters may be null - * to not influence the current setting. - * - * @param nodeIdentifier - * The identifier of the node, i.e. name, identity, or IP - * address and port - * @param allowLocalAddresses - * Whether to allow local addresses from this node - * @param disabled - * Whether the node is disabled - * @param listenOnly - * Whether your node should not try to connect the node - */ + public ModifyPeer(String identifier, String nodeIdentifier) { + super("ModifyPeer"); + setField("Identifier", identifier); + setField("NodeIdentifier", nodeIdentifier); + } + + @Deprecated public ModifyPeer(String nodeIdentifier, Boolean allowLocalAddresses, Boolean disabled, Boolean listenOnly) { super("ModifyPeer"); setField("NodeIdentifier", nodeIdentifier); if (allowLocalAddresses != null) { - setField("AllowLocalAddresses", String.valueOf(allowLocalAddresses)); + setAllowLocalAddresses(allowLocalAddresses); } if (disabled != null) { - setField("IsDisabled", String.valueOf(disabled)); + setEnabled(!disabled); } if (listenOnly != null) { - setField("IsListenOnly", String.valueOf(listenOnly)); + setListenOnly(listenOnly); } } + public void setAllowLocalAddresses(boolean allowLocalAddresses) { + setField("AllowLocalAddresses", String.valueOf(allowLocalAddresses)); + } + + public void setEnabled(boolean enabled) { + setField("IsDisabled", String.valueOf(!enabled)); + } + + public void setListenOnly(boolean listenOnly) { + setField("IsListenOnly", String.valueOf(listenOnly)); + } + + public void setBurstOnly(boolean burstOnly) { + setField("IsBurstOnly", String.valueOf(burstOnly)); + } + + public void setIgnoreSource(boolean ignoreSource) { + setField("IgnoreSourcePort", String.valueOf(ignoreSource)); + } + } diff --git a/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java b/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java index 6fcc088..637b5ec 100644 --- a/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java +++ b/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java @@ -25,20 +25,13 @@ package net.pterodactylus.fcp; */ public class ModifyPeerNote extends FcpMessage { - /** - * Creates a new “ModifyPeerNote” request that changes peer note of the - * given type and node to the given text. - * - * @see PeerNote - * @param nodeIdentifier - * The identifier of the node, i.e. name, identity, or IP - * address and port - * @param noteText - * The base64-encoded text - * @param peerNoteType - * The type of the note to change, possible values are only - * {@link PeerNote#TYPE_PRIVATE_PEER_NOTE} at the moment - */ + public ModifyPeerNote(String identifier, String nodeIdentifier) { + super("ModifyPeerNote"); + setField("Identifier", identifier); + setField("NodeIdentifier", nodeIdentifier); + } + + @Deprecated public ModifyPeerNote(String nodeIdentifier, String noteText, int peerNoteType) { super("ModifyPeer"); setField("NodeIdentifier", nodeIdentifier); @@ -46,4 +39,12 @@ public class ModifyPeerNote extends FcpMessage { setField("PeerNoteType", String.valueOf(peerNoteType)); } + public void setNoteText(String noteText) { + setField("NoteText", noteText); + } + + public void setPeerNoteType(PeerNoteType peerNoteType) { + setField("PeerNoteType", peerNoteType.toString()); + } + } diff --git a/src/main/java/net/pterodactylus/fcp/NodeData.java b/src/main/java/net/pterodactylus/fcp/NodeData.java index f73bbd5..5800172 100644 --- a/src/main/java/net/pterodactylus/fcp/NodeData.java +++ b/src/main/java/net/pterodactylus/fcp/NodeData.java @@ -34,7 +34,7 @@ public class NodeData extends BaseMessage { * @param receivedMessage * The received message */ - NodeData(FcpMessage receivedMessage) { + public NodeData(FcpMessage receivedMessage) { super(receivedMessage); nodeRef = new NodeRef(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/NodeHello.java b/src/main/java/net/pterodactylus/fcp/NodeHello.java index 7409d9b..32a4e33 100644 --- a/src/main/java/net/pterodactylus/fcp/NodeHello.java +++ b/src/main/java/net/pterodactylus/fcp/NodeHello.java @@ -31,7 +31,7 @@ public class NodeHello extends BaseMessage { * @param receivedMessage * The received FCP message */ - NodeHello(FcpMessage receivedMessage) { + public NodeHello(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/Peer.java b/src/main/java/net/pterodactylus/fcp/Peer.java index df1c8f0..72925cb 100644 --- a/src/main/java/net/pterodactylus/fcp/Peer.java +++ b/src/main/java/net/pterodactylus/fcp/Peer.java @@ -36,7 +36,7 @@ public class Peer extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - Peer(FcpMessage receivedMessage) { + public Peer(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PeerNote.java b/src/main/java/net/pterodactylus/fcp/PeerNote.java index 67cdfa6..1962eee 100644 --- a/src/main/java/net/pterodactylus/fcp/PeerNote.java +++ b/src/main/java/net/pterodactylus/fcp/PeerNote.java @@ -35,7 +35,7 @@ public class PeerNote extends BaseMessage { * @param receivedMessage * The received message */ - PeerNote(FcpMessage receivedMessage) { + public PeerNote(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PeerRemoved.java b/src/main/java/net/pterodactylus/fcp/PeerRemoved.java index 61aa08d..80da4b6 100644 --- a/src/main/java/net/pterodactylus/fcp/PeerRemoved.java +++ b/src/main/java/net/pterodactylus/fcp/PeerRemoved.java @@ -31,7 +31,7 @@ public class PeerRemoved extends BaseMessage { * @param receivedMessage * The received message */ - PeerRemoved(FcpMessage receivedMessage) { + public PeerRemoved(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PersistentGet.java b/src/main/java/net/pterodactylus/fcp/PersistentGet.java index c7bfe20..7fc70a9 100644 --- a/src/main/java/net/pterodactylus/fcp/PersistentGet.java +++ b/src/main/java/net/pterodactylus/fcp/PersistentGet.java @@ -33,7 +33,7 @@ public class PersistentGet extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PersistentGet(FcpMessage receivedMessage) { + public PersistentGet(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PersistentPut.java b/src/main/java/net/pterodactylus/fcp/PersistentPut.java index 2dc8213..f1114ac 100644 --- a/src/main/java/net/pterodactylus/fcp/PersistentPut.java +++ b/src/main/java/net/pterodactylus/fcp/PersistentPut.java @@ -32,7 +32,7 @@ public class PersistentPut extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PersistentPut(FcpMessage receivedMessage) { + public PersistentPut(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PersistentPutDir.java b/src/main/java/net/pterodactylus/fcp/PersistentPutDir.java index b68c84c..4b668b3 100644 --- a/src/main/java/net/pterodactylus/fcp/PersistentPutDir.java +++ b/src/main/java/net/pterodactylus/fcp/PersistentPutDir.java @@ -34,7 +34,7 @@ public class PersistentPutDir extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PersistentPutDir(FcpMessage receivedMessage) { + public PersistentPutDir(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PersistentRequestModified.java b/src/main/java/net/pterodactylus/fcp/PersistentRequestModified.java index f1d2371..5b02624 100644 --- a/src/main/java/net/pterodactylus/fcp/PersistentRequestModified.java +++ b/src/main/java/net/pterodactylus/fcp/PersistentRequestModified.java @@ -33,7 +33,7 @@ public class PersistentRequestModified extends BaseMessage implements Identifiab * @param receivedMessage * The received message */ - PersistentRequestModified(FcpMessage receivedMessage) { + public PersistentRequestModified(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PersistentRequestRemoved.java b/src/main/java/net/pterodactylus/fcp/PersistentRequestRemoved.java index c9ec826..4d15250 100644 --- a/src/main/java/net/pterodactylus/fcp/PersistentRequestRemoved.java +++ b/src/main/java/net/pterodactylus/fcp/PersistentRequestRemoved.java @@ -33,7 +33,7 @@ public class PersistentRequestRemoved extends BaseMessage implements Identifiabl * @param receivedMessage * The received message */ - PersistentRequestRemoved(FcpMessage receivedMessage) { + public PersistentRequestRemoved(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PluginInfo.java b/src/main/java/net/pterodactylus/fcp/PluginInfo.java index fbce581..149b4a3 100644 --- a/src/main/java/net/pterodactylus/fcp/PluginInfo.java +++ b/src/main/java/net/pterodactylus/fcp/PluginInfo.java @@ -31,7 +31,7 @@ public class PluginInfo extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PluginInfo(FcpMessage receivedMessage) { + public PluginInfo(FcpMessage receivedMessage) { super(receivedMessage); } @@ -73,4 +73,15 @@ public class PluginInfo extends BaseMessage implements Identifiable { return Boolean.valueOf("Started"); } + public boolean isTalkable() { + return Boolean.valueOf(getField("IsTalkable")); + } + + public String getVersion() { + return getField("Version"); + } + + public String getLongVersion() { + return getField("LongVersion"); + } } diff --git a/src/main/java/net/pterodactylus/fcp/ProtocolError.java b/src/main/java/net/pterodactylus/fcp/ProtocolError.java index 8b7b510..80d8487 100644 --- a/src/main/java/net/pterodactylus/fcp/ProtocolError.java +++ b/src/main/java/net/pterodactylus/fcp/ProtocolError.java @@ -31,7 +31,7 @@ public class ProtocolError extends BaseMessage { * @param receivedMessage * The received message */ - ProtocolError(FcpMessage receivedMessage) { + public ProtocolError(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PutFailed.java b/src/main/java/net/pterodactylus/fcp/PutFailed.java index 8535bcb..7853d39 100644 --- a/src/main/java/net/pterodactylus/fcp/PutFailed.java +++ b/src/main/java/net/pterodactylus/fcp/PutFailed.java @@ -38,7 +38,7 @@ public class PutFailed extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PutFailed(FcpMessage receivedMessage) { + public PutFailed(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PutFetchable.java b/src/main/java/net/pterodactylus/fcp/PutFetchable.java index 767b4ad..c9867b0 100644 --- a/src/main/java/net/pterodactylus/fcp/PutFetchable.java +++ b/src/main/java/net/pterodactylus/fcp/PutFetchable.java @@ -33,7 +33,7 @@ public class PutFetchable extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PutFetchable(FcpMessage receivedMessage) { + public PutFetchable(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/PutSuccessful.java b/src/main/java/net/pterodactylus/fcp/PutSuccessful.java index d8c4434..c5ee7fd 100644 --- a/src/main/java/net/pterodactylus/fcp/PutSuccessful.java +++ b/src/main/java/net/pterodactylus/fcp/PutSuccessful.java @@ -32,7 +32,7 @@ public class PutSuccessful extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - PutSuccessful(FcpMessage receivedMessage) { + public PutSuccessful(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/RemovePeer.java b/src/main/java/net/pterodactylus/fcp/RemovePeer.java index 5eae728..3f867fe 100644 --- a/src/main/java/net/pterodactylus/fcp/RemovePeer.java +++ b/src/main/java/net/pterodactylus/fcp/RemovePeer.java @@ -25,16 +25,15 @@ package net.pterodactylus.fcp; */ public class RemovePeer extends FcpMessage { - /** - * Creates a new “RemovePeer” command that removes the given peer. - * - * @param nodeIdentifier - * The identifier of the node, i.e. its name, identity, or IP - * address and port pair - */ + @Deprecated public RemovePeer(String nodeIdentifier) { super("RemovePeer"); setField("NodeIdentifier", nodeIdentifier); } + public RemovePeer(String identifier, String nodeIdentifier) { + this(nodeIdentifier); + setField("Identifier", identifier); + } + } diff --git a/src/main/java/net/pterodactylus/fcp/SSKKeypair.java b/src/main/java/net/pterodactylus/fcp/SSKKeypair.java index 55b27e9..01a95f0 100644 --- a/src/main/java/net/pterodactylus/fcp/SSKKeypair.java +++ b/src/main/java/net/pterodactylus/fcp/SSKKeypair.java @@ -32,7 +32,7 @@ public class SSKKeypair extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - SSKKeypair(FcpMessage receivedMessage) { + public SSKKeypair(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/SimpleProgress.java b/src/main/java/net/pterodactylus/fcp/SimpleProgress.java index 5f4da24..69a3bf2 100644 --- a/src/main/java/net/pterodactylus/fcp/SimpleProgress.java +++ b/src/main/java/net/pterodactylus/fcp/SimpleProgress.java @@ -32,7 +32,7 @@ public class SimpleProgress extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - SimpleProgress(FcpMessage receivedMessage) { + public SimpleProgress(FcpMessage receivedMessage) { super(receivedMessage); } @@ -99,6 +99,14 @@ public class SimpleProgress extends BaseMessage implements Identifiable { return Boolean.valueOf(getField("FinalizedTotal")); } + public long getLastProgress() { + return Long.valueOf(getField("LastProgress")); + } + + public int getMinSuccessFetchBlocks() { + return Integer.valueOf(getField("MinSuccessFetchBlocks")); + } + /** * Returns the identifier of the request. * diff --git a/src/main/java/net/pterodactylus/fcp/StartedCompression.java b/src/main/java/net/pterodactylus/fcp/StartedCompression.java index 1fd44f1..3aac42c 100644 --- a/src/main/java/net/pterodactylus/fcp/StartedCompression.java +++ b/src/main/java/net/pterodactylus/fcp/StartedCompression.java @@ -33,7 +33,7 @@ public class StartedCompression extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - StartedCompression(FcpMessage receivedMessage) { + public StartedCompression(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/SubscribeUSK.java b/src/main/java/net/pterodactylus/fcp/SubscribeUSK.java index 6a18333..634d1de 100644 --- a/src/main/java/net/pterodactylus/fcp/SubscribeUSK.java +++ b/src/main/java/net/pterodactylus/fcp/SubscribeUSK.java @@ -24,22 +24,35 @@ package net.pterodactylus.fcp; * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> */ -public class SubscribeUSK extends FcpMessage { +public class SubscribeUSK extends FcpMessage implements Identifiable { - /** - * Creates a new “SubscribeUSK” message. - * - * @param uri - * The URI to watch for changes - * @param identifier - * The identifier of the request - */ - public SubscribeUSK(String uri, String identifier) { + public SubscribeUSK(String identifier) { super("SubscribeUSK"); - setField("URI", uri); setField("Identifier", identifier); } + public SubscribeUSK(String uri, String identifier) { + this(identifier); + setField("URI", uri); + } + + @Override + public String getIdentifier() { + return getField("Identifier"); + } + + public String getUri() { + return getField("URI"); + } + + public void setUri(String uri) { + setField("URI", uri); + } + + public boolean isActive() { + return !Boolean.parseBoolean(getField("DontPoll")); + } + /** * Sets whether updates for the USK are actively searched. * @@ -52,4 +65,52 @@ public class SubscribeUSK extends FcpMessage { setField("DontPoll", String.valueOf(!active)); } + public boolean isSparse() { + return Boolean.valueOf(getField("SparsePoll")); + } + + public void setSparse(boolean sparse) { + setField("SparsePoll", String.valueOf(sparse)); + } + + public Priority getPriority() { + String priorityClass = getField("PriorityClass"); + if (priorityClass != null) { + return Priority.valueOf(priorityClass); + } + return Priority.bulkSplitfile; + } + + public void setPriority(Priority priority) { + setField("PriorityClass", priority.toString()); + } + + public Priority getActivePriority() { + String priorityClass = getField("PriorityClassProgress"); + if (priorityClass != null) { + return Priority.valueOf(priorityClass); + } + return Priority.update; + } + + public void setActivePriority(Priority activePriority) { + setField("PriorityClassProgress", activePriority.toString()); + } + + public boolean isRealTime() { + return Boolean.valueOf(getField("RealTimeFlag")); + } + + public void setRealTime(boolean realTime) { + setField("RealTimeFlag", String.valueOf(realTime)); + } + + public boolean isIgnoreDateHints() { + return Boolean.valueOf(getField("IgnoreUSKDatehints")); + } + + public void setIgnoreDateHints(boolean ignoreDateHints) { + setField("IgnoreUSKDatehints", String.valueOf(ignoreDateHints)); + } + } diff --git a/src/main/java/net/pterodactylus/fcp/SubscribedUSKUpdate.java b/src/main/java/net/pterodactylus/fcp/SubscribedUSKUpdate.java index d2e132d..21cd466 100644 --- a/src/main/java/net/pterodactylus/fcp/SubscribedUSKUpdate.java +++ b/src/main/java/net/pterodactylus/fcp/SubscribedUSKUpdate.java @@ -36,7 +36,7 @@ public class SubscribedUSKUpdate extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - SubscribedUSKUpdate(FcpMessage receivedMessage) { + public SubscribedUSKUpdate(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/TestDDAComplete.java b/src/main/java/net/pterodactylus/fcp/TestDDAComplete.java index bea91d9..0a66de7 100644 --- a/src/main/java/net/pterodactylus/fcp/TestDDAComplete.java +++ b/src/main/java/net/pterodactylus/fcp/TestDDAComplete.java @@ -32,7 +32,7 @@ public class TestDDAComplete extends BaseMessage { * @param receivedMessage * The received message */ - TestDDAComplete(FcpMessage receivedMessage) { + public TestDDAComplete(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/TestDDAReply.java b/src/main/java/net/pterodactylus/fcp/TestDDAReply.java index 9764a02..9e2b6d4 100644 --- a/src/main/java/net/pterodactylus/fcp/TestDDAReply.java +++ b/src/main/java/net/pterodactylus/fcp/TestDDAReply.java @@ -36,7 +36,7 @@ public class TestDDAReply extends BaseMessage { * @param receivedMessage * The received message */ - TestDDAReply(FcpMessage receivedMessage) { + public TestDDAReply(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/URIGenerated.java b/src/main/java/net/pterodactylus/fcp/URIGenerated.java index 4939570..1b126f1 100644 --- a/src/main/java/net/pterodactylus/fcp/URIGenerated.java +++ b/src/main/java/net/pterodactylus/fcp/URIGenerated.java @@ -33,7 +33,7 @@ public class URIGenerated extends BaseMessage implements Identifiable { * @param receivedMessage * The received message */ - URIGenerated(FcpMessage receivedMessage) { + public URIGenerated(FcpMessage receivedMessage) { super(receivedMessage); } diff --git a/src/main/java/net/pterodactylus/fcp/UnknownNodeIdentifier.java b/src/main/java/net/pterodactylus/fcp/UnknownNodeIdentifier.java index af7b2f5..a0d0891 100644 --- a/src/main/java/net/pterodactylus/fcp/UnknownNodeIdentifier.java +++ b/src/main/java/net/pterodactylus/fcp/UnknownNodeIdentifier.java @@ -33,7 +33,7 @@ public class UnknownNodeIdentifier extends BaseMessage { * @param receivedMessage * The received message */ - UnknownNodeIdentifier(FcpMessage receivedMessage) { + public UnknownNodeIdentifier(FcpMessage receivedMessage) { super(receivedMessage); } -- 2.7.4