X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=6d51c92432ff7c4b09c5235c3d019c1e87831271;hb=72420249ffac25cab4c5c9e4ff737f6930a9d14b;hp=6413dc2787d08dc8dfd36d8b9348883804e8f3ff;hpb=14e90dbe259b7fcf8ed6ac35a2ac1c616fcd1c2f;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
index 6413dc2..6d51c92 100644
--- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.fcp.highlevel;
 
 import static com.google.common.collect.FluentIterable.from;
+import static java.util.stream.Collectors.toMap;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -40,6 +41,7 @@ import net.pterodactylus.fcp.AllData;
 import net.pterodactylus.fcp.ClientGet;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
+import net.pterodactylus.fcp.ConfigData;
 import net.pterodactylus.fcp.DataFound;
 import net.pterodactylus.fcp.EndListPeerNotes;
 import net.pterodactylus.fcp.EndListPeers;
@@ -50,6 +52,7 @@ import net.pterodactylus.fcp.FcpAdapter;
 import net.pterodactylus.fcp.FcpConnection;
 import net.pterodactylus.fcp.FcpListener;
 import net.pterodactylus.fcp.GenerateSSK;
+import net.pterodactylus.fcp.GetConfig;
 import net.pterodactylus.fcp.GetFailed;
 import net.pterodactylus.fcp.GetNode;
 import net.pterodactylus.fcp.ListPeerNotes;
@@ -301,7 +304,7 @@ public class FcpClient implements Closeable {
 			@SuppressWarnings("synthetic-access")
 			public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
 				FcpClient.this.nodeHello = nodeHello;
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -367,11 +370,11 @@ public class FcpClient implements Closeable {
 						fcpConnection.sendMessage(clientGet);
 					} catch (IOException ioe1) {
 						getResult.success(false).exception(ioe1);
-						completionLatch.countDown();
+						complete();
 					}
 				} else {
 					getResult.success(false).errorCode(getFailed.getCode());
-					completionLatch.countDown();
+					complete();
 				}
 			}
 
@@ -381,7 +384,7 @@ public class FcpClient implements Closeable {
 					return;
 				}
 				getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
-				completionLatch.countDown();
+				complete();
 			}
 
 		}.execute();
@@ -473,7 +476,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
 				if (endListPeers.getIdentifier().equals(identifier)) {
-					completionLatch.countDown();
+					complete();
 				}
 			}
 		}.execute();
@@ -640,7 +643,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -683,7 +686,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -715,7 +718,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 	}
@@ -763,7 +766,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return objectWrapper.get();
@@ -802,7 +805,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedPeer(FcpConnection fcpConnection, Peer receivedPeer) {
 				if (receivedPeer.getIdentity().equals(peer.getIdentity())) {
-					completionLatch.countDown();
+					complete();
 				}
 			}
 		}.execute();
@@ -840,7 +843,7 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedSSKKeypair(FcpConnection fcpConnection, SSKKeypair sskKeypair) {
 				sskKeypairWrapper.set(sskKeypair);
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return sskKeypairWrapper.get();
@@ -1005,7 +1008,7 @@ public class FcpClient implements Closeable {
 			 */
 			@Override
 			public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return requests.values();
@@ -1078,7 +1081,7 @@ public class FcpClient implements Closeable {
 					return;
 				}
 				pluginReplies.putAll(fcpPluginReply.getReplies());
-				completionLatch.countDown();
+				complete();
 			}
 
 		}.execute();
@@ -1121,13 +1124,56 @@ public class FcpClient implements Closeable {
 			@Override
 			public void receivedNodeData(FcpConnection fcpConnection, NodeData nodeData) {
 				nodeDataWrapper.set(nodeData);
-				completionLatch.countDown();
+				complete();
 			}
 		}.execute();
 		return nodeDataWrapper.get();
 	}
 
 	//
+	// CONFIG MANAGEMENT
+	//
+
+	public Map<String, String> getConfig() throws IOException, FcpException {
+		Map<String, String> results = new HashMap<>();
+		new ExtendedFcpAdapter() {
+			@Override
+			public void run() throws IOException {
+				GetConfig getConfig = new GetConfig(createIdentifier("get-config"));
+				getConfig.setWithCurrent(true);
+				getConfig.setWithDefaults(true);
+				getConfig.setWithShortDescription(true);
+				getConfig.setWithLongDescription(true);
+				getConfig.setWithDataTypes(true);
+				getConfig.setWithExpertFlag(true);
+				getConfig.setWithForceWriteFlag(true);
+				getConfig.setWithSortOrder(true);
+				fcpConnection.sendMessage(getConfig);
+			}
+
+			@Override
+			public void receivedConfigData(FcpConnection fcpConnection, ConfigData configData) {
+				results.putAll(filterByResponseType(configData, "current"));
+				results.putAll(filterByResponseType(configData, "default"));
+				results.putAll(filterByResponseType(configData, "shortDescription"));
+				results.putAll(filterByResponseType(configData, "longDescription"));
+				results.putAll(filterByResponseType(configData, "expertFlag"));
+				results.putAll(filterByResponseType(configData, "dataType"));
+				results.putAll(filterByResponseType(configData, "sortOrder"));
+				results.putAll(filterByResponseType(configData, "forceWriteFlag"));
+				complete();
+			}
+
+			private Map<String, String> filterByResponseType(ConfigData configData, String responseType) {
+				return configData.getFields().entrySet().stream()
+					.filter(e -> e.getKey().startsWith(responseType + "."))
+					.collect(toMap(Entry::getKey, Entry::getValue));
+			}
+		}.execute();
+		return results;
+	}
+
+	//
 	// PRIVATE METHODS
 	//
 
@@ -1173,7 +1219,7 @@ public class FcpClient implements Closeable {
 	private abstract class ExtendedFcpAdapter extends FcpAdapter {
 
 		/** The count down latch used to wait for completion. */
-		protected final CountDownLatch completionLatch = new CountDownLatch(1);
+		private final CountDownLatch completionLatch = new CountDownLatch(1);
 
 		/** The FCP exception, if any. */
 		protected FcpException fcpException;
@@ -1229,6 +1275,13 @@ public class FcpClient implements Closeable {
 		public abstract void run() throws IOException;
 
 		/**
+		 * Signals completion of the command processing.
+		 */
+		protected void complete() {
+			completionLatch.countDown();
+		}
+
+		/**
 		 * {@inheritDoc}
 		 */
 		@Override
@@ -1251,7 +1304,7 @@ public class FcpClient implements Closeable {
 		 */
 		@Override
 		public void receivedProtocolError(FcpConnection fcpConnection, ProtocolError protocolError) {
-			fcpException = new FcpException("Protocol error (" + protocolError.getCode() + ", " + protocolError.getCodeDescription());
+			fcpException = FcpProtocolException.from(protocolError);
 			completionLatch.countDown();
 		}