[Mulgara-svn] r2061 - in trunk/src/jar: content-n3/java/org/mulgara/content/n3 content-rdfxml/java/org/mulgara/content/rdfxml content-rdfxml/java/org/mulgara/content/rdfxml/writer demo-mp3/java/org/mulgara/demo/mp3/playback demo-mp3/java/org/mulgara/demo/mp3/swing/actions jrdf/java/org/mulgara/jrdf query/java/org/jrdf/graph query/java/org/mulgara/jena query/java/org/mulgara/rules querylang/java/org/mulgara/itql resolver/java/org/mulgara/resolver resolver-spi/java/org/mulgara/content resolver-spi/java/org/mulgara/resolver/spi resolver-spi/java/org/mulgara/store/statement resolver-store/java/org/mulgara/resolver/store server/java/org/mulgara/server server-rmi/java/org/mulgara/server/rmi store-stringpool/java/org/mulgara/store/stringpool/xa tuples/java/org/mulgara/store/tuples util/java/org/mulgara/util util/java/org/mulgara/util/conversion/html
alexhall at mulgara.org
alexhall at mulgara.org
Thu Sep 29 16:35:35 UTC 2011
Author: alexhall
Date: 2011-09-29 16:35:34 +0000 (Thu, 29 Sep 2011)
New Revision: 2061
Modified:
trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java
trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLStatements.java
trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/writer/RDFXMLWriter.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaybackThreadImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaylistThreadImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/actions/LoadMp3sAction.java
trunk/src/jar/jrdf/java/org/mulgara/jrdf/AnswerClosableIteratorImpl.java
trunk/src/jar/jrdf/java/org/mulgara/jrdf/JRDFGraph.java
trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java
trunk/src/jar/query/java/org/mulgara/jena/PatternMulgara.java
trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java
trunk/src/jar/query/java/org/mulgara/rules/RulesRefImpl.java
trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
trunk/src/jar/resolver-spi/java/org/mulgara/content/NotModifiedTuplesException.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizeException.java
trunk/src/jar/resolver-spi/java/org/mulgara/store/statement/StatementStoreException.java
trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java
trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerFactory.java
trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java
trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java
trunk/src/jar/resolver/java/org/mulgara/resolver/NTriples.java
trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSessionFactory.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/IteratorPageImpl.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiURLConnection.java
trunk/src/jar/server/java/org/mulgara/server/ServletMulgaraServer.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java
trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java
trunk/src/jar/util/java/org/mulgara/util/conversion/html/HtmlToTextConverter.java
trunk/src/jar/util/java/org/mulgara/util/conversion/html/ParserThread.java
Log:
More updates to address Fortify scan results, mostly cleaning up the logging output to avoid calls to System.out/err and printStackTrace(). Also cleaning up a handful of Java generics warnings.
Modified: trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java
===================================================================
--- trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -298,7 +298,7 @@
predicateNode = (PredicateNode) toNode(pred);
objectNode = (ObjectNode) toNode(obj);
} catch (MulgaraParserException e) {
- logger.error("Unable to parse. " + e.getMessage());
+ logger.error("Unable to parse at line " + line + ": " + e.getMessage());
return;
}
Modified: trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLStatements.java
===================================================================
--- trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLStatements.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLStatements.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -263,7 +263,7 @@
// Create a new parser.
try {
p = new Parser(content, resolverSession);
- parser.start();
+ p.start();
}
catch (NotModifiedException e) {
throw new NotModifiedTuplesException(e);
Modified: trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/writer/RDFXMLWriter.java
===================================================================
--- trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/writer/RDFXMLWriter.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/writer/RDFXMLWriter.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -174,7 +174,6 @@
writeFooter(out);
} catch (Exception exception) {
- exception.printStackTrace();
log.error("Failed to write Statements.", exception);
throw new QueryException("Failed to write Statements.", exception);
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaybackThreadImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaybackThreadImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaybackThreadImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -27,9 +27,6 @@
package org.mulgara.demo.mp3.playback;
-// Java 2 standard packages
-import java.io.*;
-
// Logging
import org.apache.log4j.Logger;
@@ -210,7 +207,7 @@
listener.exceptionOccurred(t);
}
else {
- t.printStackTrace();
+ log.info("Exception occurred", t);
}
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaylistThreadImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaylistThreadImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/playback/PlaylistThreadImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -74,7 +74,7 @@
// private List threadList = null;
/** Threads to be played */
- private Iterator threadIter = null;
+ private Iterator<?> threadIter = null;
/** Used to determine if this Thread has been terminated */
private boolean terminated = false;
@@ -102,7 +102,7 @@
* @param listener PlaybackListener can be null.
* @throws Exception
*/
- public PlaylistThreadImpl(Iterator threadIter,
+ public PlaylistThreadImpl(Iterator<?> threadIter,
PlaybackThreadListener listener) throws Exception {
super();
this.threadIter = threadIter;
@@ -151,7 +151,7 @@
listener.exceptionOccurred(exception);
}
else {
- exception.printStackTrace();
+ log.info("Exception occurred", exception);
}
}
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/actions/LoadMp3sAction.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/actions/LoadMp3sAction.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/swing/actions/LoadMp3sAction.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -28,7 +28,6 @@
package org.mulgara.demo.mp3.swing.actions;
// Java 2 standard packages
-import javax.swing.*;
import java.awt.event.ActionEvent;
// Logging
@@ -64,6 +63,10 @@
public class LoadMp3sAction extends AbstractMp3Action {
/**
+ *
+ */
+ private static final long serialVersionUID = -4140158890813350562L;
+ /**
* Logger. This is named after the class.
*/
private final static Logger log = Logger.getLogger(LoadMp3sAction.class.
@@ -113,7 +116,6 @@
private Mp3ModelListener getMp3ModelListener() {
return new Mp3ModelListener() {
public void loadExceptionOccurred(Mp3File file, Exception e) {
- String newline = System.getProperty("line.separator");
//just print it
log.warn("An exception occurred while loading: " + file, e);
}
Modified: trunk/src/jar/jrdf/java/org/mulgara/jrdf/AnswerClosableIteratorImpl.java
===================================================================
--- trunk/src/jar/jrdf/java/org/mulgara/jrdf/AnswerClosableIteratorImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/jrdf/java/org/mulgara/jrdf/AnswerClosableIteratorImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -64,7 +64,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class AnswerClosableIteratorImpl implements ClosableIterator {
+public class AnswerClosableIteratorImpl implements ClosableIterator<Triple> {
/**
* Logger. This is named after the class.
@@ -153,7 +153,7 @@
*
* @return a {@link org.jrdf.graph.Triple}.
*/
- public Object next() {
+ public Triple next() {
if (!hasNext) {
Modified: trunk/src/jar/jrdf/java/org/mulgara/jrdf/JRDFGraph.java
===================================================================
--- trunk/src/jar/jrdf/java/org/mulgara/jrdf/JRDFGraph.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/jrdf/java/org/mulgara/jrdf/JRDFGraph.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -67,6 +67,8 @@
*/
public class JRDFGraph implements Graph {
+ private static final long serialVersionUID = -7013950226111362834L;
+
/**
* Logger. This is named after the class.
*/
@@ -198,7 +200,7 @@
* @throws GraphException If there was an error accessing the graph.
* @return ClosableIterator
*/
- public ClosableIterator find(SubjectNode subject, PredicateNode predicate,
+ public ClosableIterator<Triple> find(SubjectNode subject, PredicateNode predicate,
ObjectNode object) throws GraphException {
return find(elementFactory.createTriple(subject, predicate, object));
@@ -213,7 +215,7 @@
* @throws GraphException If there was an error accessing the graph.
* @return ClosableIterator
*/
- public ClosableIterator find(Triple triple) throws GraphException {
+ public ClosableIterator<Triple> find(Triple triple) throws GraphException {
Answer answer = session.find(graphURI, triple.getSubject(),
triple.getPredicate(), triple.getObject());
return new AnswerClosableIteratorImpl(answer, this);
@@ -250,7 +252,7 @@
* @param triples The triple iterator.
* @throws GraphException If the statements can't be made.
*/
- public void add(Iterator triples) throws GraphException {
+ public void add(Iterator<Triple> triples) throws GraphException {
//validate
if (triples == null) {
@@ -260,14 +262,10 @@
try {
- //current triple being removed
- Triple currentTriple = null;
-
//add each Triple
while (triples.hasNext()) {
- currentTriple = (Triple) triples.next();
- this.add(currentTriple);
+ this.add(triples.next());
}
}
catch (ClassCastException castException) {
@@ -378,7 +376,7 @@
* @param triples The triple iterator.
* @throws GraphException
*/
- public void remove(Iterator triples) throws GraphException {
+ public void remove(Iterator<Triple> triples) throws GraphException {
//validate
if (triples == null) {
@@ -388,14 +386,10 @@
try {
- //current triple being removed
- Triple currentTriple = null;
-
//remove each Triple
while (triples.hasNext()) {
- currentTriple = (Triple) triples.next();
- this.remove(currentTriple);
+ this.remove(triples.next());
}
}
catch (ClassCastException castException) {
Modified: trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -148,13 +148,18 @@
* <var>datatype</var> are <code>null</code>
*/
protected AbstractLiteral(String newLexicalForm, URI newDatatypeURI) {
- super(newLexicalForm, new URIImpl(newDatatypeURI.toString()));
+ super(newLexicalForm, newDatatypeURI != null ? new URIImpl(newDatatypeURI.toString()) : null);
// Validate "lexicalForm" parameter
if (null == newLexicalForm) {
throw new IllegalArgumentException("Null \"lexicalForm\" parameter");
}
+ // Validate "datatype" parameter
+ if (null == newDatatypeURI) {
+ throw new IllegalArgumentException("Null \"datatype\" parameter");
+ }
+
// Initialize fields
datatypeURI = newDatatypeURI;
}
Modified: trunk/src/jar/query/java/org/mulgara/jena/PatternMulgara.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/jena/PatternMulgara.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/query/java/org/mulgara/jena/PatternMulgara.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -15,6 +15,7 @@
import java.util.Map;
import java.util.NoSuchElementException;
+import org.apache.log4j.Logger;
import org.mulgara.query.*;
import org.mulgara.server.Session;
@@ -39,6 +40,8 @@
public class PatternMulgara extends SimpleQueryHandler {
// Scruffy
+ private static final Logger logger = Logger.getLogger(PatternMulgara.class);
+
GraphMulgara graphMulgara;
/**
@@ -192,7 +195,7 @@
slot = convert();
} catch (TuplesException ex) {
- ex.printStackTrace();
+ logger.warn("Exception iterating Mulgara answer", ex);
return false;
}
@@ -223,7 +226,7 @@
try {
answer.close();
} catch (TuplesException ex) {
- ex.printStackTrace();
+ logger.warn("Exception closing answer", ex);
}
}
Modified: trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -21,7 +21,6 @@
*/
class TransactionMulgara extends TransactionHandlerBase {
- @SuppressWarnings("unused")
private static final Logger log = Logger.getLogger(TransactionMulgara.class.getName()) ;
GraphMulgara mGraph ;
@@ -51,7 +50,7 @@
session.rollback();
transaction(false);
} catch (QueryException ex) {
- ex.printStackTrace();
+ log.warn("Error aborting transaction", ex);
}
}
@@ -66,7 +65,7 @@
session.commit() ;
transaction(false) ;
} catch (QueryException ex) {
- ex.printStackTrace();
+ log.warn("Error committing transaction", ex);
}
}
Modified: trunk/src/jar/query/java/org/mulgara/rules/RulesRefImpl.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/rules/RulesRefImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/query/java/org/mulgara/rules/RulesRefImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -60,9 +60,7 @@
private void writeObject(java.io.ObjectOutputStream out)
throws java.io.IOException {
- java.io.IOException ioe = new java.io.IOException("This class should not be serialized");
- ioe.printStackTrace();
- throw ioe;
+ throw new java.io.IOException("This class should not be serialized");
}
}
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -451,14 +451,18 @@
}
}
} catch(TuplesException te ) {
- te.printStackTrace();
+ String msg = "Error accessing query results: ";
+ log.warn(msg, te);
+ System.err.println(msg + te.getMessage());
}
}
}
out.flush();
}
} catch (IOException e) {
- e.printStackTrace();
+ String msg = "Error reading from console: ";
+ log.warn(msg, e);
+ System.err.println(msg + e.getMessage());
}
@@ -532,8 +536,10 @@
retValue.add(a.getObject(0).toString());
}
}
- } catch (Throwable t) {
- log.error("Unable to retrieve graphs", t);
+ } catch(Throwable t) {
+ String msg = "Error fetching graph names from server: ";
+ log.error(msg, t);
+ System.err.println(msg + t.getMessage());
}
return retValue;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerFactory.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerFactory.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerFactory.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -72,7 +72,7 @@
throw new IllegalArgumentException("Null \"className\" parameter");
}
- Class contentHandlerClass;
+ Class<?> contentHandlerClass;
try {
contentHandlerClass = Class.forName(className);
} catch (ClassNotFoundException e) {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -45,7 +45,6 @@
import org.mulgara.query.QueryException;
import org.mulgara.resolver.spi.ResolverSession;
import org.mulgara.resolver.spi.Statements;
-import org.mulgara.util.StackTrace;
/**
* Mediates access to ContentHandlers
@@ -106,7 +105,7 @@
if (content.isStreaming()) sb.append("from stream ");
if (content.getContentType() != null) sb.append("with type ").append(content.getContentType());
logger.debug(sb.toString());
- if (logger.isTraceEnabled()) logger.trace("getContentHandler stack trace: " + new StackTrace());
+ if (logger.isTraceEnabled()) logger.trace("getContentHandler stack trace", new Throwable());
}
// Prefer supplied MIME type when choosing handler.
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -1319,16 +1319,16 @@
void addSymbolicTransformation(SymbolicTransformation symbolicTransformation) throws InitializerException {
+ // Validate "symbolicTransformation" parameter
+ if (symbolicTransformation == null) {
+ throw new IllegalArgumentException("Null \"symbolicTransformation\" parameter");
+ }
+
if (logger.isDebugEnabled()) {
logger.debug("Registering symbolic transformation " +
symbolicTransformation.getClass());
}
- // Validate "symbolicTransformation" parameter
- if (symbolicTransformation == null) {
- throw new IllegalArgumentException("Null \"symbolicTransformation\" parameter");
- }
-
// Register the rule
symbolicTransformationList.add(symbolicTransformation);
}
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -99,7 +99,7 @@
SubjectNode subjectNode = null;
- if (node.equals(com.hp.hpl.jena.graph.Node.ANY) || node == null) {
+ if (node == null || node.equals(com.hp.hpl.jena.graph.Node.ANY)) {
subjectNode = null;
}
else if (node.isBlank()) {
@@ -134,7 +134,7 @@
PredicateNode predicateNode = null;
- if (node.equals(com.hp.hpl.jena.graph.Node.ANY) || node == null) {
+ if (node == null || node.equals(com.hp.hpl.jena.graph.Node.ANY)) {
predicateNode = null;
}
@@ -166,7 +166,7 @@
URISyntaxException {
ObjectNode objectNode = null;
- if (node.equals(com.hp.hpl.jena.graph.Node.ANY) || node == null) {
+ if (node == null || node.equals(com.hp.hpl.jena.graph.Node.ANY)) {
}
else if (node.isBlank()) {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/NTriples.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/NTriples.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/NTriples.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -140,9 +140,9 @@
}
// Validate "baseURI" parameter
- if (baseURI != null && !baseURI.isAbsolute()) {
+ if (baseURI == null || !baseURI.isAbsolute()) {
throw new IllegalArgumentException(
- "Relative \"baseURI\" parameter: " + baseURI
+ "Illegal \"baseURI\" parameter: " + baseURI
);
}
@@ -238,7 +238,7 @@
if (node instanceof URIReference) {
URI uri = ((URIReference) node).getURI();
- URI relativeURI = baseURI.relativize(uri);
+ URI relativeURI = (baseURI != null) ? baseURI.relativize(uri) : uri;
// Be suspicious about relative URIs -- we're only expecting the
// names of models from this server, or the name of the server itself
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSessionFactory.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSessionFactory.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSessionFactory.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -35,12 +35,9 @@
// Third party packages
import org.apache.log4j.Logger;
-import org.jrdf.graph.*;
import gnu.trove.TIntHashSet;
// Local packages
-import org.mulgara.query.*;
-import org.mulgara.query.rdf.*;
import org.mulgara.resolver.spi.*;
import org.mulgara.store.StoreException;
import org.mulgara.store.nodepool.NodePoolException;
@@ -76,7 +73,7 @@
private final URI databaseURI;
/** The set of alternative hostnames for the current host. */
- private final Set hostnameAliases;
+ private final Set<String> hostnameAliases;
/** Where to store literals for this session. */
private final XAStringPool persistentStringPool;
@@ -96,7 +93,7 @@
StringPoolSessionFactory(
URI databaseURI,
- Set hostnameAliases,
+ Set<String> hostnameAliases,
String persistentStringPoolFactoryClassName,
FactoryInitializer persistentStringPoolFactoryInitializer,
String persistentNodePoolFactoryClassName,
@@ -245,10 +242,10 @@
*/
private Object newFactory(FactoryInitializer initializer,
String factoryClassName,
- Class returnClass)
+ Class<?> returnClass)
{
try {
- Class factoryClass = Class.forName(factoryClassName);
+ Class<?> factoryClass = Class.forName(factoryClassName);
// Validate that the candidate supports the correct factory interface
if (!returnClass.isAssignableFrom(factoryClass)) {
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/content/NotModifiedTuplesException.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/content/NotModifiedTuplesException.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/content/NotModifiedTuplesException.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -57,6 +57,8 @@
// Constructors
//
+ private static final long serialVersionUID = -4903577060297708655L;
+
/**
* Sole constructor.
*
@@ -66,7 +68,7 @@
*/
public NotModifiedTuplesException(NotModifiedException cause)
{
- super(cause.getMessage(), cause);
+ super(cause != null ? cause.getMessage() : "", cause);
// Validate "cause" parameter
if (cause == null) {
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -282,7 +282,7 @@
public boolean isSameRM(XAResource xaResource) throws XAException {
boolean same = (xaResource instanceof AbstractXAResource) &&
- ((AbstractXAResource)xaResource).resourceManager == resourceManager;
+ ((AbstractXAResource<?,?>)xaResource).resourceManager == resourceManager;
if (logger.isDebugEnabled()) {
logger.debug("Is same resource manager? " + same + " :: " + xaResource + " on " + this);
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizeException.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizeException.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizeException.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -49,6 +49,11 @@
public class LocalizeException extends Exception
{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2578231437826374352L;
+
/** Logger. */
private static final Logger logger =
Logger.getLogger(LocalizeException.class.getName());
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/store/statement/StatementStoreException.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/store/statement/StatementStoreException.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/store/statement/StatementStoreException.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -27,10 +27,6 @@
package org.mulgara.store.statement;
-
-// Java 2 standard packages
-import java.io.*;
-
import org.mulgara.store.StoreException;
/**
@@ -47,11 +43,6 @@
private static final long serialVersionUID = -2415826145039347120L;
/**
- * Get line separator.
- */
- private static final String eol = System.getProperty("line.separator");
-
- /**
* CONSTRUCTOR GraphException TO DO
*
* @param message PARAMETER TO DO
@@ -67,7 +58,7 @@
* @param throwable PARAMETER TO DO
*/
public StatementStoreException(String message, Throwable throwable) {
- super(message + eol + stackTrace(throwable), throwable);
+ super(message, throwable);
}
/**
@@ -76,23 +67,7 @@
* @param throwable PARAMETER TO DO
*/
public StatementStoreException(Throwable throwable) {
- super(stackTrace(throwable), throwable);
+ super(throwable);
}
- /**
- * METHOD TO DO
- *
- * @param throwable PARAMETER TO DO
- * @return RETURNED VALUE TO DO
- */
- private static String stackTrace(Throwable throwable) {
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- pw.print(throwable.getMessage());
- pw.println(':');
- throwable.printStackTrace(pw);
-
- return sw.toString();
- }
}
Modified: trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreXAResource.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -55,8 +55,6 @@
* Technoogies, Inc.</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-
- at SuppressWarnings("unused")
public class StatementStoreXAResource
extends AbstractXAResource<RMInfo<StatementStoreXAResource.StatementStoreTxInfo>, StatementStoreXAResource.StatementStoreTxInfo> {
/** Logger. */
@@ -65,7 +63,7 @@
// Used to prevent multiple calls to prepare on the store layer.
// Set of session's that have been prepared.
- public static Set<XAResolverSession> preparing = new HashSet<XAResolverSession>();
+ private static final Set<XAResolverSession> preparing = new HashSet<XAResolverSession>();
private final XAResolverSession session;
Modified: trunk/src/jar/server/java/org/mulgara/server/ServletMulgaraServer.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/ServletMulgaraServer.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/server/java/org/mulgara/server/ServletMulgaraServer.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -146,7 +146,8 @@
loadLoggingConfig((new File(log4jConfigPath)).toURI().toURL());
} catch (Exception e) {
// log the error
- log.error(e);
+ System.err.println("Could not initialize logging configuration!");
+ e.printStackTrace(System.err);
// wrap it in a servlet exception
throw new ServletException(e);
}
@@ -333,22 +334,22 @@
} catch (SessionFactoryException sfe) {
// log the error
- log.error(sfe);
+ log.error("Error creating database", sfe);
// wrap it in a servlet exception
throw new ServletException(sfe);
} catch (UnknownHostException uhe) {
// log the error
- log.error(uhe);
+ log.error("Error creating database", uhe);
// wrap it in a servlet exception
throw new ServletException(uhe);
} catch (IOException ioe) {
// log the error
- log.error(ioe);
+ log.error("Error creating database", ioe);
// wrap it in a servlet exception
throw new ServletException(ioe);
} catch (URISyntaxException use) {
// log the error
- log.error(use);
+ log.error("Error creating database", use);
// wrap it in a servlet exception
throw new ServletException(use);
}
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/IteratorPageImpl.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/IteratorPageImpl.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/IteratorPageImpl.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -89,7 +89,7 @@
private int pageSize = 0;
/** The data held in the page. */
- private List rows;
+ private List<Object[]> rows;
/** The current row number. */
private int currentRow;
@@ -110,7 +110,7 @@
* @throws TuplesException Can be thrown while accessing the answer parameter.
*/
public IteratorPageImpl(Answer answer, int pageSize) throws TuplesException {
- rows = new ArrayList(pageSize);
+ rows = new ArrayList<Object[]>(pageSize);
int width = answer.getNumberOfVariables();
@@ -172,7 +172,7 @@
*/
public Object getObjectFromPage(int column) {
assert currentRow < pageSize && currentRow >= 0;
- return ((Object[])rows.get(currentRow))[column];
+ return (rows.get(currentRow))[column];
}
@@ -185,7 +185,7 @@
public Object getObjectFromPage(String name) throws TuplesException {
assert currentRow < pageSize && currentRow >= 0;
for (int i = 0; i < columnNames.length; i++) {
- if (name.equals(columnNames[i])) return ((Object[])rows.get(currentRow))[i];
+ if (name.equals(columnNames[i])) return (rows.get(currentRow))[i];
}
throw new TuplesException("Field not found: " + name);
}
@@ -351,9 +351,9 @@
output.writeInt(rows.size());
// The data in each row
- Iterator ri = rows.iterator();
+ Iterator<Object[]> ri = rows.iterator();
while (ri.hasNext()) {
- Object[] line = (Object[])ri.next();
+ Object[] line = ri.next();
// now write each element in the line
for (int c = 0; c < columnNames.length; c++) {
output.writeObject(line[c]);
@@ -377,7 +377,7 @@
protected void readRows(ObjectInputStream input) throws IOException, ClassNotFoundException {
// the number of rows
int rowCount = input.readInt();
- rows = new ArrayList(pageSize);
+ rows = new ArrayList<Object[]>(pageSize);
// iterate over each row and add
for (int r = 0; r < rowCount; r++) {
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -612,13 +612,13 @@
remoteSession.login(securityDomain, username, password);
} catch (RemoteException re) {
// unable to log in to a new session
- re.printStackTrace();
+ logger.warn("Cannot log in to remote session", re);
} finally {
resetRetries();
}
} catch (QueryException qe) {
// retry not possible
- qe.printStackTrace();
+ logger.warn("Cannot connect to remote session", qe);
}
}
}
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiURLConnection.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiURLConnection.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiURLConnection.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -95,8 +95,7 @@
rmiRegistryContext = new InitialContext(environment);
updateContent(name);
} catch (NamingException ne) {
- ne.printStackTrace();
- throw new IOException("Unable to establish connection: " + ne);
+ throw new IOException("Unable to establish connection", ne);
}
}
@@ -135,7 +134,7 @@
* @throws IOException If not connected.
* @see java.net.URLConnection#getContent()
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getContent(Class[] cls) throws IOException {
if (content == null) throw new IOException("Not connected");
if (testType(content.getClass(), cls)) return content;
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -37,25 +37,25 @@
private final static Logger logger = Logger.getLogger(AbstractSPGDateTime.class);
/** The arbitrary default year to use for a type that has no year. */
- public static int D_YEAR = 2000;
+ public static final int D_YEAR = 2000;
/** The arbitrary default month to use for a type that has no month. */
- public static int D_MONTH = 0;
+ public static final int D_MONTH = 0;
/** The arbitrary default day to use for a type that has no day. */
- public static int D_DAY = 1;
+ public static final int D_DAY = 1;
/** The arbitrary default hour to use for a types with no hour. */
- public static int D_HOUR_OF_DAY = 0;
+ public static final int D_HOUR_OF_DAY = 0;
/** The arbitrary default minute to use for a type that has no minutes. */
- public static int D_MINUTE = 0;
+ public static final int D_MINUTE = 0;
/** The arbitrary default seconds to use for a type that has no seconds. */
- public static int D_SECOND = 0;
+ public static final int D_SECOND = 0;
/** The arbitrary default milliseconds to use for a type that has no milliseconds. */
- public static int D_MILLISECOND = 0;
+ public static final int D_MILLISECOND = 0;
/** Bit 0 indicates a timezone. */
static final byte NO_TZ_BIT = 1;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -70,7 +70,12 @@
/**
* Format for local node numbers.
*/
- private static final NumberFormat formatter = new DecimalFormat("000000");
+ private static final ThreadLocal<NumberFormat> formatter = new ThreadLocal<NumberFormat>() {
+ @Override
+ protected NumberFormat initialValue() {
+ return new DecimalFormat("000000");
+ }
+ };
/**
* The maximum number of rows to display before abbreviating with an ellipsis.
@@ -123,7 +128,7 @@
buffer.append("[");
for (int i = 0; i < variables.length; i++) {
- buffer.append(formatter.format(cloned.getColumnValue(i)));
+ buffer.append(formatter.get().format(cloned.getColumnValue(i)));
buffer.append(" ");
}
buffer.append("]" + eol);
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnorderedProjection.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -208,7 +208,7 @@
if (columnMapping[column] == ABSENT_COLUMN) {
if (logger.isInfoEnabled()) {
- logger.info(getVariables()[column] + " is never bound\n" + new StackTrace());
+ logger.info(getVariables()[column] + " is never bound", new Throwable());
}
return true;
Modified: trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -105,7 +105,6 @@
}
catch (SQLException se) {
- se.printStackTrace();
logger.fatal("Failed to get columns or number of columns", se);
}
}
Modified: trunk/src/jar/util/java/org/mulgara/util/conversion/html/HtmlToTextConverter.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/conversion/html/HtmlToTextConverter.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/util/java/org/mulgara/util/conversion/html/HtmlToTextConverter.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -31,6 +31,8 @@
import java.io.*;
import java.util.*;
+import org.apache.log4j.Logger;
+
/**
* Converts HTML text into unicode text. <p>
*
@@ -63,6 +65,8 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
public class HtmlToTextConverter {
+
+ private static final Logger logger = Logger.getLogger(HtmlToTextConverter.class);
/**
* Private constructor to stop instanciation.
@@ -154,14 +158,22 @@
// Create the text string
Reader reader = parser.getReader();
- char[] buffer = new char[1024];
- int numRead = reader.read(buffer);
+ try {
+ char[] buffer = new char[1024];
+ int numRead = reader.read(buffer);
- while (numRead != -1) {
+ while (numRead != -1) {
- writer.write(buffer, 0, numRead);
- numRead = reader.read(buffer);
+ writer.write(buffer, 0, numRead);
+ numRead = reader.read(buffer);
+ }
+ } finally {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ logger.warn("Error closing reader", e);
+ }
}
writer.flush();
@@ -243,9 +255,18 @@
HTMLParser parser = new HTMLParser(file);
BufferedReader reader = new BufferedReader(parser.getReader());
- for (String l = reader.readLine(); l != null; l = reader.readLine()) {
+ try {
+ for (String l = reader.readLine(); l != null; l = reader.readLine()) {
- System.out.println(l);
+ System.out.println(l);
+ }
+ } finally {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ System.err.println("Error closing reader");
+ e.printStackTrace(System.err);
+ }
}
}
}
Modified: trunk/src/jar/util/java/org/mulgara/util/conversion/html/ParserThread.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/conversion/html/ParserThread.java 2011-09-29 00:32:32 UTC (rev 2060)
+++ trunk/src/jar/util/java/org/mulgara/util/conversion/html/ParserThread.java 2011-09-29 16:35:34 UTC (rev 2061)
@@ -29,11 +29,15 @@
import java.io.*;
+import org.apache.log4j.Logger;
+
/**
* The thread that performs HTML parsing.
*/
class ParserThread extends Thread {
+ private static final Logger logger = Logger.getLogger(ParserThread.class);
+
/** The parser to use. */
HTMLParser parser;
@@ -56,9 +60,9 @@
// parse document to pipeOut
parser.HTMLDocument();
} catch (ParseException e) {
- System.out.println("Parse Aborted: " + e.getMessage());
+ logger.warn("Parse Aborted", e);
} catch (TokenMgrError e) {
- System.out.println("Parse Aborted: " + e.getMessage());
+ logger.warn("Parse Aborted", e);
} finally {
parser.pipeOut.close();
synchronized (parser) {
@@ -68,7 +72,7 @@
}
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.warn("Error reading HTML content", e);
}
}
}
More information about the Mulgara-svn
mailing list