From 0ac19e55b447e9bc966282e1ba9cae9f23ae4f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Fri, 2 Mar 2012 14:32:01 +0100
Subject: Rename Discovery* => Directory*.

---
 .../com/orbekk/same/directory/DirectoryApp.java    | 13 +++++++
 .../same/directory/DirectoryServiceImpl.java       | 43 ++++++++++++++++++++++
 .../com/orbekk/same/directory/NetworkEntry.java    | 30 +++++++++++++++
 .../orbekk/same/discovery/NetworkEntryTest.java    | 27 ++++++++++++++
 4 files changed, 113 insertions(+)
 create mode 100644 directory/src/main/java/com/orbekk/same/directory/DirectoryApp.java
 create mode 100644 directory/src/main/java/com/orbekk/same/directory/DirectoryServiceImpl.java
 create mode 100644 directory/src/main/java/com/orbekk/same/directory/NetworkEntry.java
 create mode 100644 directory/src/test/java/com/orbekk/same/discovery/NetworkEntryTest.java

(limited to 'directory/src')

diff --git a/directory/src/main/java/com/orbekk/same/directory/DirectoryApp.java b/directory/src/main/java/com/orbekk/same/directory/DirectoryApp.java
new file mode 100644
index 0000000..f142f18
--- /dev/null
+++ b/directory/src/main/java/com/orbekk/same/directory/DirectoryApp.java
@@ -0,0 +1,13 @@
+package com.orbekk.same.directory;
+
+import com.orbekk.same.http.ServerContainer;
+
+public class DirectoryApp {
+    public static final int DISCOVERY_PORT = 15072;
+    
+    public static void main(String[] args) {
+        /**
+         * TODO: Need to move DiscoveryService to same project.
+         */
+    }
+}
diff --git a/directory/src/main/java/com/orbekk/same/directory/DirectoryServiceImpl.java b/directory/src/main/java/com/orbekk/same/directory/DirectoryServiceImpl.java
new file mode 100644
index 0000000..8c6c6b9
--- /dev/null
+++ b/directory/src/main/java/com/orbekk/same/directory/DirectoryServiceImpl.java
@@ -0,0 +1,43 @@
+package com.orbekk.same.directory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.orbekk.same.discovery.DirectoryService;
+
+public class DirectoryServiceImpl implements DirectoryService {
+    public final static long EXPIRE_TIME = 15 * 60l * 1000;  // 15 minutes
+    List<NetworkEntry> networkList = new ArrayList<NetworkEntry>();
+    
+    synchronized void cleanNetworkList() {
+        long expiredTime = System.currentTimeMillis() - EXPIRE_TIME;
+        for (Iterator<NetworkEntry> it = networkList.iterator(); it.hasNext();) {
+            NetworkEntry e = it.next();
+            if (e.hasExpired(expiredTime)) {
+                it.remove();
+            }
+        }
+    }
+
+    @Override
+    public List<String> getNetworks() throws Exception {
+        cleanNetworkList();
+        List<String> networks = new ArrayList<String>();
+        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);
+    }
+}
diff --git a/directory/src/main/java/com/orbekk/same/directory/NetworkEntry.java b/directory/src/main/java/com/orbekk/same/directory/NetworkEntry.java
new file mode 100644
index 0000000..cac21cc
--- /dev/null
+++ b/directory/src/main/java/com/orbekk/same/directory/NetworkEntry.java
@@ -0,0 +1,30 @@
+package com.orbekk.same.directory;
+
+public class NetworkEntry {
+    public String networkName;
+    public String masterUrl;
+    private long lastRegisteredMillis = -1;
+    
+    public NetworkEntry(String networkName, String masterUrl) {
+        this.networkName = networkName;
+        this.masterUrl = masterUrl;
+    }
+
+    public void register(long registeredTime) {
+        lastRegisteredMillis = registeredTime;
+    }
+    
+    public boolean hasExpired(long latestValidTimeMillis) {
+        return lastRegisteredMillis < latestValidTimeMillis;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other instanceof NetworkEntry) {
+            NetworkEntry otherEntry = (NetworkEntry)other;
+            return networkName.equals(otherEntry.networkName) &&
+                    masterUrl.equals(otherEntry.masterUrl);
+        }
+        return false;
+    }
+}
diff --git a/directory/src/test/java/com/orbekk/same/discovery/NetworkEntryTest.java b/directory/src/test/java/com/orbekk/same/discovery/NetworkEntryTest.java
new file mode 100644
index 0000000..455de90
--- /dev/null
+++ b/directory/src/test/java/com/orbekk/same/discovery/NetworkEntryTest.java
@@ -0,0 +1,27 @@
+package com.orbekk.same.discovery;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.orbekk.same.directory.NetworkEntry;
+
+public class NetworkEntryTest {
+    @Test
+    public void testExpiry() {
+        NetworkEntry entry = new NetworkEntry("NetworkA", "UrlA");
+        entry.register(100);
+        assertFalse(entry.hasExpired(50));
+        assertTrue(entry.hasExpired(101));
+    }
+    
+    @Test
+    public void testRegister() {
+        NetworkEntry entry = new NetworkEntry("NetworkB", "UrlB");
+        long time = 1000000000000l;
+        entry.register(time);
+        assertTrue(entry.hasExpired(time+1));
+        entry.register(time + 1000);
+        assertFalse(entry.hasExpired(time + 500));
+    }
+}
-- 
cgit v1.2.3