[jbosscache-commits] JBoss Cache SVN: r7725 - in core/branches/flat/src: main/java/org/horizon/loader/decorators and 5 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Wed Feb 18 12:32:24 EST 2009
Author: manik.surtani at jboss.com
Date: 2009-02-18 12:32:24 -0500 (Wed, 18 Feb 2009)
New Revision: 7725
Modified:
core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java
core/branches/flat/src/main/java/org/horizon/loader/decorators/AbstractDelegatingStore.java
core/branches/flat/src/main/java/org/horizon/loader/decorators/ChainingCacheStore.java
core/branches/flat/src/main/java/org/horizon/loader/decorators/ReadOnlyStore.java
core/branches/flat/src/main/java/org/horizon/loader/decorators/SingletonStore.java
core/branches/flat/src/main/java/org/horizon/loader/file/FileCacheStore.java
core/branches/flat/src/main/java/org/horizon/loader/jdbc/JDBCCacheStore.java
core/branches/flat/src/test/java/org/horizon/loader/BaseCacheStoreTest.java
core/branches/flat/src/test/java/org/horizon/loader/decorators/ChainingCacheLoaderTest.java
core/branches/flat/src/test/java/org/horizon/loader/decorators/ReadOnlyCacheStoreTest.java
core/branches/flat/src/test/java/org/horizon/loader/dummy/DummyInMemoryCacheStore.java
Log:
Better naming for streaming API in CacheStore
Modified: core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -26,18 +26,18 @@
/**
* Writes contents of the stream to the store. Implementations should expect that the stream contains data in an
- * implementation-specific format, typically generated using {@link #load(java.io.OutputStream)}. While not a
+ * implementation-specific format, typically generated using {@link #toStream(java.io.OutputStream)}. While not a
* requirement, it is recommended that implementations make use of the {@link org.horizon.marshall.Marshaller} when
* dealing with the stream to make use of efficient marshalling.
*
* @param inputStream stream to read from
* @throws CacheLoaderException in the event of problems writing to the store
*/
- void store(InputStream inputStream) throws CacheLoaderException;
+ void fromStream(InputStream inputStream) throws CacheLoaderException;
/**
* Loads the entire state into a stream, using whichever format is most efficient for the cache loader
- * implementation. Typically read and parsed by {@link #store(java.io.InputStream)}.
+ * implementation. Typically read and parsed by {@link #fromStream(java.io.InputStream)}.
* <p/>
* While not a requirement, it is recommended that implementations make use of the {@link
* org.horizon.marshall.Marshaller} when dealing with the stream to make use of efficient marshalling.
@@ -45,7 +45,7 @@
* @param outputStream stream to write to
* @throws CacheLoaderException in the event of problems reading from the store
*/
- void load(OutputStream outputStream) throws CacheLoaderException;
+ void toStream(OutputStream outputStream) throws CacheLoaderException;
/**
* Clears all entries in the store
Modified: core/branches/flat/src/main/java/org/horizon/loader/decorators/AbstractDelegatingStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/decorators/AbstractDelegatingStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/decorators/AbstractDelegatingStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -42,12 +42,12 @@
delegate.store(ed);
}
- public void store(InputStream inputStream) throws CacheLoaderException {
- delegate.store(inputStream);
+ public void fromStream(InputStream inputStream) throws CacheLoaderException {
+ delegate.fromStream(inputStream);
}
- public void load(OutputStream outputStream) throws CacheLoaderException {
- delegate.load(outputStream);
+ public void toStream(OutputStream outputStream) throws CacheLoaderException {
+ delegate.toStream(outputStream);
}
public void clear() throws CacheLoaderException {
Modified: core/branches/flat/src/main/java/org/horizon/loader/decorators/ChainingCacheStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/decorators/ChainingCacheStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/decorators/ChainingCacheStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -39,22 +39,22 @@
for (CacheStore s : stores.keySet()) s.store(ed);
}
- public void store(InputStream inputStream) throws CacheLoaderException {
+ public void fromStream(InputStream inputStream) throws CacheLoaderException {
// loading and storing state via streams is *only* supported on the *first* store that has fetchPersistentState set.
for (Map.Entry<CacheStore, CacheLoaderConfig> e : stores.entrySet()) {
if (e.getValue().isFetchPersistentState()) {
- e.getKey().store(inputStream);
+ e.getKey().fromStream(inputStream);
// do NOT continue this for other stores, since the stream will not be in an appropriate state anymore
break;
}
}
}
- public void load(OutputStream outputStream) throws CacheLoaderException {
+ public void toStream(OutputStream outputStream) throws CacheLoaderException {
// loading and storing state via streams is *only* supported on the *first* store that has fetchPersistentState set.
for (Map.Entry<CacheStore, CacheLoaderConfig> e : stores.entrySet()) {
if (e.getValue().isFetchPersistentState()) {
- e.getKey().load(outputStream);
+ e.getKey().toStream(outputStream);
// do NOT continue this for other stores, since the stream will not be in an appropriate state anymore
break;
}
Modified: core/branches/flat/src/main/java/org/horizon/loader/decorators/ReadOnlyStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/decorators/ReadOnlyStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/decorators/ReadOnlyStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -27,7 +27,7 @@
}
@Override
- public void store(InputStream inputStream) {
+ public void fromStream(InputStream inputStream) {
// no-op
}
Modified: core/branches/flat/src/main/java/org/horizon/loader/decorators/SingletonStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/decorators/SingletonStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/decorators/SingletonStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -112,8 +112,8 @@
}
@Override
- public void store(InputStream inputStream) throws CacheLoaderException {
- if (active) super.store(inputStream);
+ public void fromStream(InputStream inputStream) throws CacheLoaderException {
+ if (active) super.fromStream(inputStream);
}
@Override
Modified: core/branches/flat/src/main/java/org/horizon/loader/file/FileCacheStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/file/FileCacheStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/file/FileCacheStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -177,7 +177,7 @@
}
}
- public void store(InputStream inputStream) throws CacheLoaderException {
+ public void fromStream(InputStream inputStream) throws CacheLoaderException {
ObjectInputStream ois = null;
try {
// first clear all local state
@@ -219,7 +219,7 @@
}
}
- public void load(OutputStream outputStream) throws CacheLoaderException {
+ public void toStream(OutputStream outputStream) throws CacheLoaderException {
ObjectOutputStream oos = null;
try {
acquireGlobalLock(true);
Modified: core/branches/flat/src/main/java/org/horizon/loader/jdbc/JDBCCacheStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/jdbc/JDBCCacheStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/main/java/org/horizon/loader/jdbc/JDBCCacheStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -21,11 +21,11 @@
// TODO: Manik: Customise this generated block
}
- public void store(InputStream inputStream) {
+ public void fromStream(InputStream inputStream) {
// TODO: Manik: Customise this generated block
}
- public void load(OutputStream outputStream) {
+ public void toStream(OutputStream outputStream) {
// TODO: Manik: Customise this generated block
}
Modified: core/branches/flat/src/test/java/org/horizon/loader/BaseCacheStoreTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/loader/BaseCacheStoreTest.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/test/java/org/horizon/loader/BaseCacheStoreTest.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -247,11 +247,11 @@
cs.store(new StoredEntry("k3", "v3", -1, -1));
ByteArrayOutputStream out = new ByteArrayOutputStream();
- cs.load(out);
+ cs.toStream(out);
out.flush();
out.close();
cs.clear();
- cs.store(new ByteArrayInputStream(out.toByteArray()));
+ cs.fromStream(new ByteArrayInputStream(out.toByteArray()));
Set<StoredEntry> set = cs.loadAll();
Modified: core/branches/flat/src/test/java/org/horizon/loader/decorators/ChainingCacheLoaderTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/loader/decorators/ChainingCacheLoaderTest.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/test/java/org/horizon/loader/decorators/ChainingCacheLoaderTest.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -237,7 +237,7 @@
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(byteStream);
- cs.load(oos);
+ cs.toStream(oos);
oos.close();
byteStream.close();
cs.clear();
@@ -249,7 +249,7 @@
assert !s.containsKey("k2");
}
- cs.store(new ObjectInputStream(new ByteArrayInputStream(byteStream.toByteArray())));
+ cs.fromStream(new ObjectInputStream(new ByteArrayInputStream(byteStream.toByteArray())));
assert cs.containsKey("k1");
assert cs.containsKey("k2");
Modified: core/branches/flat/src/test/java/org/horizon/loader/decorators/ReadOnlyCacheStoreTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/loader/decorators/ReadOnlyCacheStoreTest.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/test/java/org/horizon/loader/decorators/ReadOnlyCacheStoreTest.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -22,7 +22,7 @@
store.purgeExpired();
store.remove("key");
store.store((StoredEntry) null);
- store.store((InputStream) null);
+ store.fromStream((InputStream) null);
store.prepare(null, null, true);
store.commit(null);
store.rollback(null);
Modified: core/branches/flat/src/test/java/org/horizon/loader/dummy/DummyInMemoryCacheStore.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/loader/dummy/DummyInMemoryCacheStore.java 2009-02-18 17:13:31 UTC (rev 7724)
+++ core/branches/flat/src/test/java/org/horizon/loader/dummy/DummyInMemoryCacheStore.java 2009-02-18 17:32:24 UTC (rev 7725)
@@ -36,7 +36,7 @@
}
@SuppressWarnings("unchecked")
- public void store(InputStream inputStream) throws CacheLoaderException {
+ public void fromStream(InputStream inputStream) throws CacheLoaderException {
try {
ObjectInputStream ois = inputStream instanceof ObjectInputStream ? (ObjectInputStream) inputStream :
new ObjectInputStream(inputStream);
@@ -52,7 +52,7 @@
}
}
- public void load(OutputStream outputStream) throws CacheLoaderException {
+ public void toStream(OutputStream outputStream) throws CacheLoaderException {
try {
ObjectOutputStream oos = outputStream instanceof ObjectOutputStream ? (ObjectOutputStream) outputStream :
new ObjectOutputStream(outputStream);
More information about the jbosscache-commits
mailing list