You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2014/07/05 18:47:34 UTC
svn commit: r1608056 - in
/incubator/devicemap/trunk/devicemap/java/classifier/src:
main/java/org/apache/devicemap/ main/java/org/apache/devicemap/cmd/
main/java/org/apache/devicemap/loaders/types/ main/resources/
test/java/org/apache/devicemap/
Author: rezan
Date: Sat Jul 5 16:47:33 2014
New Revision: 1608056
URL: http://svn.apache.org/r1608056
Log:
classify does not return null
Added:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/resources/
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Constants.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/cmd/Main.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientTest.java
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Constants.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Constants.java?rev=1608056&r1=1608055&r2=1608056&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Constants.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/Constants.java Sat Jul 5 16:47:33 2014
@@ -32,4 +32,6 @@ public class Constants {
public static final String BUILDER_DATA = "BuilderDataSource.xml";
public static final String BUILDER_DATA_PATCH = "BuilderDataSourcePatch.xml";
+ public static final String UNKNOWN_ID = "unknown";
+
}
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java?rev=1608056&r1=1608055&r2=1608056&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java Sat Jul 5 16:47:33 2014
@@ -21,6 +21,7 @@ package org.apache.devicemap;
import org.apache.devicemap.data.Device;
import org.apache.devicemap.loaders.LoaderFactory;
import org.apache.devicemap.loaders.LoaderFactory.LoaderOption;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -33,7 +34,7 @@ import java.util.Map;
* @author Werner Keil
*/
public class DeviceMapClient {
-
+
//indexes
private Map<String, Device> devices;
private Map<String, List<Device>> patterns;
@@ -91,7 +92,7 @@ public class DeviceMapClient {
String winnerStr = "";
if (text == null) {
- return null;
+ return getUnknownDevice();
}
Util.debugLog("classify: '" + text + "'");
@@ -145,12 +146,17 @@ public class DeviceMapClient {
if (winner != null) {
Util.debugLog("Result: " + winner);
-
return winner.getAttributes();
} else {
- return null;
+ return getUnknownDevice();
}
}
+
+ private Map<String, String> getUnknownDevice() {
+ Map<String, String> unknown = new HashMap<String, String>();
+ unknown.put("id", Constants.UNKNOWN_ID);
+ return unknown;
+ }
public int getDeviceCount() {
if (devices == null) {
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/cmd/Main.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/cmd/Main.java?rev=1608056&r1=1608055&r2=1608056&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/cmd/Main.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/cmd/Main.java Sat Jul 5 16:47:33 2014
@@ -93,7 +93,7 @@ public class Main {
long diffn = (System.nanoTime() - startn) / 1000;
- System.out.println("Test lookup: '" + (m != null ? m.get("id") : "unknown") + "' time: " + diffn + "usec");
+ System.out.println("Test lookup: '" + m.get("id") + "' time: " + diffn + "usec");
if (parameter == null) {
} else if ((new File(parameter)).exists()) {
@@ -117,7 +117,7 @@ public class Main {
total += diffn;
count++;
- System.out.println("Text lookup " + count + ": '" + (m != null ? m.get("id") : "unknown") + "' time: " + (diffn / 1000) + "usec");
+ System.out.println("Text lookup " + count + ": '" + m.get("id") + "' time: " + (diffn / 1000) + "usec");
}
in.close();
@@ -138,18 +138,16 @@ public class Main {
diffn = System.nanoTime() - startn;
- System.out.println("Text lookup: '" + (m != null ? m.get("id") : "unknown") + "' time: " + (diffn / 1000) + "usec");
+ System.out.println("Text lookup: '" + m.get("id") + "' time: " + (diffn / 1000) + "usec");
- if (m != null) {
- System.out.print("DeviceMap attributes => ");
+ System.out.print("DeviceMap attributes => ");
- for (String key : m.keySet()) {
- String value = m.get(key);
- System.out.print(key + ": '" + value + "' ");
- }
-
- System.out.println("");
+ for (String key : m.keySet()) {
+ String value = m.get(key);
+ System.out.print(key + ": '" + value + "' ");
}
+
+ System.out.println("");
}
}
}
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java?rev=1608056&r1=1608055&r2=1608056&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java Sat Jul 5 16:47:33 2014
@@ -20,6 +20,7 @@ import org.apache.devicemap.loaders.Reso
*/
public class URLLoader implements ResourceLoader {
+ //TODO: put on CDN of some kind
private static final String DEFAULT_PATH = "http://svn.apache.org/repos/asf/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata";
private final Loader loader;
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientTest.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientTest.java?rev=1608056&r1=1608055&r2=1608056&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientTest.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientTest.java Sat Jul 5 16:47:33 2014
@@ -73,12 +73,6 @@ public class DeviceMapClientTest {
public void DeviceMapClientTest() throws Exception {
Map<String,String> m=client.classify(testString);
- String id="unknown";
-
- if(m!=null) {
- id=m.get("id");
- }
-
- Assert.assertEquals("classification failed for '"+testString+"'", resultId, id);
+ Assert.assertEquals("classification failed for '"+testString+"'", resultId, m.get("id"));
}
}