X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerString.java;h=3c982fd585371ee1694497880a918b2b5149a7e6;hb=7ce18848c8327967ce27b90abf2e280953530b5f;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
deleted file mode 100644
index 6a0d4f4..0000000
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package be.nikiroo.utils.serial.server;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-/**
- * This class implements a simple server that can listen for connections and
- * send/receive Strings.
- * <p>
- * Note: this {@link ServerString} has to be discarded after use (cannot be
- * started twice).
- * 
- * @author niki
- */
-abstract public class ServerString extends Server {
-	/**
-	 * Create a new server that will start listening on the network when
-	 * {@link ServerString#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 ServerString#getPort()}
-	 * @param key
-	 *            an optional key to encrypt all the communications (if NULL,
-	 *            everything will be sent in clear text)
-	 * 
-	 * @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 ServerString(int port, String key) throws IOException {
-		super(port, key);
-	}
-
-	/**
-	 * Create a new server that will start listening on the network when
-	 * {@link ServerString#start()} is called.
-	 * 
-	 * @param name
-	 *            the server name (only used for debug info and traces)
-	 * @param port
-	 *            the port to listen on
-	 * @param key
-	 *            an optional key to encrypt all the communications (if NULL,
-	 *            everything will be sent in clear text)
-	 * 
-	 * @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 ServerString(String name, int port, String key) throws IOException {
-		super(name, port, key);
-	}
-
-	@Override
-	protected ConnectActionServer createConnectActionServer(Socket s) {
-		return new ConnectActionServerString(s, key) {
-			@Override
-			public void action() throws Exception {
-				long id = getNextId();
-				for (String data = rec(); data != null; data = rec()) {
-					String rep = null;
-					try {
-						rep = onRequest(this, data, id);
-						if (isClosing()) {
-							return;
-						}
-					} catch (Exception e) {
-						onError(e);
-					}
-
-					if (rep == null) {
-						rep = "";
-					}
-					send(rep);
-				}
-
-				onRequestDone(id, getBytesReceived(), getBytesSent());
-			}
-
-			@Override
-			protected void onError(Exception e) {
-				ServerString.this.onError(e);
-			}
-		};
-	}
-
-	@Override
-	protected ConnectActionClient getConnectionToMe()
-			throws UnknownHostException, IOException {
-		return new ConnectActionClientString(new Socket((String) null,
-				getPort()), key);
-	}
-
-	/**
-	 * This is the method that is called on each client request.
-	 * <p>
-	 * You are expected to react to it and return an answer (NULL will be
-	 * converted to an empty {@link String}).
-	 * 
-	 * @param action
-	 *            the client action
-	 * @param data
-	 *            the data sent by the client
-	 * @param id
-	 *            an ID to identify this request (will also be re-used for
-	 *            {@link ServerObject#onRequestDone(long, long, long)}.
-	 * 
-	 * @return the answer to return to the client
-	 * 
-	 * @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;
-}