X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerString.java;h=3c982fd585371ee1694497880a918b2b5149a7e6;hb=abfeadcc2c0da88e32dd49291e8163880fe270f1;hp=6a0d4f462c48d1adfc46f5723bd240514cdf020e;hpb=340e6065e8027c2b3b88549b5761b0b9f6950a53;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java
index 6a0d4f4..3c982fd 100644
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/src/be/nikiroo/utils/serial/server/ServerString.java
@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
+import be.nikiroo.utils.Version;
+
 /**
  * This class implements a simple server that can listen for connections and
  * send/receive Strings.
@@ -66,12 +68,12 @@ abstract public class ServerString extends Server {
 	protected ConnectActionServer createConnectActionServer(Socket s) {
 		return new ConnectActionServerString(s, key) {
 			@Override
-			public void action() throws Exception {
+			public void action(Version clientVersion) throws Exception {
 				long id = getNextId();
 				for (String data = rec(); data != null; data = rec()) {
 					String rep = null;
 					try {
-						rep = onRequest(this, data, id);
+						rep = onRequest(this, clientVersion, data, id);
 						if (isClosing()) {
 							return;
 						}
@@ -110,6 +112,8 @@ abstract public class ServerString extends Server {
 	 * 
 	 * @param action
 	 *            the client action
+	 * @param clientVersion
+	 *            the client version
 	 * @param data
 	 *            the data sent by the client
 	 * @param id
@@ -121,6 +125,59 @@ abstract public class ServerString extends Server {
 	 * @throws Exception
 	 *             in case of an exception, the error will only be logged
 	 */
-	abstract protected String onRequest(ConnectActionServerString action,
-			String data, long id) throws Exception;
+	protected String onRequest(ConnectActionServerString action,
+			Version clientVersion, String data,
+			@SuppressWarnings("unused") long id) throws Exception {
+		// TODO: change to abstract when deprecated method is removed
+		// Default implementation for compat
+		return onRequest(action, clientVersion, data);
+	}
+
+	// Deprecated //
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@Deprecated
+	public ServerString(int port, boolean ssl) throws IOException {
+		this(port, ssl ? "" : null);
+	}
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@Deprecated
+	public ServerString(String name, int port, boolean ssl) throws IOException {
+		this(name, port, ssl ? "" : null);
+	}
+
+	/**
+	 * Will be called if the correct version is not overrided.
+	 * 
+	 * @deprecated use the version with the id.
+	 * 
+	 * @param action
+	 *            the client action
+	 * @param data
+	 *            the data sent by the client
+	 * 
+	 * @return the answer to return to the client
+	 * 
+	 * @throws Exception
+	 *             in case of an exception, the error will only be logged
+	 */
+	@Deprecated
+	@SuppressWarnings("unused")
+	protected String onRequest(ConnectActionServerString action,
+			Version version, String data) throws Exception {
+		return null;
+	}
 }