X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerObject.java;h=a6a5dd1b83573c3ca0814f7c409ae872d2061e59;hb=5584adbbbf5444c0039fed2b35dc7d5bb57b71b1;hp=0941f7047f5363e612c299024150663bbadf5f5a;hpb=3087aeb5f7b9fffcb57d51030c4674f9768e7f02;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerObject.java b/src/be/nikiroo/utils/serial/server/ServerObject.java
index 0941f70..a6a5dd1 100644
--- a/src/be/nikiroo/utils/serial/server/ServerObject.java
+++ b/src/be/nikiroo/utils/serial/server/ServerObject.java
@@ -74,7 +74,7 @@ abstract public class ServerObject extends Server {
 					for (Object data = rec(); true; data = rec()) {
 						Object rep = null;
 						try {
-							rep = onRequest(this, data, id);
+							rep = onRequest(this, clientVersion, data, id);
 							if (isClosing()) {
 								return;
 							}
@@ -122,6 +122,59 @@ abstract public class ServerObject extends Server {
 	 * @throws Exception
 	 *             in case of an exception, the error will only be logged
 	 */
-	abstract protected Object onRequest(ConnectActionServerObject action,
-			Object data, long id) throws Exception;
+	protected Object onRequest(ConnectActionServerObject action,
+			Version clientVersion, Object 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 ServerObject(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 ServerObject(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 Object onRequest(ConnectActionServerObject action,
+			Version version, Object data) throws Exception {
+		return null;
+	}
 }