git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
087a6e8
)
Merge master back into subtree
author
Niki Roo
<niki@nikiroo.be>
Mon, 6 Apr 2020 10:29:59 +0000
(12:29 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Mon, 6 Apr 2020 10:29:59 +0000
(12:29 +0200)
CacheMemory.java
patch
|
blob
|
blame
|
history
diff --git
a/CacheMemory.java
b/CacheMemory.java
index 232b63247f9ab0ccd9f20da405d33d4a0171adb8..de4fae3892568662fd808a96a4896eb564678ddf 100644
(file)
--- a/
CacheMemory.java
+++ b/
CacheMemory.java
@@
-1,5
+1,6
@@
package be.nikiroo.utils;
package be.nikiroo.utils;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@
-12,12
+13,13
@@
import java.util.Map;
* @author niki
*/
public class CacheMemory extends Cache {
* @author niki
*/
public class CacheMemory extends Cache {
- private Map<String, byte[]> data
= new HashMap<String, byte[]>()
;
+ private Map<String, byte[]> data;
/**
* Create a new {@link CacheMemory}.
*/
public CacheMemory() {
/**
* Create a new {@link CacheMemory}.
*/
public CacheMemory() {
+ data = new HashMap<String, byte[]>();
}
@Override
}
@Override
@@
-44,7
+46,7
@@
public class CacheMemory extends Cache {
@Override
public InputStream load(String uniqueID, boolean allowTooOld, boolean stable) {
if (check(uniqueID, allowTooOld, stable)) {
@Override
public InputStream load(String uniqueID, boolean allowTooOld, boolean stable) {
if (check(uniqueID, allowTooOld, stable)) {
- return load(
uniqueID, allowTooOld, stable
);
+ return load(
getKey(uniqueID)
);
}
return null;
}
return null;
@@
-53,7
+55,7
@@
public class CacheMemory extends Cache {
@Override
public InputStream load(URL url, boolean allowTooOld, boolean stable) {
if (check(url, allowTooOld, stable)) {
@Override
public InputStream load(URL url, boolean allowTooOld, boolean stable) {
if (check(url, allowTooOld, stable)) {
- return load(
url, allowTooOld, stable
);
+ return load(
getKey(url)
);
}
return null;
}
return null;
@@
-86,24
+88,37
@@
public class CacheMemory extends Cache {
/**
* Return a key mapping to the given unique ID.
*
/**
* Return a key mapping to the given unique ID.
*
- * @param uniqueID
- * the unique ID
+ * @param uniqueID the unique ID
*
* @return the key
*/
private String getKey(String uniqueID) {
*
* @return the key
*/
private String getKey(String uniqueID) {
- return "
_/
" + uniqueID;
+ return "
UID:
" + uniqueID;
}
/**
* Return a key mapping to the given urm.
*
}
/**
* Return a key mapping to the given urm.
*
- * @param url
- * thr url
+ * @param url the url
*
* @return the key
*/
private String getKey(URL url) {
*
* @return the key
*/
private String getKey(URL url) {
- return url.toString();
+ return "URL:" + url.toString();
+ }
+
+ /**
+ * Load the given key.
+ *
+ * @param key the key to load
+ * @return the loaded data
+ */
+ private InputStream load(String key) {
+ byte[] data = this.data.get(key);
+ if (data != null) {
+ return new ByteArrayInputStream(data);
+ }
+
+ return null;
}
}
}
}