[Mulgara-svn] r1462 - in trunk/src/jar/query/java/org/mulgara/query: . filter filter/arithmetic filter/value rdf
pag at mulgara.org
pag at mulgara.org
Fri Jan 30 21:24:25 UTC 2009
Author: pag
Date: 2009-01-30 13:24:24 -0800 (Fri, 30 Jan 2009)
New Revision: 1462
Modified:
trunk/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/ArrayAnswer.java
trunk/src/jar/query/java/org/mulgara/query/ArrayAnswerUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/ConstraintBinaryOperation.java
trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java
trunk/src/jar/query/java/org/mulgara/query/GivenConstraint.java
trunk/src/jar/query/java/org/mulgara/query/GraphResourceUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/LocalNode.java
trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java
trunk/src/jar/query/java/org/mulgara/query/SpecialPredicates.java
trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java
trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java
trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java
trunk/src/jar/query/java/org/mulgara/query/filter/NAryOperatorFilter.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractAccessorFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java
trunk/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/rdf/URIReferenceImpl.java
trunk/src/jar/query/java/org/mulgara/query/rdf/VariableNodeImpl.java
Log:
Removed warnings by using generics, adding serialization IDs, suppressing warnings on unused loggers, and removing redundant imports and warning suppressions
Modified: trunk/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/AnswerOperationsUnitTest.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -32,13 +32,11 @@
// Java 2 standard packages
import java.sql.*;
-import java.util.*;
// Log4J
import org.apache.log4j.Logger;
// Locally written packages
-import org.mulgara.util.MulgaraResultSet;
import org.mulgara.util.ResultSetRow;
import org.mulgara.util.TestResultSet;
@@ -62,9 +60,8 @@
*/
public class AnswerOperationsUnitTest extends TestCase {
- /**
- * Logger.
- */
+ /** Logger. */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(AnswerOperationsUnitTest.class);
/**
Modified: trunk/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/AnswerUnitTest.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -39,7 +39,6 @@
import org.apache.log4j.Logger;
// Locally written packages
-import org.mulgara.util.MulgaraResultSet;
import org.mulgara.util.ResultSetRow;
import org.mulgara.util.TestResultSet;
@@ -63,9 +62,8 @@
*/
public class AnswerUnitTest extends TestCase {
- /**
- * Logger.
- */
+ /** Logger. */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(AnswerUnitTest.class);
/**
@@ -142,7 +140,7 @@
*/
public void testEmptyConstructor() throws Exception {
- List variables = Arrays.asList(new Variable[] { new Variable("x") });
+ List<Variable> variables = Arrays.asList(new Variable[] { new Variable("x") });
AnswerImpl empty = new AnswerImpl(variables);
assertTrue(!empty.next());
empty.close();
Modified: trunk/src/jar/query/java/org/mulgara/query/ArrayAnswer.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ArrayAnswer.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/ArrayAnswer.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -30,7 +30,6 @@
// Java 2 standard packages
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
// Third party packages
@@ -193,7 +192,7 @@
assert variables != null:"variables array is null";
// Copy the values
- List valueList = new ArrayList();
+ List<Object> valueList = new ArrayList<Object>();
rowCount = 0;
answer.beforeFirst();
Modified: trunk/src/jar/query/java/org/mulgara/query/ArrayAnswerUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ArrayAnswerUnitTest.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/ArrayAnswerUnitTest.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -27,9 +27,6 @@
package org.mulgara.query;
-// Java 2 standard packages
-import java.util.*;
-
// Third party packages
import junit.framework.*; // JUnit
import org.apache.log4j.Logger; // Log4J
@@ -57,9 +54,8 @@
*/
public class ArrayAnswerUnitTest extends TestCase {
- /**
- * Logger.
- */
+ /** Logger. */
+ @SuppressWarnings("unused")
private Logger logger = Logger.getLogger(ArrayAnswerUnitTest.class.getName());
/**
Modified: trunk/src/jar/query/java/org/mulgara/query/ConstraintBinaryOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstraintBinaryOperation.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstraintBinaryOperation.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -15,6 +15,9 @@
*/
public abstract class ConstraintBinaryOperation extends ConstraintOperation {
+ /** Serialization ID */
+ private static final long serialVersionUID = -267804943672931500L;
+
/**
* A binary-only constructor.
* @param lhs The LHS for the operation.
Modified: trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstraintHaving.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -63,9 +63,10 @@
// /** Logger. */
// private final static Logger logger = Logger.getLogger(ConstraintHaving.class);
- /**
- * The 4-tuple of elements (either nodes or variables)
- */
+ /** Serialization ID */
+ private static final long serialVersionUID = -802805844572698506L;
+
+ /** The 4-tuple of elements (either nodes or variables) */
protected final ConstraintElement[] element;
Modified: trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -33,7 +33,6 @@
/** Required serialization ID */
private static final long serialVersionUID = -6024259961466362580L;
- @SuppressWarnings("unchecked")
public ConstructQuery(List<? extends SelectElement> variableList, GraphExpression graphExpression,
ConstraintExpression constraintExpression,
List<Order> orderList, Integer limit, int offset) {
Modified: trunk/src/jar/query/java/org/mulgara/query/GivenConstraint.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/GivenConstraint.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/GivenConstraint.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -27,8 +27,6 @@
package org.mulgara.query;
-import java.util.Set;
-
/**
* An abstract class to be used by implementations of GIVEN clauses.
*
Modified: trunk/src/jar/query/java/org/mulgara/query/GraphResourceUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/GraphResourceUnitTest.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/GraphResourceUnitTest.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -56,9 +56,8 @@
*/
public class GraphResourceUnitTest extends TestCase {
- /**
- * Logger.
- */
+ /** Logger. */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(GraphResourceUnitTest.class);
/**
@@ -117,8 +116,7 @@
assertNotSame("Resources should be different instances", res2, res3);
assertTrue("Resource should be equal", res2.equals(res3));
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
Modified: trunk/src/jar/query/java/org/mulgara/query/LocalNode.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/LocalNode.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/LocalNode.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -49,8 +49,11 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class LocalNode implements Comparable, Value {
+public class LocalNode implements Comparable<LocalNode>, Value {
+ /** Serialization ID */
+ private static final long serialVersionUID = 2569319494439016623L;
+
/**
* The <var>value</var> property.
*/
@@ -101,22 +104,15 @@
/**
* Nodes compare based on their node number.
*
- * @param object the object to compare against.
- * @return RETURNED VALUE TO DO
+ * @param node the object to compare against.
+ * @return -1 if less than, 0 if equal, +1 if greater than the argument.
* @throws IllegalArgumentException if the object is not the correct type.
*/
- public int compareTo(Object object) throws IllegalArgumentException {
+ public int compareTo(LocalNode node) throws IllegalArgumentException {
- if (object instanceof LocalNode) {
+ long ov = node.getValue();
- long ov = ( (LocalNode) object).getValue();
-
return (ov == value) ? 0 : ( (ov < value) ? ( -1) : 1);
- }
- else {
-
- throw new IllegalArgumentException("Can't compare to " + object);
- }
}
//
Modified: trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/MulgaraTransactionException.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -35,8 +35,11 @@
*
* @licence Open Software License v3.0</a>
*/
-public class MulgaraTransactionException extends Exception
-{
+public class MulgaraTransactionException extends Exception {
+
+ /** Serialization ID */
+ private static final long serialVersionUID = 3841097225175843231L;
+
public MulgaraTransactionException(String message) {
super(message);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/SpecialPredicates.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/SpecialPredicates.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/SpecialPredicates.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -56,7 +56,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
- at SuppressWarnings({ "serial", "unchecked" })
+ at SuppressWarnings({ "serial" })
public class SpecialPredicates extends Vocabulary {
/** The string for the equality predicate */
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -25,6 +25,9 @@
*/
public abstract class AbstractBooleanFn extends AbstractFilterValue implements Filter {
+ /** Serialization ID */
+ private static final long serialVersionUID = -5045050008524194860L;
+
/** The variable to test */
RDFTerm operand;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -29,6 +29,9 @@
*/
public abstract class AbstractFilterValue extends AbstractContextOwner implements Filter, ValueLiteral {
+ /** Serialization ID */
+ private static final long serialVersionUID = 7034034367736302522L;
+
/** The operands for the operation */
protected RDFTerm[] operands;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -26,6 +26,9 @@
*/
public abstract class BinaryComparisonFilter extends AbstractFilterValue implements Filter {
+ /** Serialization ID */
+ private static final long serialVersionUID = -5041035997419603862L;
+
/** The first operand */
protected ComparableExpression lhs;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -25,6 +25,9 @@
*/
public abstract class BinaryTestFilter extends AbstractFilterValue implements Filter {
+ /** Serialization ID */
+ private static final long serialVersionUID = 6169856559090192157L;
+
/** The first operand */
protected RDFTerm lhs;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/NAryOperatorFilter.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/NAryOperatorFilter.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/NAryOperatorFilter.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -29,6 +29,9 @@
*/
public abstract class NAryOperatorFilter extends AbstractFilterValue implements ValueLiteral {
+ /** Serialization ID */
+ private static final long serialVersionUID = -558162654076780285L;
+
/**
* Creates a multiple operand operation
* @param operands The operands for this filter operation.
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -23,6 +23,9 @@
*/
public abstract class AbstractNumericOperation extends AbstractComparable implements NumericExpression {
+ /** Serialization ID */
+ private static final long serialVersionUID = -6795347129998821301L;
+
/** The owner of the context for resolving here */
private ContextOwner owner = null;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -28,6 +28,9 @@
*/
public abstract class BinaryOperation extends AbstractNumericOperation implements NumericExpression {
+ /** Serialization ID */
+ private static final long serialVersionUID = -8435619400443937913L;
+
/** The first operand */
protected NumericExpression lhs;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractAccessorFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractAccessorFn.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractAccessorFn.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -30,6 +30,9 @@
*/
public abstract class AbstractAccessorFn extends AbstractFilterValue implements ValueLiteral {
+ /** Serialization ID */
+ private static final long serialVersionUID = 291544759144763946L;
+
/** The operand for the function */
RDFTerm operand;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -27,6 +27,9 @@
*/
public abstract class AbstractComparable extends AbstractContextOwner implements ComparableExpression {
+ /** Serialization ID */
+ private static final long serialVersionUID = -8790392353983171058L;
+
/** {@inheritDoc} */
public boolean lessThan(ComparableExpression v) throws QueryException {
compatibilityTest(v);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -29,6 +29,9 @@
*/
public abstract class AbstractComparableLiteral extends AbstractComparable implements ValueLiteral {
+ /** Serialization ID */
+ private static final long serialVersionUID = 8196102019234790023L;
+
/** The wrapped value */
Object value;
Modified: trunk/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/rdf/LiteralImplUnitTest.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -57,11 +57,8 @@
*/
public class LiteralImplUnitTest extends TestCase {
- /**
- * Logger.
- *
- * This is named after the class.
- */
+ /** Logger. */
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(LiteralImplUnitTest.class);
/**
Modified: trunk/src/jar/query/java/org/mulgara/query/rdf/URIReferenceImpl.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/rdf/URIReferenceImpl.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/rdf/URIReferenceImpl.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -36,7 +36,6 @@
import org.jrdf.graph.*;
// Local packages
-import org.mulgara.query.ConstraintElement;
import org.mulgara.query.Value;
/**
@@ -58,7 +57,7 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
public class URIReferenceImpl extends AbstractURIReference
- implements Comparable, Serializable, Value {
+ implements Comparable<Node>, Serializable, Value {
/**
* Allow newer compiled version of the stub to operate when changes
@@ -98,7 +97,7 @@
* @param object PARAMETER TO DO
* @return RETURNED VALUE TO DO
*/
- public int compareTo(java.lang.Object object) {
+ public int compareTo(Node object) {
if (object instanceof BlankNode) {
return 1;
Modified: trunk/src/jar/query/java/org/mulgara/query/rdf/VariableNodeImpl.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/rdf/VariableNodeImpl.java 2009-01-30 21:21:34 UTC (rev 1461)
+++ trunk/src/jar/query/java/org/mulgara/query/rdf/VariableNodeImpl.java 2009-01-30 21:24:24 UTC (rev 1462)
@@ -34,8 +34,7 @@
// JRDF
import org.jrdf.graph.*;
-//Local packages
-import org.mulgara.query.ConstraintElement;
+// Local packages
import org.mulgara.query.Value;
/**
More information about the Mulgara-svn
mailing list