From 8bbb0f4ce2d80821893b2c32b36bdedf914ccee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Fri, 2 Mar 2012 14:15:10 +0100 Subject: Implement discovery service. No main class yet. --- discovery/pom.xml | 5 +++ .../com/orbekk/same/discovery/DiscoveryApp.java | 13 ++++++++ .../same/discovery/DiscoveryServiceImpl.java | 38 +++++++++++++++++++++- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 discovery/src/main/java/com/orbekk/same/discovery/DiscoveryApp.java diff --git a/discovery/pom.xml b/discovery/pom.xml index d3e9cd7..92cbc94 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -81,6 +81,11 @@ httpclient 4.1.2 + + com.orbekk + same + 0.0-SNAPSHOT + diff --git a/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryApp.java b/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryApp.java new file mode 100644 index 0000000..dbad697 --- /dev/null +++ b/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryApp.java @@ -0,0 +1,13 @@ +package com.orbekk.same.discovery; + +import com.orbekk.same.http.ServerContainer; + +public class DiscoveryApp { + public static final int DISCOVERY_PORT = 15072; + + public static void main(String[] args) { + /** + * TODO: Need to move DiscoveryService to same project. + */ + } +} diff --git a/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryServiceImpl.java b/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryServiceImpl.java index f568213..fe97228 100644 --- a/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryServiceImpl.java +++ b/discovery/src/main/java/com/orbekk/same/discovery/DiscoveryServiceImpl.java @@ -1,5 +1,41 @@ package com.orbekk.same.discovery; -public class DiscoveryServiceImpl { +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class DiscoveryServiceImpl implements DiscoveryService { + public final static long EXPIRE_TIME = 15 * 60l * 1000; // 15 minutes + List networkList = new ArrayList(); + synchronized void cleanNetworkList() { + long expiredTime = System.currentTimeMillis() - EXPIRE_TIME; + for (Iterator it = networkList.iterator(); it.hasNext();) { + NetworkEntry e = it.next(); + if (e.hasExpired(expiredTime)) { + it.remove(); + } + } + } + + @Override + public List getNetworks() throws Exception { + cleanNetworkList(); + List networks = new ArrayList(); + for (NetworkEntry e : networkList) { + networks.add(e.networkName); + networks.add(e.masterUrl); + } + return networks; + } + + @Override + public void registerNetwork(String networkName, String masterUrl) + throws Exception { + cleanNetworkList(); + NetworkEntry entry = new NetworkEntry(networkName, masterUrl); + entry.register(System.currentTimeMillis()); + networkList.remove(entry); + networkList.add(entry); + } } -- cgit v1.2.3