Menu
▾
▴
[trippi-codewatch] SF.net SVN: trippi:[124] trunk/src
|
From: <pan...@us...> - 2009-11-12 04:51:05
|
Revision: 124
http://trippi.svn.sourceforge.net/trippi/?rev=124&view=rev
Author: pangloss
Date: 2009-11-12 04:50:56 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
source code cleanup: types, missing @overrides, formatting, etc.
Modified Paths:
--------------
trunk/src/java/org/trippi/ConnectorDescriptor.java
trunk/src/java/org/trippi/ConnectorParameter.java
trunk/src/java/org/trippi/RDFUtil.java
trunk/src/java/org/trippi/TripleIterator.java
trunk/src/java/org/trippi/TripleMaker.java
trunk/src/java/org/trippi/TriplePattern.java
trunk/src/java/org/trippi/TripleUpdate.java
trunk/src/java/org/trippi/TriplestoreConnector.java
trunk/src/java/org/trippi/TupleIterator.java
trunk/src/java/org/trippi/config/ConfigUtils.java
trunk/src/java/org/trippi/config/TrippiConfig.java
trunk/src/java/org/trippi/config/TrippiProfile.java
trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java
trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java
trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java
trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java
trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java
trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java
trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java
trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java
trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java
trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java
trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java
trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java
trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java
trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java
trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java
trunk/src/java/org/trippi/impl/mpt/MPTConnector.java
trunk/src/java/org/trippi/impl/mpt/MPTSession.java
trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java
trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java
trunk/src/java/org/trippi/impl/mulgara/RowGroup.java
trunk/src/java/org/trippi/impl/multi/MultiConnector.java
trunk/src/java/org/trippi/impl/oracle/OracleConnector.java
trunk/src/java/org/trippi/impl/oracle/OracleSession.java
trunk/src/java/org/trippi/impl/oracle/OracleTripleIterator.java
trunk/src/java/org/trippi/io/CSVTupleWriter.java
trunk/src/java/org/trippi/io/CountTripleWriter.java
trunk/src/java/org/trippi/io/CountTupleWriter.java
trunk/src/java/org/trippi/io/RIOTripleIterator.java
trunk/src/java/org/trippi/io/RIOTripleWriter.java
trunk/src/java/org/trippi/io/SimpleTupleWriter.java
trunk/src/java/org/trippi/io/SparqlTupleIterator.java
trunk/src/java/org/trippi/io/SparqlTupleWriter.java
trunk/src/java/org/trippi/io/TSVTupleWriter.java
trunk/src/java/org/trippi/io/XMLDeclarationRemover.java
trunk/src/java/org/trippi/nodegraph/NodeGraph.java
trunk/src/java/org/trippi/nodegraph/impl/ArrayUtil.java
trunk/src/java/org/trippi/nodegraph/impl/CountingResultIterator.java
trunk/src/java/org/trippi/nodegraph/impl/NodeGraphImpl.java
trunk/src/java/org/trippi/nodegraph/impl/NodeIterator.java
trunk/src/java/org/trippi/nodegraph/impl/TripleResultsImpl.java
trunk/src/java/org/trippi/server/http/TrippiServlet.java
trunk/src/java/org/trippi/ui/TrippiUI.java
trunk/src/test/org/trippi/TriplestoreConnectorIntegrationTest.java
trunk/src/test/org/trippi/impl/base/MemUpdateBufferUnitTest.java
trunk/src/test/org/trippi/impl/base/UpdateBufferUnitTest.java
trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorIntegrationTest.java
trunk/src/test/org/trippi/impl/mulgara/MulgaraConnectorTest.java
trunk/src/test/org/trippi/io/RIOTripleIteratorTest.java
Modified: trunk/src/java/org/trippi/ConnectorDescriptor.java
===================================================================
--- trunk/src/java/org/trippi/ConnectorDescriptor.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/ConnectorDescriptor.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -46,7 +46,7 @@
JarFile f = new JarFile(new File(jarDir, jarNames[i]));
Enumeration<JarEntry> e = f.entries();
while (e.hasMoreElements()) {
- JarEntry entry = (JarEntry) e.nextElement();
+ JarEntry entry = e.nextElement();
if (entry.getName().endsWith("Descriptor.xml")) {
String c = entry.getName().replaceAll("Descriptor.xml", "");
if (f.getJarEntry(c + ".class") != null) {
@@ -147,7 +147,8 @@
return m_parameters;
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer out = new StringBuffer();
out.append("Connector name : " + m_name + "\n");
out.append(" Description : " + m_description + "\n");
Modified: trunk/src/java/org/trippi/ConnectorParameter.java
===================================================================
--- trunk/src/java/org/trippi/ConnectorParameter.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/ConnectorParameter.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -108,7 +108,8 @@
return out.toString();
}
- public String toString() {
+ @Override
+ public String toString() {
return toString(0);
}
Modified: trunk/src/java/org/trippi/RDFUtil.java
===================================================================
--- trunk/src/java/org/trippi/RDFUtil.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/RDFUtil.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -83,7 +83,7 @@
}
}
} else if (c == '_') {
- Node blankNode = (Node) m_blankMap.get(n);
+ Node blankNode = m_blankMap.get(n);
if (blankNode == null) {
blankNode = createResource();
m_blankMap.put(n, blankNode);
@@ -186,7 +186,8 @@
public FreeBlankNode(Object object) {
m_hashCode = object.hashCode();
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return m_hashCode;
}
public String getID() {
Modified: trunk/src/java/org/trippi/TripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/TripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -206,7 +206,7 @@
try {
GraphElementFactory factory = graph.getElementFactory();
- TIntObjectHashMap nodePool = new TIntObjectHashMap();
+ TIntObjectHashMap<Node> nodePool = new TIntObjectHashMap<Node>();
while (hasNext()) {
@@ -236,11 +236,11 @@
private static Node localize(Node node,
GraphElementFactory factory,
- TIntObjectHashMap nodePool) throws TrippiException {
+ TIntObjectHashMap<Node> nodePool) throws TrippiException {
try {
if (nodePool.containsKey(node.hashCode())) {
- return (Node) nodePool.get(node.hashCode());
+ return nodePool.get(node.hashCode());
} else {
Node newNode;
if (node instanceof URIReference) {
Modified: trunk/src/java/org/trippi/TripleMaker.java
===================================================================
--- trunk/src/java/org/trippi/TripleMaker.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TripleMaker.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -203,7 +203,7 @@
}
}
} else if (c == '_') {
- Node blankNode = (Node) m_blankMap.get(n);
+ Node blankNode = m_blankMap.get(n);
if (blankNode == null) {
blankNode = createResource();
m_blankMap.put(n, blankNode);
@@ -285,7 +285,8 @@
public FreeBlankNode(int hashCode) {
m_hashCode = hashCode;
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return m_hashCode;
}
public String getID() {
Modified: trunk/src/java/org/trippi/TriplePattern.java
===================================================================
--- trunk/src/java/org/trippi/TriplePattern.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TriplePattern.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -63,9 +63,9 @@
int i = 0;
RDFUtil factory = new RDFUtil();
while (iter.hasNext()) {
- Object subject = parseToken((String) iter.next(), factory);
- Object predicate = parseToken((String) iter.next(), factory);
- Object object = parseToken((String) iter.next(), factory);
+ Object subject = parseToken(iter.next(), factory);
+ Object predicate = parseToken(iter.next(), factory);
+ Object object = parseToken(iter.next(), factory);
out[i++] = new TriplePattern(subject, predicate, object);
}
return out;
@@ -94,7 +94,7 @@
PredicateNode predicate;
ObjectNode object;
if (s instanceof String) {
- BlankNode b = (BlankNode) bNodes.get(s);
+ BlankNode b = bNodes.get(s);
if (b == null) {
b = factory.createResource();
bNodes.put((String)s, b);
@@ -109,7 +109,7 @@
predicate = (PredicateNode) p;
}
if (o instanceof String) {
- BlankNode b = (BlankNode) bNodes.get(o);
+ BlankNode b = bNodes.get(o);
if (b == null) {
b = factory.createResource();
bNodes.put((String)o, b);
@@ -340,7 +340,8 @@
}
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer out = new StringBuffer();
if (m_subject instanceof String) {
out.append(m_subject + " ");
Modified: trunk/src/java/org/trippi/TripleUpdate.java
===================================================================
--- trunk/src/java/org/trippi/TripleUpdate.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TripleUpdate.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -53,7 +53,7 @@
public static List<TripleUpdate> get(int type, List<Triple> triples) {
List<TripleUpdate> updates = new ArrayList<TripleUpdate>(triples.size());
for (int i = 0; i < triples.size(); i++) {
- Triple triple = (Triple) triples.get(i);
+ Triple triple = triples.get(i);
updates.add(new TripleUpdate(type, triple));
}
return updates;
Modified: trunk/src/java/org/trippi/TriplestoreConnector.java
===================================================================
--- trunk/src/java/org/trippi/TriplestoreConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TriplestoreConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -77,7 +77,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/TupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/TupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/TupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -93,7 +93,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/config/ConfigUtils.java
===================================================================
--- trunk/src/java/org/trippi/config/ConfigUtils.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/config/ConfigUtils.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -9,7 +9,7 @@
* Get a trimmed non-empty string from the map, or throw an exception.
*/
public static String getRequired(Map<String, String> map, String key) throws TrippiException {
- String value = (String) map.get(key);
+ String value = map.get(key);
if (value == null || value.length() == 0) {
throw new TrippiException("Missing required configuration value: " + key);
} else {
Modified: trunk/src/java/org/trippi/config/TrippiConfig.java
===================================================================
--- trunk/src/java/org/trippi/config/TrippiConfig.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/config/TrippiConfig.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -85,7 +85,7 @@
clearProfiles(p);
Iterator<String> ids = profiles.keySet().iterator();
while (ids.hasNext()) {
- String id = (String) ids.next();
+ String id = ids.next();
putProfile(p, profiles.get(id));
}
saveProps(p);
@@ -160,7 +160,7 @@
}
Iterator<String> iter = keysToRemove.iterator();
while (iter.hasNext()) {
- p.remove((String) iter.next());
+ p.remove(iter.next());
}
}
Modified: trunk/src/java/org/trippi/config/TrippiProfile.java
===================================================================
--- trunk/src/java/org/trippi/config/TrippiProfile.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/config/TrippiProfile.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -41,7 +41,8 @@
getConfiguration());
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer out = new StringBuffer();
out.append("Trippi Profile : " + getId() + "\n");
out.append(" Label : " + getLabel() + "\n");
@@ -49,7 +50,7 @@
Map<String, String> m = getConfiguration();
Iterator<String> iter = m.keySet().iterator();
while (iter.hasNext()) {
- String key = (String) iter.next();
+ String key = iter.next();
out.append(" Param : " + key + " = " + m.get(key) + "\n");
}
return out.toString();
Modified: trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreReader.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -215,7 +215,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/ConcurrentTriplestoreWriter.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -280,7 +280,7 @@
m_buffer.flush(m_updateSession);
}
long end = System.currentTimeMillis();
- double sec = ( (double) (end - start) ) / 1000.0;
+ double sec = ( (end - start) ) / 1000.0;
logger.info("Flushed " + size + " updates in " + sec + "seconds.");
}
@@ -330,7 +330,8 @@
* and finally, close the pool.
*
*/
- public synchronized void close() throws TrippiException {
+ @Override
+ public synchronized void close() throws TrippiException {
if (!m_needToClose) {
logger.info("Closing...");
m_needToClose = true;
Modified: trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/ConfigurableSessionPool.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -92,7 +92,7 @@
}
}
synchronized (m_freeSessions) {
- session = (TriplestoreSession) m_freeSessions.remove(0);
+ session = m_freeSessions.remove(0);
}
synchronized (m_inUseSessions) {
m_inUseSessions.add(session);
@@ -148,7 +148,8 @@
* This just ensures that pool growth occurs when necessary,
* checking every 1/4 of a second.
*/
- public void run() {
+ @Override
+ public void run() {
while ( !m_needToFinish ) {
int diff = m_spareSessions - getFreeCount();
if ( diff > 0 ) {
@@ -227,7 +228,8 @@
* Call close() at garbage collection time in case it hasn't been
* called yet.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/DistinctTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -39,25 +39,29 @@
return false;
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
if (m_next == null) return null;
Triple last = m_next;
m_next = getNext();
return last;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/DistinctTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -41,29 +41,34 @@
return false;
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
if (m_next == null) return null;
Map<String, Node> last = m_next;
m_next = getNext();
return last;
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_wrapped.names();
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/LimitedTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -36,25 +36,29 @@
}
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
if (m_next == null) return null;
Triple last = m_next;
m_next = getNext();
return last;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/LimitedTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -38,29 +38,34 @@
}
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
if (m_next == null) return null;
Map<String, Node> last = m_next;
m_next = getNext();
return last;
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_wrapped.names();
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_wrapped.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/MemUpdateBuffer.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -85,7 +85,7 @@
private static String tripleListToString(List<Triple> triples) {
StringBuffer out = new StringBuffer();
for (int i = 0; i < triples.size(); i++) {
- out.append(RDFUtil.toString((Triple) triples.get(i)) + "\n");
+ out.append(RDFUtil.toString(triples.get(i)) + "\n");
}
return out.toString();
}
Modified: trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/PoolAwareTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -25,20 +25,23 @@
m_pool = pool;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) close(); // proactively
return has;
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
return m_iter.next();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the session is released to the pool.
@@ -56,7 +59,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/PoolAwareTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -30,7 +30,8 @@
m_pool = pool;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) {
close();
@@ -38,22 +39,26 @@
return has;
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
return m_iter.next();
}
- public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
+ @Override
+ public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
return m_iter.nextTriples(patterns);
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_iter.names();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the session is released to the pool.
@@ -71,7 +76,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -23,20 +23,23 @@
m_session = session;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) close(); // proactively
return has;
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
return m_iter.next();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the thread's lock on the session is released.
@@ -54,7 +57,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreReader.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -179,7 +179,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTriplestoreSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -192,7 +192,7 @@
logger.info("Lock Status: FREE");
} else {
int waitCount = size - 1;
- Thread lockingThread = (Thread) m_lockQueue.get(0);
+ Thread lockingThread = m_lockQueue.get(0);
logger.info("Lock Status: LOCKER = '" + lockingThread.getName()
+ "', WAITING = " + waitCount);
}
Modified: trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/SynchronizedTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -28,7 +28,8 @@
m_session = session;
}
- public boolean hasNext() throws TrippiException {
+ @Override
+ public boolean hasNext() throws TrippiException {
boolean has = m_iter.hasNext();
if (!has) {
close();
@@ -36,22 +37,26 @@
return has;
}
- public Map<String, Node> next() throws TrippiException {
+ @Override
+ public Map<String, Node> next() throws TrippiException {
return m_iter.next();
}
- public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
+ @Override
+ public List<Triple> nextTriples(TriplePattern[] patterns) throws TrippiException {
return m_iter.nextTriples(patterns);
}
- public String[] names() throws TrippiException {
+ @Override
+ public String[] names() throws TrippiException {
return m_iter.names();
}
/**
* Close the wrapped iterator and release the session to the pool.
*/
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
// This ensures that even if the wrapped iter throws an exception,
// the thread's lock on the session is released.
@@ -69,7 +74,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/base/TupleBasedTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -50,14 +50,16 @@
if (!m_tuples.hasNext()) return null;
m_triplesFromTuples = m_tuples.nextTriples(m_patterns);
}
- return (Triple) m_triplesFromTuples.remove(0);
+ return m_triplesFromTuples.remove(0);
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return (m_next != null);
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
if (m_next == null) {
return null;
}
@@ -66,14 +68,16 @@
return last;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (!m_closed) {
m_tuples.close();
m_closed = true;
}
}
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/mpt/MPTConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/mpt/MPTConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mpt/MPTConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -43,7 +43,8 @@
}
// Implements TriplestoreConnector.init(Map)
- public void init(Map<String, String> config) throws TrippiException {
+ @Override
+ public void init(Map<String, String> config) throws TrippiException {
// get and validate configuration values
String ddlGenerator = ConfigUtils.getRequired(config, "ddlGenerator");
@@ -134,22 +135,26 @@
}
// Implements TriplestoreConnector.getReader()
- public TriplestoreReader getReader() {
+ @Override
+ public TriplestoreReader getReader() {
return _writer;
}
// Implements TriplestoreConnector.getWriter()
- public TriplestoreWriter getWriter() {
+ @Override
+ public TriplestoreWriter getWriter() {
return _writer;
}
// Implements TriplestoreConnector.getElementFactory()
- public GraphElementFactory getElementFactory() {
+ @Override
+ public GraphElementFactory getElementFactory() {
return _elementFactory;
}
// Implements TriplestoreConnector.close()
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
if (_writer != null) {
_writer.close(); // flushes and closes update buffer,
// then closes session pool,
Modified: trunk/src/java/org/trippi/impl/mpt/MPTSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/mpt/MPTSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mpt/MPTSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -161,7 +161,7 @@
Set<org.nsdl.mptstore.rdf.Triple> mptSet = new HashSet<org.nsdl.mptstore.rdf.Triple>(jrdfTriples.size());
Iterator<Triple> iter = jrdfTriples.iterator();
while (iter.hasNext()) {
- Triple jrdfTriple = (Triple) iter.next();
+ Triple jrdfTriple = iter.next();
org.nsdl.mptstore.rdf.SubjectNode mptSubject =
(org.nsdl.mptstore.rdf.SubjectNode)
jrdfToMPT(jrdfTriple.getSubject());
Modified: trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mpt/MPTTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -25,11 +25,13 @@
_util = new RDFUtil();
}
- public boolean hasNext() {
+ @Override
+ public boolean hasNext() {
return _results.hasNext();
}
- public Triple next() throws TrippiException {
+ @Override
+ public Triple next() throws TrippiException {
try {
List<Node> result = _results.next();
Node n;
@@ -50,7 +52,8 @@
}
}
- public void close() {
+ @Override
+ public void close() {
_results.close();
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -86,7 +86,7 @@
String host = null, port = null, path = null;
if (remote) {
host = ConfigUtils.getRequired(config, "host");
- port = (String)config.get("port");
+ port = config.get("port");
} else {
path = ConfigUtils.getRequired(config, "path");
}
@@ -110,7 +110,7 @@
int poolMaxGrowth = 0, poolSpareSessions = 0;
if (poolInitialSize > 0) {
poolMaxGrowth = ConfigUtils.getRequiredInt(config, "poolMaxGrowth");
- String temp = (String)config.get("poolSpareSessions");
+ String temp = config.get("poolSpareSessions");
poolSpareSessions = (temp == null) ? 0 : Integer.parseInt(temp);
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -232,7 +232,7 @@
Set<Triple> plainLiteralTriples = new HashSet<Triple>();
Iterator<Triple> iter = triples.iterator();
while (iter.hasNext()) {
- Triple triple = (Triple) iter.next();
+ Triple triple = iter.next();
if (triple.getObject() instanceof Literal) {
Literal literal = (Literal) triple.getObject();
if (literal.getDatatypeURI() == null
@@ -276,7 +276,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraSessionFactory.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -237,7 +237,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraTripleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -82,7 +82,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
Modified: trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/MulgaraTupleIterator.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -98,7 +98,8 @@
/**
* Ensure close() gets called at garbage collection time.
*/
- public void finalize() throws TrippiException {
+ @Override
+ public void finalize() throws TrippiException {
close();
}
}
Modified: trunk/src/java/org/trippi/impl/mulgara/RowGroup.java
===================================================================
--- trunk/src/java/org/trippi/impl/mulgara/RowGroup.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/mulgara/RowGroup.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -59,7 +59,7 @@
}
m_variables = new Variable[newVars.size()];
for (int i = 0; i < newVars.size(); i++) {
- m_variables[i] = (Variable) newVars.get(i);
+ m_variables[i] = newVars.get(i);
}
m_nextValues = new Object[m_variables.length];
}
Modified: trunk/src/java/org/trippi/impl/multi/MultiConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/multi/MultiConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/multi/MultiConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -36,23 +36,28 @@
m_elementFactory = new RDFUtil();
}
- public void init(Map config) throws TrippiException {
+ @Override
+ public void init(Map<String,String> config) throws TrippiException {
throw new TrippiException("This connector cannot be initialized via init()");
}
- public TriplestoreReader getReader() {
+ @Override
+ public TriplestoreReader getReader() {
return m_connectors[0].getReader();
}
- public TriplestoreWriter getWriter() {
+ @Override
+ public TriplestoreWriter getWriter() {
return m_multiWriter;
}
- public GraphElementFactory getElementFactory() {
+ @Override
+ public GraphElementFactory getElementFactory() {
return m_elementFactory;
}
- public void close() throws TrippiException {
+ @Override
+ public void close() throws TrippiException {
TrippiException m_exception = null;
for (int i = 0; i < m_connectors.length; i++) {
try {
Modified: trunk/src/java/org/trippi/impl/oracle/OracleConnector.java
===================================================================
--- trunk/src/java/org/trippi/impl/oracle/OracleConnector.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/oracle/OracleConnector.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -1,8 +1,5 @@
package org.trippi.impl.oracle;
-
-
-import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.util.HashMap;
@@ -11,7 +8,6 @@
import oracle.jdbc.pool.OracleOCIConnectionPool;
-import org.apache.log4j.Logger;
import org.jrdf.graph.GraphElementFactory;
import org.trippi.TriplestoreConnector;
import org.trippi.TriplestoreReader;
@@ -23,420 +19,223 @@
import org.trippi.impl.base.SingleSessionPool;
import org.trippi.impl.base.TriplestoreSessionPool;
import org.trippi.impl.base.UpdateBuffer;
-
-
/**
-
- * A <code>TriplestoreConnector</code> for a remote or local, Oracle Spatical
-
- * triplestore.
-
- *
-
- * @author lib...@ca...
-
- * @created June 26, 2006
-
+ * A <code>TriplestoreConnector</code> for a remote or local, Oracle Spatial
+ * Triple Store.
+ *
+ * @author lib...@ca...
+ * @created June 26, 2006
*/
-
+
public class OracleConnector extends TriplestoreConnector {
-
-
- private final static Logger logger =
-
- Logger.getLogger(OracleConnector.class.getName());
-
+ //private final static Logger logger = Logger.getLogger(OracleConnector.class
+ // .getName());
-
private ConcurrentTriplestoreWriter m_writer;
-
- private GraphElementFactory m_elementFactory;
-
-
+ //private GraphElementFactory m_elementFactory;
-
/**
-
*Constructor for the OracleConnector object
-
*/
-
- public OracleConnector() { }
-
+ public OracleConnector() {
+ }
-
-
-
/**
-
- * Gets the required attribute of the OracleConnector class
-
- *
-
- * @param config Description of the Parameter
-
- * @param name Description of the Parameter
-
- * @return The required value
-
- * @exception TrippiException Description of the Exception
-
+ * Gets the required attribute of the OracleConnector class
+ *
+ * @param config
+ * Description of the Parameter
+ * @param name
+ * Description of the Parameter
+ * @return The required value
+ * @exception TrippiException
+ * Description of the Exception
*/
-
- private static String getRequired(Map config, String name) throws TrippiException {
-
- String val = (String) config.get(name);
-
+ private static String getRequired(Map<String, String> config, String name)
+ throws TrippiException {
+ String val = config.get(name);
if (val == null) {
-
throw new TrippiException("Must specify " + name);
-
}
-
return val;
-
}
-
-
-
-
/**
-
- * Gets the requiredInt attribute of the OracleConnector class
-
- *
-
- * @param config Description of the Parameter
-
- * @param name Description of the Parameter
-
- * @return The requiredInt value
-
- * @exception TrippiException Description of the Exception
-
+ * Gets the requiredInt attribute of the OracleConnector class
+ *
+ * @param config
+ * Description of the Parameter
+ * @param name
+ * Description of the Parameter
+ * @return The requiredInt value
+ * @exception TrippiException
+ * Description of the Exception
*/
-
- private static int getRequiredInt(Map config, String name) throws TrippiException {
-
+ private static int getRequiredInt(Map<String, String> config, String name)
+ throws TrippiException {
String val = getRequired(config, name);
-
try {
-
return Integer.parseInt(val);
-
} catch (Exception e) {
-
- throw new TrippiException("Expected an integer for " + name + ", got " + val);
-
+ throw new TrippiException("Expected an integer for " + name
+ + ", got " + val);
}
-
}
-
-
-
-
- // set reader, writer, and elementFactory as needed
-
+ // set reader, writer, and elementFactory as needed
/**
-
- * Description of the Method
-
- *
-
- * @param config Description of the Parameter
-
- * @exception TrippiException Description of the Exception
-
+ * Description of the Method
+ *
+ * @param config
+ * Description of the Parameter
+ * @exception TrippiException
+ * Description of the Exception
*/
-
- public void init(Map config) throws TrippiException {
-
+ @Override
+ public void init(Map<String,String> config) throws TrippiException {
+ AliasManager aliasManager = new AliasManager(new HashMap<String, String>());
-
- AliasManager aliasManager = new AliasManager(new HashMap());
-
-
-
// Get and validate configuration
-
// Required parameters
-
- File dir = null;
-
- String jdbcDriver = null;
-
String jdbcUrl = null;
-
String user = null;
-
String password = null;
-
-
-
jdbcUrl = getRequired(config, "jdbcUrl");
-
user = getRequired(config, "user");
-
password = getRequired(config, "password");
-
-
- int autoFlushDormantSeconds = getRequiredInt(config, "autoFlushDormantSeconds");
-
+ int autoFlushDormantSeconds = getRequiredInt(config,
+ "autoFlushDormantSeconds");
int autoFlushBufferSize = getRequiredInt(config, "autoFlushBufferSize");
-
int bufferSafeCapacity = getRequiredInt(config, "bufferSafeCapacity");
-
- int bufferFlushBatchSize = getRequiredInt(config, "bufferFlushBatchSize");
-
-
-
+ int bufferFlushBatchSize = getRequiredInt(config,
+ "bufferFlushBatchSize");
String RDFSchemaName = getRequired(config, "RDFSchemaName");
-
-
-
Properties poolConfig = new Properties();
-
-
-
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_MIN_LIMIT,
-
- getRequired(config, "PoolConnectionMinLimit"));
-
+ getRequired(config, "PoolConnectionMinLimit"));
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_MAX_LIMIT,
-
- getRequired(config, "PoolConnectionMaxLimit"));
-
+ getRequired(config, "PoolConnectionMaxLimit"));
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_INCREMENT,
-
- getRequired(config, "PoolConnectionIncrement"));
-
-
-
+ getRequired(config, "PoolConnectionIncrement"));
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_NOWAIT, "false");
-
- //Must wait for next conncetion to free up.
-
+
+ // Must wait for next conncetion to free up.
poolConfig.put(OracleOCIConnectionPool.CONNPOOL_TIMEOUT,
-
- getRequired(config, "PoolConnectionTimeOut"));
-
+ getRequired(config, "PoolConnectionTimeOut"));
-
if (autoFlushDormantSeconds < 0) {
-
- throw new TrippiException("autoFlushDormantSeconds cannot be negative.");
-
+ throw new TrippiException(
+ "autoFlushDormantSeconds cannot be negative.");
}
-
+
if (autoFlushBufferSize < 1) {
-
- throw new TrippiException("autoFlushBufferSize must be greater than zero.");
-
+ throw new TrippiException(
+ "autoFlushBufferSize must be greater than zero.");
}
-
+
if (bufferSafeCapacity < autoFlushBufferSize + 1) {
-
- throw new TrippiException("bufferSafeCapacity must be greater than autoFlushBufferSize.");
-
+ throw new TrippiException(
+ "bufferSafeCapacity must be greater than autoFlushBufferSize.");
}
-
+
if (bufferFlushBatchSize < 1) {
-
- throw new TrippiException("bufferFlushBatchSize must be greater than zero.");
-
+ throw new TrippiException(
+ "bufferFlushBatchSize must be greater than zero.");
}
-
+
if (bufferFlushBatchSize > autoFlushBufferSize) {
-
- throw new TrippiException("bufferFlushBatchSize must be less than or equal to autoFlushBufferSize.");
-
+ throw new TrippiException(
+ "bufferFlushBatchSize must be less than or equal to autoFlushBufferSize.");
}
-
+
// Initialize appropriate Oracle Repository
-
Connection repository;
-
+
try {
-
DriverManager.registerDriver(new oracle.jdbc.driver.OracleDriver());
-
+ repository = DriverManager.getConnection(jdbcUrl, user, password);
-
- repository = DriverManager.getConnection(
-
- jdbcUrl, user, password);
-
- //Connect ot oracle
-
+ // Connect to oracle
/*
-
- * repository = new OracleOCIConnectionPool(user, password, jdbcUrl, poolConfig);
-
+ * repository = new OracleOCIConnectionPool(user, password, jdbcUrl,
+ * poolConfig);
*/
-
+
} catch (Exception e) {
-
- throw new TrippiException("Failed to initialize Oracle repository", e);
-
+ throw new TrippiException("Failed to initialize Oracle repository",
+ e);
}
-
+
try {
-
- OracleSession session = new OracleSession(repository,
-
- aliasManager,
-
+ OracleSession session = new OracleSession(repository, aliasManager,
RDFSchemaName);
-
-
- /*
-
- * **********************************************
-
- */
-
- /*
-
- * *************** HERE *************************
-
- */
-
- /*
-
- * **********************************************
-
- */
-
- m_elementFactory = session.getElementFactory();
-
+ //m_elementFactory = session.getElementFactory();
-
- TriplestoreSessionPool sessionPool = new SingleSessionPool(
-
- session,
-
+ TriplestoreSessionPool sessionPool = new SingleSessionPool(session,
OracleSession.TUPLE_LANGUAGES,
-
OracleSession.TRIPLE_LANGUAGES);
-
+
UpdateBuffer updateBuffer = new MemUpdateBuffer(bufferSafeCapacity,
-
bufferFlushBatchSize);
-
+
m_writer = new ConcurrentTriplestoreWriter(sessionPool,
-
- aliasManager,
-
- session,
-
- updateBuffer,
-
- autoFlushBufferSize,
-
+ aliasManager, session, updateBuffer, autoFlushBufferSize,
autoFlushDormantSeconds);
-
+
m_writer.setCacheDeletes(true);
-
+
} catch (Exception e) {
-
- throw new TrippiException("Failed to initialize Trippi interface to Oracle repository", e);
-
+ throw new TrippiException(
+ "Failed to initialize Trippi interface to Oracle repository",
+ e);
}
-
}
-
-
-
-
/**
-
- * Gets the reader attribute of the OracleConnector object
-
- *
-
- * @return The reader value
-
+ * Gets the reader attribute of the OracleConnector object
+ *
+ * @return The reader value
*/
-
+ @Override
public TriplestoreReader getReader() {
-
return m_writer;
-
}
-
-
-
-
/**
-
- * Gets the writer attribute of the OracleConnector object
-
- *
-
- * @return The writer value
-
+ * Gets the writer attribute of the OracleConnector object
+ *
+ * @return The writer value
*/
-
+ @Override
public TriplestoreWriter getWriter() {
-
return m_writer;
-
}
-
-
-
-
/**
-
- * Gets the elementFactory attribute of the OracleConnector object
-
- *
-
- * @return The elementFactory value
-
+ * Gets the elementFactory attribute of the OracleConnector object
+ *
+ * @return The elementFactory value
*/
-
+ @Override
public GraphElementFactory getElementFactory() {
-
return null;
-
- //m_elementFactory;
-
+ // m_elementFactory;
}
-
-
-
-
/**
-
- * Description of the Method
-
- *
-
- * @exception TrippiException Description of the Exception
-
+ * Description of the Method
+ *
+ * @exception TrippiException
+ * Description of the Exception
*/
-
+
+ @Override
public void close() throws TrippiException {
-
m_writer.close();
-
}
-
-
-
}
-
-
-
Modified: trunk/src/java/org/trippi/impl/oracle/OracleSession.java
===================================================================
--- trunk/src/java/org/trippi/impl/oracle/OracleSession.java 2009-11-12 03:51:34 UTC (rev 123)
+++ trunk/src/java/org/trippi/impl/oracle/OracleSession.java 2009-11-12 04:50:56 UTC (rev 124)
@@ -25,15 +25,10 @@
import org.trippi.impl.base.TriplestoreSession;
/**
- *
* A <code>TriplestoreSession</code> that wraps a OracleRepository.
*
- *
- *
* @author lib...@ca...
- *
* @created June 26, 2006
- *
*/
public class OracleSession implements TriplestoreSession, Runnable {
@@ -43,7 +38,6 @@
* Description of the Field
*
*/
-
public final static String SPO = "spo";
/**
@@ -51,7 +45,6 @@
* tuple queries aren't supported yet
*
*/
-
public final static String[] TUPLE_LANGUAGES = new String[] { "Unsupported" };
/**
@@ -59,7 +52,6 @@
* spo
*
*/
-
public final static String[] TRIPLE_LANGUAGES = new String[] { SPO };
private final static Logger logger =
@@ -79,41 +71,26 @@
private String m_cur_query;
/**
- *
* Description of the Method
*
- *
- *
* @return Description of the Return Value
- *
*/
-
public String[] listTupleLanguages() {
-
return TUPLE_LANGUAGES;
-
}
/**
- *
* Description of the Method
*
- *
- *
* @return Description of the Return Value
- *
*/
-
public String[] listTripleLanguages() {
return TRIPLE_LANGUAGES;
}
/**
- *
* Construct an Oracle session.
*
- *
- *
* @param repository
* Description of the Parameter
*
@@ -122,30 +99,21 @@
*
* @param RDFSchemaName
* Description of the Parameter
- *
*/
-
public OracleSession(Connection repository, AliasManager aliasManager,
String RDFSchemaName) {
-
m_repository = repository;
m_aliasManager = aliasManager;
m_closed = false;
m_oracleSchema = RDFSchemaName;
logger.info("Created session.");
-
}
/**
- *
* Gets the elementFactory attribute of the OracleSession object
*
- *
- *
* @return The elementFactory value
- *
*/
-
public GraphElementFactory getElementFactory() {
// TODO
if (m_factory == null) {
@@ -163,7 +131,6 @@
* Description of the Exception
*
*/
-
public void add(Set<Triple> triples) throws TrippiException {
doTriples(triples, true);
}
@@ -175,7 +142,6 @@
* @exception TrippiException
* Description of the Exception
*/
-
public void delete(Set<Triple> triples) throws TrippiException {
doTriples(triples, false);
}
@@ -189,7 +155,6 @@
* @exception TrippiException
* Description of the Exception
*/
-
private void doTriples(Set<Triple> triples, boolean add)
throws TrippiException {
@@ -198,7 +163,7 @@
try {
if (add) {
Iterator<Triple> jrdfTriples = triples.iterator();
- boolean sendTripples = false;
+ boolean sendTriples = false;
Statement stmt = m_repository.createStatement();
m_repository.setAutoCommit(false);
startedTransaction = true;
@@ -259,20 +224,16 @@
+ ">'))";
}
- sendTripples = true;
- // //////////////////
+ sendTriples = true;
- // /////////////////////TODO REMOVE
-
stmt.addBatch(query);
// m_cur_query = query;
// this.run();
-
}
- if (sendTripples) {
+ if (sendTriples) {
stmt.executeBatch();
}
stmt.close();
@@ -282,44 +243,31 @@
+ "_rdf_data WHERE ID IN (SELECT ID FROM " +
m_oracleSchema + "_rdf_data a " +
"WHERE (";
- boolean firstTripple = true;
+ boolean firstTriple = true;
while (jrdfTriples.hasNext()) {
Triple triple = (Triple) jrdfTriples.next();
boolean first = true;
- if (firstTripple) {
- firstTripple = false;
+ if (firstTriple) {
+ firstTriple = false;
} else {
query = query + " OR ( ";
}
- if ((triple.getSubject()) != null) {
+ if ((triple.getSubject()) != null) {
+ if (!((triple.getSubject()) instanceof BlankNode)) {
+ query = query
+ + " a.triple.get_subject() = '"
+ + ((URIReference) triple.getSubject())
+ .getURI().toString().replaceAll(
+ "'", "''") + "' ";
+ first = false;
+ }
+ }
- if (!((triple.getSubject()) instanceof BlankNode)) {
-
- query = query
- + " a.triple.get_subject() = '"
- +
-
- ((URIReference) triple.getSubject())
- .getURI().toString().replaceAll(
- "'", "''") +
-
- "' ";
-
- first = false;
-
- }
-
- }
-
if ((triple.getPredicate()) != null) {
-
if (!((triple.getPredicate()) instanceof BlankNode)) {
-
if (!(first)) {
-
query = query + " AND ";
-
}
query = query
@@ -331,21 +279,14 @@
"'", "''") +
"' ";
-
first = false;
-
}
-
}
if ((triple.getObject()) != null) {
-
if (!((triple.getObject() instanceof BlankNode))) {
-
if (!(first)) {
-
query = query + " AND ";
-
}
if (triple.getObject() instanceof Literal) {
@@ -402,13 +343,13 @@
}
- if (firstTripple == false) {
+ if (firstTriple == false) {
query = query + " )";
}
- if (firstTripple == false) {
+ if (firstTriple == false) {
Statement stmt = m_repository.createStatement();
@@ -501,11 +442,11 @@
private String doAliasReplacements(String q, boolean noBrackets) {
String out = q;
- Map m = m_aliasManager.getAliasMap();
- Iterator iter = m.keySet().iterator();
+ Map...
[truncated message content] |
