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/07 21:57:59 UTC
svn commit: r1608586 - in
/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader:
./ impl/ resource/
Author: rezan
Date: Mon Jul 7 19:57:58 2014
New Revision: 1608586
URL: http://svn.apache.org/r1608586
Log:
refactored loaders into logical units
Added:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Resource.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/NoopLoader.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/UninitializedLoader.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileResource.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarResource.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLResource.java
- copied, changed from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java
Removed:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java?rev=1608586&r1=1608585&r2=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java Mon Jul 7 19:57:58 2014
@@ -18,230 +18,16 @@
*/
package org.apache.devicemap.loader;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import org.apache.devicemap.Constants;
import org.apache.devicemap.data.Device;
-import org.apache.devicemap.Util;
-import org.apache.devicemap.parser.XMLParser;
/**
*
* @author Reza Naghibi
*/
-public class Loader {
+public interface Loader {
- private final Map<String, Device> devices;
-
- private final ResourceLoader resourceLoader;
-
- public Loader(ResourceLoader resourceLoader) {
- devices = new HashMap<String, Device>(5000);
- this.resourceLoader = resourceLoader;
- }
-
- public Map<String, Device> getData() throws IOException {
- long start = System.currentTimeMillis();
-
- BufferedReader ddin = new BufferedReader(new InputStreamReader(resourceLoader.getResource(Constants.DEVICE_DATA), "UTF-8"));
- loadDeviceData(ddin);
- ddin.close();
-
- long diff = System.currentTimeMillis() - start;
- Util.debugLog("Loaded " + Constants.DEVICE_DATA + " in " + diff + "ms");
-
- try {
- start = System.currentTimeMillis();
-
- BufferedReader ddpin = new BufferedReader(new InputStreamReader(resourceLoader.getResource(Constants.DEVICE_DATA_PATCH), "UTF-8"));
- loadDeviceData(ddpin);
- ddpin.close();
-
- diff = System.currentTimeMillis() - start;
- Util.debugLog("Loaded " + Constants.DEVICE_DATA_PATCH + " in " + diff + "ms");
- } catch (FileNotFoundException ex) {
- Util.debugLog("WARNING: file not found " + Constants.DEVICE_DATA_PATCH + ": " + ex.toString());
- }
-
- setParentAttributes();
-
- start = System.currentTimeMillis();
-
- BufferedReader bin = new BufferedReader(new InputStreamReader(resourceLoader.getResource(Constants.BUILDER_DATA), "UTF-8"));
- loadDevicePatterns(bin);
- bin.close();
-
- diff = System.currentTimeMillis() - start;
- Util.debugLog("Loaded " + Constants.BUILDER_DATA + " in " + diff + "ms");
-
- try {
- start = System.currentTimeMillis();
-
- BufferedReader bpin = new BufferedReader(new InputStreamReader(resourceLoader.getResource(Constants.BUILDER_DATA_PATCH), "UTF-8"));
- loadDevicePatterns(bpin);
- bpin.close();
-
- diff = System.currentTimeMillis() - start;
- Util.debugLog("Loaded " + Constants.BUILDER_DATA_PATCH + " in " + diff + "ms");
- } catch (FileNotFoundException ex) {
- Util.debugLog("WARNING: file not found " + Constants.BUILDER_DATA_PATCH + ": " + ex.toString());
- }
-
- return getDevices();
- }
-
- /*
- * loads device data from an InputStreamReader
- */
- private void loadDeviceData(Reader in) throws IOException {
- XMLParser parser = new XMLParser(in);
- String tag;
- Device device = new Device();
- Map<String, String> attributes = new HashMap<String, String>();
-
- while (!(tag = parser.getNextTag()).isEmpty()) {
- //new device found
- if (tag.startsWith("<device ")) {
- device.setId(XMLParser.getAttribute(tag, "id"));
- device.setParentId(XMLParser.getAttribute(tag, "parentId"));
- } else if (tag.equals("</device>")) {
-
- //add the device
- if (device.getId() != null && !device.getId().isEmpty()) {
- attributes.put("id", device.getId());
- device.setAttributes(attributes);
- devices.put(device.getId(), device);
- }
-
- //reset the device
- device = new Device();
- attributes = new HashMap<String, String>();
- } else if (tag.startsWith("<property ")) {
- //add the property to the device
- String key = XMLParser.getAttribute(tag, "name");
- String value = XMLParser.getAttribute(tag, "value");
-
- attributes.put(key, value);
- }
- }
- }
-
- /*
- * loads patterns from an InputStreamReader
- */
- private void loadDevicePatterns(Reader in) throws IOException {
- XMLParser parser = new XMLParser(in);
- String tag;
- String builder = "";
- Device device = null;
- String id = "";
- List<String> patterns = new ArrayList<String>();
-
- while (!(tag = parser.getNextTag()).isEmpty()) {
- //new builder found
- if (tag.startsWith("<builder ")) {
- builder = XMLParser.getAttribute(tag, "class");
-
- if (builder.lastIndexOf(".") >= 0) {
- builder = builder.substring(builder.lastIndexOf(".") + 1);
- }
- } else if (tag.startsWith("<device ")) {
- //new device found
- id = XMLParser.getAttribute(tag, "id");
- device = devices.get(id);
- } else if (tag.equals("</device>")) {
- //add the device
- if (device != null) {
- //TwoStep is an AND pattern, also index the unigram
- if (builder.equals("TwoStepDeviceBuilder")) {
- device.getPatterns().setAndPattern(patterns);
-
- String unigram = "";
-
- for (String pattern : patterns) {
- if (pattern.contains(unigram)) {
- unigram = pattern;
- } else {
- unigram += pattern;
- }
- }
-
- device.getPatterns().setPattern(unigram);
- } else {
- device.getPatterns().setOrPattern(patterns);
- }
-
- if (builder.equals("SimpleDeviceBuilder")) {
- device.setType("simple");
- } else {
- device.setType("weak");
- }
- } else {
- Util.debugLog("ERROR: device not found: '" + id + "'");
- }
-
- //reset the device
- device = null;
- id = "";
- patterns = new ArrayList<String>();
- } else if (tag.equals("<value>")) {
- //add the pattern to the device
- String pattern = Util.normalize(parser.getTagValue());
-
- if (pattern.isEmpty()) {
- continue;
- }
-
- patterns.add(pattern);
- }
- }
- }
-
- /**
- * Sets attributes from parents
- */
- private void setParentAttributes() {
- for (Device device : devices.values()) {
- mergeParent(device);
- }
- }
-
- private void mergeParent(Device device) {
- String parentId = device.getParentId();
-
- if (parentId == null) {
- return;
- }
-
- Device parent = devices.get(parentId);
-
- if (parent == null) {
- return;
- }
-
- mergeParent(parent);
-
- for (String key : parent.getAttributes().keySet()) {
- String value = parent.getAttributes().get(key);
-
- if (!device.getAttributes().containsKey(key)) {
- device.getAttributes().put(key, value);
- }
- }
- }
-
- /**
- * @return the devices
- */
- private Map<String, Device> getDevices() {
- return devices;
- }
+ public Map<String, Device> getData() throws IOException;
}
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java?rev=1608586&r1=1608585&r2=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java Mon Jul 7 19:57:58 2014
@@ -20,11 +20,12 @@
package org.apache.devicemap.loader;
import org.apache.devicemap.DeviceMapClient.LoaderOption;
-import org.apache.devicemap.loader.resource.JarLoader;
-import org.apache.devicemap.loader.resource.FileLoader;
-import org.apache.devicemap.loader.resource.NoopLoader;
-import org.apache.devicemap.loader.resource.URLLoader;
-import org.apache.devicemap.loader.resource.UninitializedLoader;
+import org.apache.devicemap.loader.impl.DDRLoader;
+import org.apache.devicemap.loader.resource.JarResource;
+import org.apache.devicemap.loader.resource.FileResource;
+import org.apache.devicemap.loader.impl.NoopLoader;
+import org.apache.devicemap.loader.resource.URLResource;
+import org.apache.devicemap.loader.impl.UninitializedLoader;
/**
*
@@ -36,13 +37,13 @@ public class LoaderFactory {
public static Loader getLoader(LoaderOption option, String path) {
switch (option) {
case JAR: {
- return new Loader(new JarLoader(path));
+ return new DDRLoader(new JarResource(path));
}
case FOLDER: {
- return new Loader(new FileLoader(path));
+ return new DDRLoader(new FileResource(path));
}
case URL: {
- return new Loader(new URLLoader(path));
+ return new DDRLoader(new URLResource(path));
}
case NOOP: {
return new NoopLoader();
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Resource.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Resource.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Resource.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Resource.java Mon Jul 7 19:57:58 2014
@@ -21,7 +21,7 @@ package org.apache.devicemap.loader;
import java.io.IOException;
import java.io.InputStream;
-public interface ResourceLoader {
+public interface Resource {
public InputStream getResource(String file) throws IOException;
}
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java Mon Jul 7 19:57:58 2014
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loader;
+package org.apache.devicemap.loader.impl;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
@@ -31,23 +31,26 @@ import java.util.Map;
import org.apache.devicemap.Constants;
import org.apache.devicemap.data.Device;
import org.apache.devicemap.Util;
+import org.apache.devicemap.loader.Loader;
+import org.apache.devicemap.loader.Resource;
import org.apache.devicemap.parser.XMLParser;
/**
*
* @author Reza Naghibi
*/
-public class Loader {
+public class DDRLoader implements Loader {
private final Map<String, Device> devices;
- private final ResourceLoader resourceLoader;
+ private final Resource resourceLoader;
- public Loader(ResourceLoader resourceLoader) {
+ public DDRLoader(Resource resourceLoader) {
devices = new HashMap<String, Device>(5000);
this.resourceLoader = resourceLoader;
}
+ @Override
public Map<String, Device> getData() throws IOException {
long start = System.currentTimeMillis();
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/NoopLoader.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/NoopLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/NoopLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/NoopLoader.java Mon Jul 7 19:57:58 2014
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loader.resource;
+package org.apache.devicemap.loader.impl;
import java.io.IOException;
import java.util.Collections;
@@ -30,11 +30,7 @@ import org.apache.devicemap.loader.Loade
* @author kalyanar
* @author Reza Naghibi
*/
-public class NoopLoader extends Loader {
-
- public NoopLoader() {
- super(null);
- }
+public class NoopLoader implements Loader {
@Override
public Map<String, Device> getData() throws IOException {
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/UninitializedLoader.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/UninitializedLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/UninitializedLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/UninitializedLoader.java Mon Jul 7 19:57:58 2014
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loader.resource;
+package org.apache.devicemap.loader.impl;
import java.io.IOException;
import java.util.Map;
@@ -28,11 +28,7 @@ import org.apache.devicemap.loader.Loade
*
* @author Reza Naghibi
*/
-public class UninitializedLoader extends Loader {
-
- public UninitializedLoader() {
- super(null);
- }
+public class UninitializedLoader implements Loader {
@Override
public Map<String, Device> getData() throws IOException {
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileResource.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileResource.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileResource.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileResource.java Mon Jul 7 19:57:58 2014
@@ -23,19 +23,19 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.devicemap.loader.ResourceLoader;
+import org.apache.devicemap.loader.Resource;
/**
*
* @author Reza Naghibi
*/
-public class FileLoader implements ResourceLoader {
+public class FileResource implements Resource {
private static final String DEFAULT_PATH = "";
private final String path;
- public FileLoader(String path) {
+ public FileResource(String path) {
if (path == null) {
this.path = DEFAULT_PATH;
} else if (path.isEmpty()) {
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarResource.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarResource.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarResource.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarResource.java Mon Jul 7 19:57:58 2014
@@ -22,20 +22,20 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.devicemap.loader.ResourceLoader;
+import org.apache.devicemap.loader.Resource;
/**
*
* @author kalyanar
* @author Reza Naghibi
*/
-public class JarLoader implements ResourceLoader {
+public class JarResource implements Resource {
private static final String DEFAULT_PATH = "/devicedata/";
private final String path;
- public JarLoader(String path) {
+ public JarResource(String path) {
if (path == null) {
this.path = DEFAULT_PATH;
} else {
@@ -47,7 +47,7 @@ public class JarLoader implements Resour
public InputStream getResource(String file) throws IOException {
String rpath = path + file;
- InputStream in = JarLoader.class.getResourceAsStream(rpath);
+ InputStream in = JarResource.class.getResourceAsStream(rpath);
if (in == null) {
throw new FileNotFoundException("Jar resource not found: " + path);
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLResource.java (from r1608583, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLResource.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLResource.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java&r1=1608583&r2=1608586&rev=1608586&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLResource.java Mon Jul 7 19:57:58 2014
@@ -4,7 +4,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.apache.devicemap.loader.ResourceLoader;
+import org.apache.devicemap.loader.Resource;
/**
*
@@ -12,14 +12,14 @@ import org.apache.devicemap.loader.Resou
* @author Reza Naghibi
*
*/
-public class URLLoader implements ResourceLoader {
+public class URLResource implements Resource {
//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 String path;
- public URLLoader(String path) {
+ public URLResource(String path) {
if (path == null) {
this.path = DEFAULT_PATH;
} else {