Author: rezan
Date: Wed Jul 23 22:36:04 2014
New Revision: 1612964
URL: http://svn.apache.org/r1612964
Log:
cleanup
Removed:
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/Util.java
Modified:
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/data/Device.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Pattern.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
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=1612964&r1=1612963&r2=1612964&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
Wed Jul 23 22:36:04 2014
@@ -26,10 +26,11 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.devicemap.data.Device;
+import org.apache.devicemap.data.Device;
import org.apache.devicemap.loader.LoaderOption;
import org.apache.devicemap.data.DeviceType;
+import org.apache.devicemap.data.Pattern;
import org.apache.devicemap.loader.LoaderFactory;
public class DeviceMapClient {
@@ -48,9 +49,9 @@ public class DeviceMapClient {
devices = null;
patterns = null;
Map<String, String> uAttributes = new HashMap<String, String>();
- uAttributes.put("id", Constants.UNKNOWN_ID);
+ uAttributes.put("id", Device.UNKNOWN_ID);
uAttributes = Collections.unmodifiableMap(uAttributes);
- unknown = new Device(Constants.UNKNOWN_ID, uAttributes);
+ unknown = new Device(Device.UNKNOWN_ID, uAttributes);
}
public void initDeviceData(LoaderOption option) throws IOException {
@@ -110,7 +111,7 @@ public class DeviceMapClient {
return null;
}
- LOG.log(Level.FINE, "classify: '" + text + "'");
+ LOG.log(Level.FINE, "classify: ''{0}''", text);
String[] parts = text.split(" |-|_|/|\\\\|\\[|\\]|\\(|\\)|;");
@@ -122,7 +123,7 @@ public class DeviceMapClient {
continue;
}
- pattern += Util.normalize(parts[i + j]);
+ pattern += Pattern.normalize(parts[i + j]);
List<DeviceType> dlist = patterns.get(pattern);
@@ -130,7 +131,7 @@ public class DeviceMapClient {
hits.put(pattern, dlist);
for (DeviceType device : dlist) {
- LOG.log(Level.FINER, "Hit found: '" + pattern + "' =>
id: '" + device.getId() + "' " + device.getPatterns());
+ LOG.log(Level.FINER, "Hit found: ''{0}'' => id:
''{1}'' {2}", new Object[]{pattern, device.getId(), device.getPatterns()});
}
}
}
@@ -143,7 +144,7 @@ public class DeviceMapClient {
continue;
}
- LOG.log(Level.FINER, "Hit candidate: " + hit + " => " +
device.getId());
+ LOG.log(Level.FINER, "Hit candidate: {0} => {1}", new
Object[]{hit, device.getId()});
if (winner != null) {
if ("simple".equals(winner.getType()) &&
!"simple".equals(device.getType())) {
@@ -162,7 +163,7 @@ public class DeviceMapClient {
}
if (winner != null) {
- LOG.log(Level.FINE, "Result: " + winner);
+ LOG.log(Level.FINE, "Result: {0}", winner);
return winner.getAttributes();
} else {
return null;
@@ -196,8 +197,8 @@ public class DeviceMapClient {
return -1;
}
long count=0;
- for(List<DeviceType> devices:patterns.values()) {
- count+=devices.size();
+ for(List<DeviceType> pDevices:patterns.values()) {
+ count+=pDevices.size();
}
return count;
}
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=1612964&r1=1612963&r2=1612964&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
Wed Jul 23 22:36:04 2014
@@ -26,7 +26,6 @@ import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.devicemap.Constants;
import org.apache.devicemap.DeviceMapClient;
import org.apache.devicemap.data.Device;
import org.apache.devicemap.loader.LoaderOption;
@@ -36,7 +35,7 @@ public class Main {
public static void main(String[] args) throws Exception {
- System.out.println("DeviceMap Java Client " + Constants.VERSION);
+ System.out.println("DeviceMap Java Client " +
DeviceMapClient.class.getPackage().getImplementationVersion());
if(args.length == 0) {
System.out.println("Usage: -h for help");
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Device.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Device.java?rev=1612964&r1=1612963&r2=1612964&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Device.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Device.java
Wed Jul 23 22:36:04 2014
@@ -23,6 +23,8 @@ import org.apache.devicemap.loader.parse
public class Device {
+ public static final String UNKNOWN_ID = "unknown";
+
private final String id;
private final Map<String, String> attributes;
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Pattern.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Pattern.java?rev=1612964&r1=1612963&r2=1612964&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Pattern.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/data/Pattern.java
Wed Jul 23 22:36:04 2014
@@ -90,4 +90,27 @@ public class Pattern {
return found;
}
+ /*
+ * normalizes a pattern
+ */
+ public static String normalize(String p) {
+ if (p == null) {
+ return p;
+ }
+
+ p = p.toLowerCase().trim();
+
+ p = p.replaceAll("\\[bb\\]", "b");
+
+ StringBuilder ret = new StringBuilder();
+
+ for (int i = 0; i < p.length(); i++) {
+ Character c = p.charAt(i);
+ if (Character.isLetter(c) || Character.isDigit(c)) {
+ ret.append(c);
+ }
+ }
+
+ return ret.toString();
+ }
}
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java?rev=1612964&r1=1612963&r2=1612964&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
Wed Jul 23 22:36:04 2014
@@ -30,9 +30,8 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.devicemap.Constants;
import org.apache.devicemap.data.DeviceType;
-import org.apache.devicemap.Util;
+import org.apache.devicemap.data.Pattern;
import org.apache.devicemap.loader.Loader;
import org.apache.devicemap.loader.Resource;
import org.apache.devicemap.loader.parser.XMLParser;
@@ -40,6 +39,11 @@ import org.apache.devicemap.loader.parse
public class DDRLoader implements Loader {
private final static Logger LOG =
Logger.getLogger(DDRLoader.class.getName());
+
+ private static final String DEVICE_DATA = "DeviceDataSource.xml";
+ private static final String DEVICE_DATA_PATCH =
"DeviceDataSourcePatch.xml";
+ private static final String BUILDER_DATA = "BuilderDataSource.xml";
+ private static final String BUILDER_DATA_PATCH =
"BuilderDataSourcePatch.xml";
private final Map<String, DeviceType> devices;
@@ -54,48 +58,48 @@ public class DDRLoader implements Loader
public Map<String, DeviceType> getData() throws IOException {
long start = System.currentTimeMillis();
- BufferedReader ddin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(Constants.DEVICE_DATA), "UTF-8"));
+ BufferedReader ddin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(DEVICE_DATA), "UTF-8"));
loadDeviceData(ddin);
ddin.close();
long diff = System.currentTimeMillis() - start;
- LOG.log(Level.FINE, "Loaded " + Constants.DEVICE_DATA + " in " + diff
+ "ms");
+ LOG.log(Level.FINE, "Loaded " + DEVICE_DATA + " in {0}ms", diff);
try {
start = System.currentTimeMillis();
- BufferedReader ddpin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(Constants.DEVICE_DATA_PATCH),
"UTF-8"));
+ BufferedReader ddpin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(DEVICE_DATA_PATCH), "UTF-8"));
loadDeviceData(ddpin);
ddpin.close();
diff = System.currentTimeMillis() - start;
- LOG.log(Level.FINE, "Loaded " + Constants.DEVICE_DATA_PATCH + " in
" + diff + "ms");
+ LOG.log(Level.FINE, "Loaded " + DEVICE_DATA_PATCH + " in {0}ms",
diff);
} catch (FileNotFoundException ex) {
- LOG.log(Level.WARNING, "File not found " +
Constants.DEVICE_DATA_PATCH + ": " + ex.toString());
+ LOG.log(Level.WARNING, "File not found " + DEVICE_DATA_PATCH + ":
{0}", ex.toString());
}
setParentAttributes();
start = System.currentTimeMillis();
- BufferedReader bin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(Constants.BUILDER_DATA), "UTF-8"));
+ BufferedReader bin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(BUILDER_DATA), "UTF-8"));
loadDevicePatterns(bin);
bin.close();
diff = System.currentTimeMillis() - start;
- LOG.log(Level.FINE, "Loaded " + Constants.BUILDER_DATA + " in " + diff
+ "ms");
+ LOG.log(Level.FINE, "Loaded " + BUILDER_DATA + " in {0}ms", diff);
try {
start = System.currentTimeMillis();
- BufferedReader bpin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(Constants.BUILDER_DATA_PATCH),
"UTF-8"));
+ BufferedReader bpin = new BufferedReader(new
InputStreamReader(resourceLoader.getResource(BUILDER_DATA_PATCH), "UTF-8"));
loadDevicePatterns(bpin);
bpin.close();
diff = System.currentTimeMillis() - start;
- LOG.log(Level.FINE, "Loaded " + Constants.BUILDER_DATA_PATCH + "
in " + diff + "ms");
+ LOG.log(Level.FINE, "Loaded " + BUILDER_DATA_PATCH + " in {0}ms",
diff);
} catch (FileNotFoundException ex) {
- LOG.log(Level.WARNING, "File not found " +
Constants.BUILDER_DATA_PATCH + ": " + ex.toString());
+ LOG.log(Level.WARNING, "File not found " + BUILDER_DATA_PATCH + ":
{0}", ex.toString());
}
return getDevices();
@@ -188,7 +192,7 @@ public class DDRLoader implements Loader
device.setType("weak");
}
} else {
- LOG.log(Level.FINE, "ERROR: device not found: '" + id +
"'");
+ LOG.log(Level.FINE, "ERROR: device not found: ''{0}''",
id);
}
//reset the device
@@ -197,7 +201,7 @@ public class DDRLoader implements Loader
patterns = new ArrayList<String>();
} else if (tag.equals("<value>")) {
//add the pattern to the device
- String pattern = Util.normalize(parser.getTagValue());
+ String pattern = Pattern.normalize(parser.getTagValue());
if (pattern.isEmpty()) {
continue;
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java?rev=1612964&r1=1612963&r2=1612964&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
Wed Jul 23 22:36:04 2014
@@ -18,10 +18,9 @@
*/
package org.apache.devicemap;
-import org.apache.devicemap.data.Device;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.devicemap.data.Device;
import org.apache.devicemap.loader.LoaderOption;
import org.junit.BeforeClass;
@@ -53,11 +52,11 @@ public class DeviceMapClientUnitTest {
public void DeviceMapClientUnknownTest() throws Exception {
Device device = client.classifyDevice("");
- Assert.assertEquals("test ua not unknown", Constants.UNKNOWN_ID,
device.getId());
+ Assert.assertEquals("test ua not unknown", Device.UNKNOWN_ID,
device.getId());
device = client.classifyDevice(null);
- Assert.assertEquals("test ua not unknown", Constants.UNKNOWN_ID,
device.getId());
+ Assert.assertEquals("test ua not unknown", Device.UNKNOWN_ID,
device.getId());
}
@Test
@@ -82,7 +81,7 @@ public class DeviceMapClientUnitTest {
public void DeviceMapClientMutateUnknownTest() throws Exception {
Device device = client.classifyDevice("unknown");
- Assert.assertEquals("test ua not unknown", Constants.UNKNOWN_ID,
device.getId());
+ Assert.assertEquals("test ua not unknown", Device.UNKNOWN_ID,
device.getId());
try {
device.getAttributes().put("mutate", "true");
