X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerObject.java;h=a6a5dd1b83573c3ca0814f7c409ae872d2061e59;hb=9e7330d793887fe9ee378ca1413141d7761e76ca;hp=53606ed420a671ce34826fe0d1380dac9501d05d;hpb=f4053377fa15da2f11e82955bfab86e673fa371c;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerObject.java b/src/be/nikiroo/utils/serial/server/ServerObject.java
deleted file mode 100644
index 53606ed..0000000
--- a/src/be/nikiroo/utils/serial/server/ServerObject.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package be.nikiroo.utils.serial.server;
-
-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 objects.
- * <p>
- * Note: this {@link ServerObject} has to be discarded after use (cannot be
- * started twice).
- * 
- * @author niki
- */
-abstract public class ServerObject extends Server {
-	/**
-	 * Create a new server that will start listening on the network when
-	 * {@link ServerObject#start()} is called.
-	 * 
-	 * @param port
-	 *            the port to listen on, or 0 to assign any unallocated port
-	 *            found (which can later on be queried via
-	 *            {@link ServerObject#getPort()}
-	 * @param ssl
-	 *            use a SSL connection (or not)
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 * @throws UnknownHostException
-	 *             if the IP address of the host could not be determined
-	 * @throws IllegalArgumentException
-	 *             if the port parameter is outside the specified range of valid
-	 *             port values, which is between 0 and 65535, inclusive
-	 */
-	public ServerObject(int port, boolean ssl) throws IOException {
-		super(port, ssl);
-	}
-
-	/**
-	 * Create a new server that will start listening on the network when
-	 * {@link ServerObject#start()} is called.
-	 * 
-	 * @param name
-	 *            the server name (only used for debug info and traces)
-	 * @param port
-	 *            the port to listen on
-	 * @param ssl
-	 *            use a SSL connection (or not)
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 * @throws UnknownHostException
-	 *             if the IP address of the host could not be determined
-	 * @throws IllegalArgumentException
-	 *             if the port parameter is outside the specified range of valid
-	 *             port values, which is between 0 and 65535, inclusive
-	 */
-	public ServerObject(String name, int port, boolean ssl) throws IOException {
-		super(name, port, ssl);
-	}
-
-	@Override
-	protected ConnectActionServer createConnectActionServer(Socket s) {
-		return new ConnectActionServerObject(s) {
-			@Override
-			public void action(Version clientVersion) throws Exception {
-				try {
-					for (Object data = rec(); true; data = rec()) {
-						Object rep = null;
-						try {
-							rep = onRequest(this, clientVersion, data);
-						} catch (Exception e) {
-							onError(e);
-						}
-						send(rep);
-					}
-				} catch (NullPointerException e) {
-					// Client has no data any more, we quit
-				}
-			}
-
-			@Override
-			protected void onError(Exception e) {
-				ServerObject.this.onError(e);
-			}
-		};
-	}
-
-	/**
-	 * This is the method that is called on each client request.
-	 * <p>
-	 * You are expected to react to it and return an answer (which can be NULL).
-	 * 
-	 * @param action
-	 *            the client action
-	 * @param clientVersion
-	 *            the client version
-	 * @param data
-	 *            the data sent by the client (which can be NULL)
-	 * 
-	 * @return the answer to return to the client (which can be NULL)
-	 * 
-	 * @throws Exception
-	 *             in case of an exception, the error will only be logged
-	 */
-	abstract protected Object onRequest(ConnectActionServerObject action,
-			Version clientVersion, Object data) throws Exception;
-}