diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 16:27:33 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 16:28:54 +0200 |
commit | b9469eb43b5647605ad7b9662f584c2efbef5153 (patch) | |
tree | 5a14e1213b8aa8956c639f4687c8d662aaad9773 /same/src/main/java/com/orbekk/net | |
parent | b78972404f4b0a5dbccb6849021c2ca2d5e8bb46 (diff) |
Remove unused code.
– Remove old HTTP code.
– Remove Jetty, Jsonrpc and servlet dependencies.
– Remove state viewer servlet.
– Remove unmaintained tests (rely on functional tests instead).
Diffstat (limited to 'same/src/main/java/com/orbekk/net')
-rw-r--r-- | same/src/main/java/com/orbekk/net/BroadcastListener.java | 62 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/net/HttpUtil.java | 25 | ||||
-rw-r--r-- | same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java | 76 |
3 files changed, 0 insertions, 163 deletions
diff --git a/same/src/main/java/com/orbekk/net/BroadcastListener.java b/same/src/main/java/com/orbekk/net/BroadcastListener.java deleted file mode 100644 index df8c02e..0000000 --- a/same/src/main/java/com/orbekk/net/BroadcastListener.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.orbekk.net; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetSocketAddress; -import java.net.SocketException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BroadcastListener { - private int port; - private Logger logger = LoggerFactory.getLogger(getClass()); - DatagramSocket socket; - - public BroadcastListener(int port) { - this.port = port; - } - - public synchronized DatagramPacket listen() { - logger.debug("Waiting for broadcast on port " + port); - try { - if (socket == null) { - socket = new DatagramSocket(null); - socket.setReuseAddress(true); - socket.bind(new InetSocketAddress(port)); - } - } catch (SocketException e) { - logger.warn("Failed to create socket.", e.fillInStackTrace()); - return null; - } - try { - socket.setBroadcast(true); - } catch (SocketException e) { - logger.warn("Exception: {}", e); - } - byte[] buffer = new byte[2048]; - DatagramPacket packet = new DatagramPacket(buffer, buffer.length); - try { - socket.receive(packet); - } catch (IOException e) { - logger.warn("Exception when listening for broadcast: {}", e); - return null; - } - - String address = packet.getAddress().getHostAddress(); - logger.debug("Received broadcast from " + address + - ": " + new String(packet.getData(), 0, packet.getLength())); - return packet; - } - - public void interrupt() { - socket.close(); - } - - public static void main(String[] args) { - int port = Integer.parseInt(args[0]); - BroadcastListener listener = new BroadcastListener(port); - System.out.println("Received broadcast: " + listener.listen()); - } -} diff --git a/same/src/main/java/com/orbekk/net/HttpUtil.java b/same/src/main/java/com/orbekk/net/HttpUtil.java deleted file mode 100644 index 946c377..0000000 --- a/same/src/main/java/com/orbekk/net/HttpUtil.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.orbekk.net; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class HttpUtil { - private static final Logger logger = - LoggerFactory.getLogger(HttpUtil.class); - - public static void sendHttpRequest(String url) { - try { - URL pingUrl = new URL(url); - pingUrl.openStream(); - // URLConnection connection = pingUrl.openConnection(); - // connection.connect(); - } catch (MalformedURLException e) { - logger.warn("Unable to send ping to {}: {}.", url, e); - } catch (IOException e) { - logger.warn("Error when sending ping: {}", e); - } - } -} diff --git a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java deleted file mode 100644 index d5e30d7..0000000 --- a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.orbekk.net; - -import java.io.IOException; -import java.io.OutputStream; -import java.lang.reflect.Type; -import java.net.URL; -import java.util.Map; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentProducer; -import org.apache.http.entity.EntityTemplate; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.googlecode.jsonrpc4j.JsonRpcClient; -import com.googlecode.jsonrpc4j.JsonRpcHttpClient; - -/** - * This class is horrible. :S - * - * We extend JsonRpcHttpClient but try to override everything it does. - */ -public class MyJsonRpcHttpClient extends JsonRpcHttpClient { - Logger logger = LoggerFactory.getLogger(getClass()); - private URL serviceUrl; - private JsonRpcClient rpcClient; - private HttpClient httpClient; - - public MyJsonRpcHttpClient(URL serviceUrl, int connectionTimeout, - int readTimeout) { - super(null); - httpClient = new DefaultHttpClient(); - HttpParams params = httpClient.getParams(); - HttpConnectionParams.setConnectionTimeout(params, connectionTimeout); - HttpConnectionParams.setSoTimeout(params, readTimeout); - rpcClient = new JsonRpcClient(); - this.serviceUrl = serviceUrl; - } - - @Override - public synchronized Object invoke( - final String methodName, final Object[] arguments, Type returnType, - Map<String, String> extraHeaders) - throws Exception { - EntityTemplate entity = new EntityTemplate(new ContentProducer() { - @Override - public void writeTo(OutputStream out) throws IOException { - try { - rpcClient.invoke(methodName, arguments, out); - } catch (Exception e) { - throw new IOException("RPC Failed: " + e.getMessage()); - } - } - }); - entity.setContentType("application/json-rpc"); - - HttpPost post = new HttpPost(serviceUrl.toString()); - - for (Map.Entry<String, String> entry : extraHeaders.entrySet()) { - post.addHeader(entry.getKey(), entry.getValue()); - } - - post.setEntity(entity); - - HttpResponse response = httpClient.execute(post); - HttpEntity responseEntity = response.getEntity(); - - return super.readResponse(returnType, responseEntity.getContent()); - } -} |