You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/22 00:39:37 UTC
svn commit: r477964 - in /incubator/tuscany/java/sca/services/persistence:
store.jdbc/
store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/
store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/
sto...
Author: jmarino
Date: Tue Nov 21 15:39:36 2006
New Revision: 477964
URL: http://svn.apache.org/viewvc?view=rev&rev=477964
Log:
refactoring of store api
Modified:
incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java
incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml
incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java
incubator/tuscany/java/sca/services/persistence/store/pom.xml
incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml Tue Nov 21 15:39:36 2006
@@ -38,30 +38,23 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.persistence</groupId>
- <artifactId>persistence-datasource</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
- <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java Tue Nov 21 15:39:36 2006
@@ -143,7 +143,7 @@
}
}
- public void updateRecord(SCAObject owner, UUID id, Object object) throws StoreWriteException {
+ public void updateRecord(SCAObject owner, UUID id, Object object, long expiration) throws StoreWriteException {
if (!(object instanceof Serializable)) {
StoreWriteException e = new StoreWriteException("Type must implement serializable");
e.setIdentifier(object.getClass().getName());
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java Tue Nov 21 15:39:36 2006
@@ -37,13 +37,15 @@
private Serializable object;
private long expiration = JDBCStore.NEVER;
private int operation;
+
/**
* Creates a new record
*
* @param ownerId
* @param id the unique id of the record
* @param object the object to serialize
- * @param expiration the expirary time, {@link org.apache.tuscany.service.persistence.store.jdbc.JDBCStore.NEVER} if there is no expiration
+ * @param expiration the expirary time, {@link org.apache.tuscany.service.persistence.store.Store.NEVER} if there is
+ * no expiration
* @param operation an <code>INSERT</code> or <code>UPDATE</code> operation
*/
public Record(String ownerId, UUID id, Serializable object, long expiration, int operation) {
@@ -51,6 +53,7 @@
this.object = object;
this.expiration = expiration;
this.operation = operation;
+ this.ownerId = ownerId;
}
/**
@@ -96,6 +99,14 @@
*/
public int getOperation() {
return operation;
+ }
+
+ public String getOwnerId() {
+ return ownerId;
+ }
+
+ public void setOwnerId(String ownerId) {
+ this.ownerId = ownerId;
}
public int compareTo(Object o) {
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java Tue Nov 21 15:39:36 2006
@@ -24,7 +24,6 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.UUID;
@@ -92,8 +91,7 @@
stmt.setString(OWNER, ownerId);
stmt.setLong(MOST_SIGNIFICANT_BITS, id.getMostSignificantBits());
stmt.setLong(LEAST_SIGNIFICANT_BITS, id.getLeastSignificantBits());
- ResultSet rs = stmt.executeQuery();
- return rs.next();
+ return stmt.executeQuery().next();
} catch (SQLException e) {
throw new StoreWriteException(e);
}
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java Tue Nov 21 15:39:36 2006
@@ -18,21 +18,21 @@
*/
package org.apache.tuscany.service.persistence.store.jdbc;
-import java.util.UUID;
-import java.sql.Statement;
-import java.sql.ResultSet;
import java.io.Serializable;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.UUID;
import javax.sql.DataSource;
import org.apache.tuscany.spi.component.SCAObject;
-import junit.framework.TestCase;
import junit.framework.Assert;
-import org.easymock.EasyMock;
+import junit.framework.TestCase;
+import org.apache.tuscany.service.persistence.store.Store;
+import org.apache.tuscany.service.persistence.store.StoreMonitor;
import org.apache.tuscany.service.persistence.store.jdbc.converter.AbstractConverter;
import org.apache.tuscany.service.persistence.store.jdbc.converter.HSQLDBConverter;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
-import org.apache.tuscany.service.persistence.store.Store;
+import org.easymock.EasyMock;
/**
* Verifies store append operations using HSQLDB
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java Tue Nov 21 15:39:36 2006
@@ -55,8 +55,8 @@
store.appendRecord(owner2, id1, foo2, Store.NEVER);
foo1.data = "testA";
foo2.data = "test2A";
- store.updateRecord(owner1, id1, foo1);
- store.updateRecord(owner2, id1, foo2);
+ store.updateRecord(owner1, id1, foo1, Store.NEVER);
+ store.updateRecord(owner2, id1, foo2, Store.NEVER);
Foo retFoo1 = (Foo) store.readRecord(owner1, id1);
assertEquals("testA", retFoo1.data);
Foo retFoo2 = (Foo) store.readRecord(owner2, id1);
@@ -72,7 +72,7 @@
UUID id = UUID.randomUUID();
store.appendRecord(object, id, foo, NEVER);
foo.data = "test2";
- store.updateRecord(object, id, foo);
+ store.updateRecord(object, id, foo, Store.NEVER);
Foo foo2 = (Foo) store.readRecord(object, id);
assertEquals("test2", foo2.data);
}
Modified: incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml Tue Nov 21 15:39:36 2006
@@ -40,6 +40,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java Tue Nov 21 15:39:36 2006
@@ -90,7 +90,7 @@
map.put(id, new Record(object, expiration));
}
- public void updateRecord(SCAObject owner, UUID id, Object object) throws StoreWriteException {
+ public void updateRecord(SCAObject owner, UUID id, Object object, long expiration) throws StoreWriteException {
Map<UUID, Record> map = store.get(owner);
if (map == null) {
StoreWriteException e = new StoreWriteException("Record not found");
Modified: incubator/tuscany/java/sca/services/persistence/store/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store/pom.xml?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/store/pom.xml Tue Nov 21 15:39:36 2006
@@ -46,6 +46,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java?view=diff&rev=477964&r1=477963&r2=477964
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java Tue Nov 21 15:39:36 2006
@@ -46,7 +46,7 @@
*/
void appendRecord(SCAObject owner, UUID id, Object object, long expiration) throws StoreWriteException;
- void updateRecord(SCAObject owner, UUID id, Object object) throws StoreWriteException;
+ void updateRecord(SCAObject owner, UUID id, Object object, long expiration) throws StoreWriteException;
/**
* Returns the deserialized object in the store corresponding to the given id
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org