diff options
Diffstat (limited to 'directory')
5 files changed, 228 insertions, 0 deletions
diff --git a/directory/pom.xml b/directory/pom.xml new file mode 100644 index 0000000..b8d11f2 --- /dev/null +++ b/directory/pom.xml @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>com.orbekk.same.directory</groupId> + <artifactId>discovery-server</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>same</name> + <url>http://github.com/orbekk/master</url> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <repositories> + <repository> + <id>jsonrpc3j-webdav-maven-repo</id> + <name>jsonrpc4j maven repository</name> + <url>http://jsonrpc4j.googlecode.com/svn/maven/repo/</url> + <layout>default</layout> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>com.googlecode</groupId> + <artifactId>jsonrpc4j</artifactId> + <version>0.18</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.7.5</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.4</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.4</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>8.0.0.M3</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>8.0.0.M3</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>tjws</artifactId> + <version>2.3.1.GA</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.1.2</version> + </dependency> + <dependency> + <groupId>com.orbekk</groupId> + <artifactId>same</artifactId> + <version>0.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>com.orbekk.same.App</mainClass> + </manifest> + </archive> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> +</project> 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)); + } +} |