jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1166138 [10/12] - in /jackrabbit/sandbox/jackrabbit-mk: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/batch/ jackrabbit-spi-commons/src/main/j...
Date Wed, 07 Sep 2011 12:00:20 GMT
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java Wed Sep  7 12:00:14 2011
@@ -16,17 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.DescendantNodeJoinCondition;
-
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
+import javax.jcr.query.qom.DescendantNodeJoinCondition;
 
 /**
- * <code>DescendantNodeJoinConditionImpl</code>...
+ * {@code DescendantNodeJoinConditionImpl}...
  */
-public class DescendantNodeJoinConditionImpl
-        extends JoinConditionImpl
-        implements DescendantNodeJoinCondition {
+public class DescendantNodeJoinConditionImpl extends JoinConditionImpl implements DescendantNodeJoinCondition {
 
     /**
      * Name of the descendant selector.
@@ -51,6 +49,7 @@ public class DescendantNodeJoinCondition
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getDescendantSelectorName() {
         return getJCRName(descendantSelectorName);
     }
@@ -60,6 +59,7 @@ public class DescendantNodeJoinCondition
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getAncestorSelectorName() {
         return getJCRName(ancestorSelectorName);
     }
@@ -85,11 +85,12 @@ public class DescendantNodeJoinCondition
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -99,7 +100,7 @@ public class DescendantNodeJoinCondition
     public String toString() {
         String descendant = getDescendantSelectorName();
         String ancestor = getAncestorSelectorName();
-        return "ISDESCENDANTNODE(" + descendant + ", " + ancestor + ")";
+        return "ISDESCENDANTNODE(" + descendant + ", " + ancestor + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DynamicOperandImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DynamicOperandImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DynamicOperandImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DynamicOperandImpl.java Wed Sep  7 12:00:14 2011
@@ -16,18 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.DynamicOperand;
-
+import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 
-import org.apache.jackrabbit.spi.Name;
+import javax.jcr.query.qom.DynamicOperand;
 
 /**
- * <code>DynamicOperandImpl</code>...
+ * {@code DynamicOperandImpl}...
  */
-public abstract class DynamicOperandImpl
-        extends AbstractQOMNode
-        implements DynamicOperand {
+public abstract class DynamicOperandImpl extends AbstractQOMNode implements DynamicOperand {
 
     /**
      * The name of a selector.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/EquiJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/EquiJoinConditionImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/EquiJoinConditionImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/EquiJoinConditionImpl.java Wed Sep  7 12:00:14 2011
@@ -16,17 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.EquiJoinCondition;
-
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 
+import javax.jcr.query.qom.EquiJoinCondition;
+
 /**
- * <code>EquiJoinConditionImpl</code>...
+ * {@code EquiJoinConditionImpl}...
  */
-public class EquiJoinConditionImpl
-        extends JoinConditionImpl
-        implements EquiJoinCondition {
+public class EquiJoinConditionImpl extends JoinConditionImpl implements EquiJoinCondition {
 
     /**
      * Name of the first selector.
@@ -65,6 +63,7 @@ public class EquiJoinConditionImpl
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelector1Name() {
         return getJCRName(selector1Name);
     }
@@ -74,6 +73,7 @@ public class EquiJoinConditionImpl
      *
      * @return the property name; non-null
      */
+    @Override
     public String getProperty1Name() {
         return getJCRName(property1Name);
     }
@@ -83,6 +83,7 @@ public class EquiJoinConditionImpl
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelector2Name() {
         return getJCRName(selector2Name);
     }
@@ -92,6 +93,7 @@ public class EquiJoinConditionImpl
      *
      * @return the property name; non-null
      */
+    @Override
     public String getProperty2Name() {
         return getJCRName(property2Name);
     }
@@ -135,11 +137,12 @@ public class EquiJoinConditionImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -147,8 +150,8 @@ public class EquiJoinConditionImpl
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return getSelector1Name() + "." + quote(getProperty1QName())
-            + " = " + getSelector2Name() + "." + quote(getProperty2QName());
+        return getSelector1Name() + '.' + quote(getProperty1QName())
+            + " = " + getSelector2Name() + '.' + quote(getProperty2QName());
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java Wed Sep  7 12:00:14 2011
@@ -16,18 +16,16 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.FullTextSearch;
-import javax.jcr.query.qom.StaticOperand;
-
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 
+import javax.jcr.query.qom.FullTextSearch;
+import javax.jcr.query.qom.StaticOperand;
+
 /**
- * <code>FullTextSearchImpl</code>...
+ * {@code FullTextSearchImpl}...
  */
-public class FullTextSearchImpl
-        extends ConstraintImpl
-        implements FullTextSearch {
+public class FullTextSearchImpl extends ConstraintImpl implements FullTextSearch {
 
     /**
      * Name of the selector against which to apply this constraint
@@ -68,7 +66,7 @@ public class FullTextSearchImpl
      *
      * @return the property name if the full-text search scope is a property,
      *         otherwise null if the full-text search scope is the node (or node
-     *         subtree, in some implementations).
+     *         sub tree, in some implementations).
      */
     public Name getPropertyQName() {
         return propertyName;
@@ -81,6 +79,7 @@ public class FullTextSearchImpl
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelectorName() {
         return getJCRName(selectorName);
     }
@@ -90,8 +89,9 @@ public class FullTextSearchImpl
      *
      * @return the property name if the full-text search scope is a property,
      *         otherwise null if the full-text search scope is the node (or node
-     *         subtree, in some implementations).
+     *         sub tree, in some implementations).
      */
+    @Override
     public String getPropertyName() {
         return getJCRName(propertyName);
     }
@@ -101,6 +101,7 @@ public class FullTextSearchImpl
      *
      * @return the full-text search expression; non-null
      */
+    @Override
     public StaticOperand getFullTextSearchExpression() {
         return fullTextSearchExpression;
     }
@@ -108,11 +109,12 @@ public class FullTextSearchImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -124,14 +126,14 @@ public class FullTextSearchImpl
         builder.append("CONTAINS(");
         builder.append(getSelectorName());
         if (propertyName != null) {
-            builder.append(".");
+            builder.append('.');
             builder.append(quote(propertyName));
             builder.append(", ");
         } else {
             builder.append(".*, ");
         }
         builder.append(getFullTextSearchExpression());
-        builder.append(")");
+        builder.append(')');
         return builder.toString();
     }
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchScoreImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchScoreImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchScoreImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchScoreImpl.java Wed Sep  7 12:00:14 2011
@@ -16,17 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.FullTextSearchScore;
-
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
+import javax.jcr.query.qom.FullTextSearchScore;
 
 /**
- * <code>FullTextSearchScoreImpl</code>...
+ * {@code FullTextSearchScoreImpl}...
  */
-public class FullTextSearchScoreImpl
-        extends DynamicOperandImpl
-        implements FullTextSearchScore {
+public class FullTextSearchScoreImpl extends DynamicOperandImpl implements FullTextSearchScore {
 
     FullTextSearchScoreImpl(NamePathResolver resolver, Name selectorName) {
         super(resolver, selectorName);
@@ -35,11 +33,12 @@ public class FullTextSearchScoreImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -47,7 +46,7 @@ public class FullTextSearchScoreImpl
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return "SCORE(" + getSelectorName() + ")";
+        return "SCORE(" + getSelectorName() + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java Wed Sep  7 12:00:14 2011
@@ -16,15 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.commons.query.qom.JoinType;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.query.qom.Join;
 import javax.jcr.query.qom.JoinCondition;
 import javax.jcr.query.qom.Source;
 
-import org.apache.jackrabbit.commons.query.qom.JoinType;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>JoinImpl</code>...
+ * {@code JoinImpl}...
  */
 public class JoinImpl extends SourceImpl implements Join {
 
@@ -69,6 +69,7 @@ public class JoinImpl extends SourceImpl
      *
      * @return the left source; non-null
      */
+    @Override
     public Source getLeft() {
         return left;
     }
@@ -78,18 +79,15 @@ public class JoinImpl extends SourceImpl
      *
      * @return the right source; non-null
      */
+    @Override
     public Source getRight() {
         return right;
     }
 
     /**
      * Gets the join type.
-     *
-     * @return either <ul> <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_INNER},</li>
-     *         <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_LEFT_OUTER},</li>
-     *         <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_RIGHT_OUTER}</li>
-     *         </ul>
      */
+    @Override
     public String getJoinType() {
         return joinType.toString();
     }
@@ -99,15 +97,14 @@ public class JoinImpl extends SourceImpl
      *
      * @return the join condition; non-null
      */
+    @Override
     public JoinCondition getJoinCondition() {
         return joinCondition;
     }
 
     //---------------------------< SourceImpl >---------------------------------
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public SelectorImpl[] getSelectors() {
         SelectorImpl[] leftSelectors = left.getSelectors();
         SelectorImpl[] rightSelectors = right.getSelectors();
@@ -121,11 +118,12 @@ public class JoinImpl extends SourceImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java Wed Sep  7 12:00:14 2011
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.query.qom.Length;
 import javax.jcr.query.qom.PropertyValue;
 
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>LengthImpl</code>...
+ * {@code LengthImpl}...
  */
 public class LengthImpl extends DynamicOperandImpl implements Length {
 
@@ -41,6 +41,7 @@ public class LengthImpl extends DynamicO
      *
      * @return the property value; non-null
      */
+    @Override
     public PropertyValue getPropertyValue() {
         return propertyValue;
     }
@@ -48,11 +49,12 @@ public class LengthImpl extends DynamicO
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -60,7 +62,7 @@ public class LengthImpl extends DynamicO
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return "LENGTH(" + getPropertyValue() + ")";
+        return "LENGTH(" + getPropertyValue() + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LiteralImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LiteralImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LiteralImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LiteralImpl.java Wed Sep  7 12:00:14 2011
@@ -24,7 +24,7 @@ import javax.jcr.Value;
 import javax.jcr.query.qom.Literal;
 
 /**
- * <code>LiteralImpl</code>...
+ * {@code LiteralImpl}...
  */
 public class LiteralImpl extends StaticOperandImpl implements Literal {
 
@@ -38,6 +38,7 @@ public class LiteralImpl extends StaticO
     /**
      * @return the value of this literal.
      */
+    @Override
     public Value getLiteralValue() {
         return value;
     }
@@ -45,11 +46,12 @@ public class LiteralImpl extends StaticO
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -91,10 +93,10 @@ public class LiteralImpl extends StaticO
     }
 
     private String cast(String type) throws RepositoryException {
-        return "CAST(" + escape() + " AS " + type + ")";
+        return "CAST(" + escape() + " AS " + type + ')';
     }
 
     private String escape() throws RepositoryException {
-        return "'" + value.getString().replace("'", "''") + "'";
+        return '\'' + value.getString().replace("'", "''") + '\'';
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LowerCaseImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LowerCaseImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LowerCaseImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LowerCaseImpl.java Wed Sep  7 12:00:14 2011
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.query.qom.DynamicOperand;
 import javax.jcr.query.qom.LowerCase;
 
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>LowerCaseImpl</code>...
+ * {@code LowerCaseImpl}...
  */
 public class LowerCaseImpl extends DynamicOperandImpl implements LowerCase {
 
@@ -41,6 +41,7 @@ public class LowerCaseImpl extends Dynam
      *
      * @return the operand; non-null
      */
+    @Override
     public DynamicOperand getOperand() {
         return operand;
     }
@@ -48,11 +49,12 @@ public class LowerCaseImpl extends Dynam
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -60,7 +62,7 @@ public class LowerCaseImpl extends Dynam
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return "LOWER(" + operand + ")";
+        return "LOWER(" + operand + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeLocalNameImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeLocalNameImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeLocalNameImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeLocalNameImpl.java Wed Sep  7 12:00:14 2011
@@ -16,17 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.NodeLocalName;
-
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
+import javax.jcr.query.qom.NodeLocalName;
 
 /**
- * <code>NodeLocalNameImpl</code>...
+ * {@code NodeLocalNameImpl}...
  */
-public class NodeLocalNameImpl
-        extends DynamicOperandImpl
-        implements NodeLocalName {
+public class NodeLocalNameImpl extends DynamicOperandImpl implements NodeLocalName {
 
     NodeLocalNameImpl(NamePathResolver resolver, Name selectorName) {
         super(resolver, selectorName);
@@ -35,11 +33,12 @@ public class NodeLocalNameImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -47,7 +46,7 @@ public class NodeLocalNameImpl
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return "LOCALNAME(" + getSelectorName() + ")";
+        return "LOCALNAME(" + getSelectorName() + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeNameImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeNameImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeNameImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NodeNameImpl.java Wed Sep  7 12:00:14 2011
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.NodeName;
-
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
+import javax.jcr.query.qom.NodeName;
 
 /**
- * <code>NodeNameImpl</code>...
+ * {@code NodeNameImpl}...
  */
 public class NodeNameImpl extends DynamicOperandImpl implements NodeName {
 
@@ -33,11 +33,12 @@ public class NodeNameImpl extends Dynami
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -45,7 +46,7 @@ public class NodeNameImpl extends Dynami
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return "NAME(" + getSelectorName() + ")";
+        return "NAME(" + getSelectorName() + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NotImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NotImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NotImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/NotImpl.java Wed Sep  7 12:00:14 2011
@@ -16,18 +16,18 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.query.qom.Constraint;
 import javax.jcr.query.qom.Not;
 
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>NotImpl</code>...
+ * {@code NotImpl}...
  */
 public class NotImpl extends ConstraintImpl implements Not {
 
     /**
-     * The constraint negated by this <code>Not</code> constraint.
+     * The constraint negated by this {@code Not} constraint.
      */
     private final ConstraintImpl constraint;
 
@@ -37,10 +37,11 @@ public class NotImpl extends ConstraintI
     }
 
     /**
-     * Gets the constraint negated by this <code>Not</code> constraint.
+     * Gets the constraint negated by this {@code Not} constraint.
      *
      * @return the constraint; non-null
      */
+    @Override
     public Constraint getConstraint() {
         return constraint;
     }
@@ -48,11 +49,12 @@ public class NotImpl extends ConstraintI
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrImpl.java Wed Sep  7 12:00:14 2011
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.query.qom.Constraint;
 import javax.jcr.query.qom.Or;
 
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>OrImpl</code>...
+ * {@code OrImpl}...
  */
 public class OrImpl extends ConstraintImpl implements Or {
 
@@ -38,8 +38,8 @@ public class OrImpl extends ConstraintIm
 
     OrImpl(NamePathResolver resolver, ConstraintImpl c1, ConstraintImpl c2) {
         super(resolver);
-        this.constraint1 = c1;
-        this.constraint2 = c2;
+        constraint1 = c1;
+        constraint2 = c2;
     }
 
     /**
@@ -47,6 +47,7 @@ public class OrImpl extends ConstraintIm
      *
      * @return the constraint; non-null
      */
+    @Override
     public Constraint getConstraint1() {
         return constraint1;
     }
@@ -56,6 +57,7 @@ public class OrImpl extends ConstraintIm
      *
      * @return the constraint; non-null
      */
+    @Override
     public Constraint getConstraint2() {
         return constraint2;
     }
@@ -63,11 +65,12 @@ public class OrImpl extends ConstraintIm
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java Wed Sep  7 12:00:14 2011
@@ -16,20 +16,20 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.commons.query.qom.Order;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.query.qom.DynamicOperand;
 import javax.jcr.query.qom.Ordering;
 import javax.jcr.query.qom.QueryObjectModelConstants;
 
-import org.apache.jackrabbit.commons.query.qom.Order;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>OrderingImpl</code>...
+ * {@code OrderingImpl}...
  */
 public class OrderingImpl extends AbstractQOMNode implements Ordering {
 
     /**
-     * Empty <code>OrderingImpl</code> array.
+     * Empty {@code OrderingImpl} array.
      */
     public static final OrderingImpl[] EMPTY_ARRAY = new OrderingImpl[0];
 
@@ -56,6 +56,7 @@ public class OrderingImpl extends Abstra
      *
      * @return the operand; non-null
      */
+    @Override
     public DynamicOperand getOperand() {
         return operand;
     }
@@ -67,13 +68,14 @@ public class OrderingImpl extends Abstra
      *         or</li> <li>{@link QueryObjectModelConstants#JCR_ORDER_DESCENDING}</li>
      *         </ul>
      */
+    @Override
     public String getOrder() {
         return order.getName();
     }
 
     /**
-     * @return <code>true</code> if this ordering is ascending. Returns
-     *         <code>false</code> if ordering is descending.
+     * @return {@code true} if this ordering is ascending. Returns
+     *         {@code false} if ordering is descending.
      */
     public boolean isAscending() {
         return order == Order.ASCENDING;
@@ -82,11 +84,12 @@ public class OrderingImpl extends Abstra
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java Wed Sep  7 12:00:14 2011
@@ -16,17 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.PropertyExistence;
-
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 
+import javax.jcr.query.qom.PropertyExistence;
+
 /**
- * <code>PropertyExistenceImpl</code>...
+ * {@code PropertyExistenceImpl}...
  */
-public class PropertyExistenceImpl
-        extends ConstraintImpl
-        implements PropertyExistence {
+public class PropertyExistenceImpl extends ConstraintImpl implements PropertyExistence {
 
     /**
      * The name of the selector against which to apply this constraint.
@@ -71,6 +69,7 @@ public class PropertyExistenceImpl
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelectorName() {
         return getJCRName(selectorName);
     }
@@ -80,6 +79,7 @@ public class PropertyExistenceImpl
      *
      * @return the property name; non-null
      */
+    @Override
     public String getPropertyName() {
         return getJCRName(propertyName);
     }
@@ -87,11 +87,12 @@ public class PropertyExistenceImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -99,7 +100,7 @@ public class PropertyExistenceImpl
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return getSelectorName() + "." + quote(propertyName) + " IS NOT NULL";
+        return getSelectorName() + '.' + quote(propertyName) + " IS NOT NULL";
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java Wed Sep  7 12:00:14 2011
@@ -16,17 +16,15 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.PropertyValue;
-
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
+import javax.jcr.query.qom.PropertyValue;
 
 /**
- * <code>PropertyValueImpl</code>...
+ * {@code PropertyValueImpl}...
  */
-public class PropertyValueImpl
-        extends DynamicOperandImpl
-        implements PropertyValue {
+public class PropertyValueImpl extends DynamicOperandImpl implements PropertyValue {
 
     /**
      * The name of the property.
@@ -56,6 +54,7 @@ public class PropertyValueImpl
      *
      * @return the property name; non-null
      */
+    @Override
     public String getPropertyName() {
         return getJCRName(propertyName);
     }
@@ -63,11 +62,12 @@ public class PropertyValueImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -75,7 +75,7 @@ public class PropertyValueImpl
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return getSelectorName() + "." + quote(propertyName);
+        return getSelectorName() + '.' + quote(propertyName);
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QOMTreeVisitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QOMTreeVisitor.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QOMTreeVisitor.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QOMTreeVisitor.java Wed Sep  7 12:00:14 2011
@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.spi.commons.query.qom;
 
 /**
- * <code>QOMTreeVisitor</code>...
+ * {@code QOMTreeVisitor}...
  */
 public interface QOMTreeVisitor {
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java Wed Sep  7 12:00:14 2011
@@ -16,6 +16,13 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
+import org.apache.jackrabbit.commons.query.qom.JoinType;
+import org.apache.jackrabbit.commons.query.qom.Operator;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.spi.commons.conversion.NameException;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.query.InvalidQueryException;
@@ -54,15 +61,8 @@ import javax.jcr.query.qom.Source;
 import javax.jcr.query.qom.StaticOperand;
 import javax.jcr.query.qom.UpperCase;
 
-import org.apache.jackrabbit.commons.query.qom.JoinType;
-import org.apache.jackrabbit.commons.query.qom.Operator;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.Path;
-import org.apache.jackrabbit.spi.commons.conversion.NameException;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-
 /**
- * <code>QueryObjectModelFactoryImpl</code> implements the query object model
+ * {@code QueryObjectModelFactoryImpl} implements the query object model
  * factory from JSR 283.
  */
 public abstract class QueryObjectModelFactoryImpl implements QueryObjectModelFactory {
@@ -86,8 +86,7 @@ public abstract class QueryObjectModelFa
      *                               implementation.
      * @throws RepositoryException   if any other error occurs.
      */
-    protected abstract QueryObjectModel createQuery(QueryObjectModelTree qomTree)
-            throws InvalidQueryException, RepositoryException;
+    protected abstract QueryObjectModel createQuery(QueryObjectModelTree qomTree) throws RepositoryException;
 
     /**
      * Creates a query with one selector.
@@ -104,18 +103,16 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public QueryObjectModel createQuery                                           // CM
-            (Selector selector,
-             Constraint constraint,
-             Ordering[] orderings,
-             Column[] columns) throws InvalidQueryException, RepositoryException {
+    public QueryObjectModel createQuery(Selector selector, Constraint constraint, Ordering[] orderings, Column[] columns)
+            throws RepositoryException {
+
         return createQuery((Source) selector, constraint, orderings, columns);
     }
 
     /**
      * Creates a query with one or more selectors.
      * <p/>
-     * If <code>source</code> is a selector, that selector is the <i>default
+     * If {@code source} is a selector, that selector is the <i>default
      * selector</i> of the query.  Otherwise the query does not have a default
      * selector.
      *
@@ -129,11 +126,9 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public QueryObjectModel createQuery(Source source,
-                                        Constraint constraint,
-                                        Ordering[] orderings,
-                                        Column[] columns)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public QueryObjectModel createQuery(Source source, Constraint constraint, Ordering[] orderings, Column[] columns)
+            throws RepositoryException {
         if (source == null) {
             throw new InvalidQueryException("source must not be null");
         }
@@ -184,8 +179,7 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Selector selector(String nodeTypeName)                                 // CM
-            throws InvalidQueryException, RepositoryException {
+    public Selector selector(String nodeTypeName) throws RepositoryException {
         Name ntName = checkNodeTypeName(nodeTypeName);
         return new SelectorImpl(resolver, ntName, ntName);
     }
@@ -200,8 +194,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Selector selector(String nodeTypeName, String selectorName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Selector selector(String nodeTypeName, String selectorName) throws RepositoryException {
         return new SelectorImpl(resolver, checkNodeTypeName(nodeTypeName),
                 checkSelectorName(selectorName));
     }
@@ -221,11 +215,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Join join(Source left,
-                     Source right,
-                     String joinTypeName,
-                     JoinCondition joinCondition)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Join join(Source left, Source right, String joinTypeName, JoinCondition joinCondition)
+            throws RepositoryException {
+
         if (!(left instanceof SourceImpl) || !(right instanceof SourceImpl)) {
             throw new RepositoryException("Unknown Source implementation");
         }
@@ -253,11 +246,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public EquiJoinCondition equiJoinCondition(String selector1Name,
-                                               String property1Name,
-                                               String selector2Name,
-                                               String property2Name)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public EquiJoinCondition equiJoinCondition(String selector1Name, String property1Name, String selector2Name, String property2Name)
+            throws RepositoryException {
+
         return new EquiJoinConditionImpl(resolver,
                 checkSelectorName(selector1Name),
                 checkPropertyName(property1Name),
@@ -276,10 +268,9 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public SameNodeJoinCondition sameNodeJoinCondition(String selector1Name,
-                                                       String selector2Name)
-            throws InvalidQueryException, RepositoryException                          // CM
-    {
+    public SameNodeJoinCondition sameNodeJoinCondition(String selector1Name, String selector2Name)
+            throws RepositoryException {
+
         return new SameNodeJoinConditionImpl(resolver,
                 checkSelectorName(selector1Name),
                 checkSelectorName(selector2Name),
@@ -298,10 +289,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public SameNodeJoinCondition sameNodeJoinCondition(String selector1Name,
-                                                       String selector2Name,
-                                                       String selector2Path)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public SameNodeJoinCondition sameNodeJoinCondition(String selector1Name, String selector2Name, String selector2Path)
+            throws RepositoryException {
+
         return new SameNodeJoinConditionImpl(resolver,
                 checkSelectorName(selector1Name),
                 checkSelectorName(selector2Name),
@@ -319,9 +310,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public ChildNodeJoinCondition childNodeJoinCondition(
-            String childSelectorName, String parentSelectorName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public ChildNodeJoinCondition childNodeJoinCondition(String childSelectorName, String parentSelectorName)
+            throws RepositoryException {
+
         return new ChildNodeJoinConditionImpl(resolver,
                 checkSelectorName(childSelectorName),
                 checkSelectorName(parentSelectorName));
@@ -340,9 +332,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public DescendantNodeJoinCondition descendantNodeJoinCondition(
-            String descendantSelectorName, String ancestorSelectorName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public DescendantNodeJoinCondition descendantNodeJoinCondition(String descendantSelectorName, String ancestorSelectorName)
+            throws RepositoryException {
+
         return new DescendantNodeJoinConditionImpl(resolver,
                 checkSelectorName(descendantSelectorName),
                 checkSelectorName(ancestorSelectorName));
@@ -353,13 +346,13 @@ public abstract class QueryObjectModelFa
      *
      * @param constraint1 the first constraint; non-null
      * @param constraint2 the second constraint; non-null
-     * @return the <code>And</code> constraint; non-null
+     * @return the {@code And} constraint; non-null
      * @throws javax.jcr.query.InvalidQueryException
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public And and(Constraint constraint1, Constraint constraint2)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public And and(Constraint constraint1, Constraint constraint2) throws RepositoryException {
         if (constraint1 == null || constraint2 == null) {
             throw new InvalidQueryException("Constraints must not be null");
         }
@@ -378,13 +371,13 @@ public abstract class QueryObjectModelFa
      *
      * @param constraint1 the first constraint; non-null
      * @param constraint2 the second constraint; non-null
-     * @return the <code>Or</code> constraint; non-null
+     * @return the {@code Or} constraint; non-null
      * @throws javax.jcr.query.InvalidQueryException
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Or or(Constraint constraint1, Constraint constraint2)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Or or(Constraint constraint1, Constraint constraint2) throws RepositoryException {
         if (constraint1 == null || constraint2 == null) {
             throw new InvalidQueryException("Constraints must not be null");
         }
@@ -402,12 +395,13 @@ public abstract class QueryObjectModelFa
      * Performs a logical negation of another constraint.
      *
      * @param constraint the constraint to be negated; non-null
-     * @return the <code>Not</code> constraint; non-null
+     * @return the {@code Not} constraint; non-null
      * @throws javax.jcr.query.InvalidQueryException
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Not not(Constraint constraint) throws InvalidQueryException, RepositoryException {
+    @Override
+    public Not not(Constraint constraint) throws RepositoryException {
         if (!(constraint instanceof ConstraintImpl)) {
             throw new RepositoryException("Unknown Constraint implementation");
         }
@@ -430,9 +424,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Comparison comparison(
-            DynamicOperand left, String operatorName, StaticOperand right)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Comparison comparison(DynamicOperand left, String operatorName, StaticOperand right)
+            throws RepositoryException {
+
         if (!(left instanceof DynamicOperandImpl)) {
             throw new RepositoryException("Invalid left operand: " + left);
         }
@@ -457,8 +452,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public PropertyExistence propertyExistence(String propertyName)               // CM
-            throws InvalidQueryException, RepositoryException {
+    public PropertyExistence propertyExistence(String propertyName) throws RepositoryException {
         return new PropertyExistenceImpl(
                 resolver, null, checkPropertyName(propertyName));
     }
@@ -473,9 +467,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public PropertyExistence propertyExistence(String selectorName,
-                                               String propertyName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public PropertyExistence propertyExistence(String selectorName, String propertyName) throws RepositoryException {
         return new PropertyExistenceImpl(resolver,
                 checkSelectorName(selectorName),
                 checkPropertyName(propertyName));
@@ -495,10 +488,9 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public FullTextSearch fullTextSearch(String propertyName,
-            StaticOperand fullTextSearchExpression)
-            throws InvalidQueryException, RepositoryException                          // CM
-    {
+    public FullTextSearch fullTextSearch(String propertyName, StaticOperand fullTextSearchExpression)
+            throws RepositoryException {
+
         Name propName = null;
         if (propertyName != null) {
             propName = checkPropertyName(propertyName);
@@ -521,10 +513,10 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public FullTextSearch fullTextSearch(String selectorName,
-                                         String propertyName,
-                                         StaticOperand fullTextSearchExpression)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public FullTextSearch fullTextSearch(String selectorName, String propertyName, StaticOperand fullTextSearchExpression)
+            throws RepositoryException {
+
         if (fullTextSearchExpression == null) {
             throw new IllegalArgumentException(
                     "Full text search expression is null");
@@ -549,8 +541,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public SameNode sameNode(String path) throws InvalidQueryException, RepositoryException                          // CM
-    {
+    public SameNode sameNode(String path) throws RepositoryException {
         return new SameNodeImpl(resolver, null, checkPath(path));
     }
 
@@ -565,8 +556,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public SameNode sameNode(String selectorName, String path)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public SameNode sameNode(String selectorName, String path) throws RepositoryException {
         return new SameNodeImpl(
                 resolver, checkSelectorName(selectorName), checkPath(path));
     }
@@ -582,8 +573,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public ChildNode childNode(String path) throws InvalidQueryException, RepositoryException                          // CM
-    {
+    public ChildNode childNode(String path) throws RepositoryException {
         return new ChildNodeImpl(resolver, null, checkPath(path));
     }
 
@@ -598,10 +588,9 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public ChildNode childNode(String selectorName, String path)
-            throws InvalidQueryException, RepositoryException {
-        return new ChildNodeImpl(
-                resolver, checkSelectorName(selectorName), checkPath(path));
+    @Override
+    public ChildNode childNode(String selectorName, String path) throws RepositoryException {
+        return new ChildNodeImpl(resolver, checkSelectorName(selectorName), checkPath(path));
     }
 
     /**
@@ -615,8 +604,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public DescendantNode descendantNode(String path)
-            throws InvalidQueryException, RepositoryException {
+    public DescendantNode descendantNode(String path) throws RepositoryException {
         return new DescendantNodeImpl(resolver, null, checkPath(path));
     }
 
@@ -631,8 +619,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public DescendantNode descendantNode(String selectorName, String path)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public DescendantNode descendantNode(String selectorName, String path) throws RepositoryException {
         return new DescendantNodeImpl(resolver,
                 checkSelectorName(selectorName), checkPath(path));
     }
@@ -648,8 +636,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public PropertyValue propertyValue(String propertyName)                       // CM
-            throws InvalidQueryException, RepositoryException {
+    public PropertyValue propertyValue(String propertyName) throws RepositoryException {
         return new PropertyValueImpl(resolver, null, checkPropertyName(propertyName));
     }
 
@@ -664,9 +651,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public PropertyValue propertyValue(String selectorName,
-                                       String propertyName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public PropertyValue propertyValue(String selectorName, String propertyName) throws RepositoryException {
         return new PropertyValueImpl(resolver,
                 checkSelectorName(selectorName),
                 checkPropertyName(propertyName));
@@ -682,8 +668,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Length length(PropertyValue propertyValue)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Length length(PropertyValue propertyValue) throws RepositoryException {
         if (!(propertyValue instanceof PropertyValueImpl)) {
             throw new RepositoryException("Unknown PropertyValue implementation");
         }
@@ -691,7 +677,7 @@ public abstract class QueryObjectModelFa
     }
 
     /**
-     * Evaluates to a <code>NAME</code> value equal to the prefix-qualified name
+     * Evaluates to a {@code NAME} value equal to the prefix-qualified name
      * of a node in the default selector.
      *
      * @return the operand; non-null
@@ -700,13 +686,12 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public NodeName nodeName()                                                    // CM
-            throws InvalidQueryException, RepositoryException {
+    public NodeName nodeName() throws RepositoryException {
         return new NodeNameImpl(resolver, null);
     }
 
     /**
-     * Evaluates to a <code>NAME</code> value equal to the prefix-qualified name
+     * Evaluates to a {@code NAME} value equal to the prefix-qualified name
      * of a node in the specified selector.
      *
      * @param selectorName the selector name; non-null
@@ -715,12 +700,13 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public NodeName nodeName(String selectorName) throws InvalidQueryException, RepositoryException {
+    @Override
+    public NodeName nodeName(String selectorName) throws RepositoryException {
         return new NodeNameImpl(resolver, checkSelectorName(selectorName));
     }
 
     /**
-     * Evaluates to a <code>NAME</code> value equal to the local (unprefixed)
+     * Evaluates to a {@code NAME} value equal to the local (unprefixed)
      * name of a node in the default selector.
      *
      * @return the operand; non-null
@@ -729,13 +715,12 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public NodeLocalName nodeLocalName()                                          // CM
-            throws InvalidQueryException, RepositoryException {
+    public NodeLocalName nodeLocalName() throws RepositoryException {
         return new NodeLocalNameImpl(resolver, null);
     }
 
     /**
-     * Evaluates to a <code>NAME</code> value equal to the local (unprefixed)
+     * Evaluates to a {@code NAME} value equal to the local (unprefixed)
      * name of a node in the specified selector.
      *
      * @param selectorName the selector name; non-null
@@ -744,13 +729,13 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public NodeLocalName nodeLocalName(String selectorName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public NodeLocalName nodeLocalName(String selectorName) throws RepositoryException {
         return new NodeLocalNameImpl(resolver, checkSelectorName(selectorName));
     }
 
     /**
-     * Evaluates to a <code>DOUBLE</code> value equal to the full-text search
+     * Evaluates to a {@code DOUBLE} value equal to the full-text search
      * score of a node in the default selector.
      *
      * @return the operand; non-null
@@ -759,13 +744,12 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public FullTextSearchScore fullTextSearchScore()                              // CM
-            throws InvalidQueryException, RepositoryException {
+    public FullTextSearchScore fullTextSearchScore() throws RepositoryException {
         return new FullTextSearchScoreImpl(resolver, null);
     }
 
     /**
-     * Evaluates to a <code>DOUBLE</code> value equal to the full-text search
+     * Evaluates to a {@code DOUBLE} value equal to the full-text search
      * score of a node in the specified selector.
      *
      * @param selectorName the selector name; non-null
@@ -774,8 +758,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public FullTextSearchScore fullTextSearchScore(String selectorName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public FullTextSearchScore fullTextSearchScore(String selectorName) throws RepositoryException {
         return new FullTextSearchScoreImpl(
                 resolver, checkSelectorName(selectorName));
     }
@@ -791,8 +775,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public LowerCase lowerCase(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public LowerCase lowerCase(DynamicOperand operand) throws RepositoryException {
         if (!(operand instanceof DynamicOperandImpl)) {
             throw new RepositoryException("Unknown DynamicOperand implementation");
         }
@@ -810,8 +794,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public UpperCase upperCase(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public UpperCase upperCase(DynamicOperand operand) throws RepositoryException {
         if (!(operand instanceof DynamicOperandImpl)) {
             throw new RepositoryException("Unknown DynamicOperand implementation");
         }
@@ -827,8 +811,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public BindVariableValue bindVariable(String bindVariableName)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public BindVariableValue bindVariable(String bindVariableName) throws RepositoryException {
         if (bindVariableName == null) {
             throw new InvalidQueryException("bindVariableName must not be null");
         }
@@ -848,8 +832,8 @@ public abstract class QueryObjectModelFa
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Literal literal(Value value)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Literal literal(Value value) throws RepositoryException {
         if (value == null) {
             throw new InvalidQueryException("value must not be null");
         }
@@ -865,8 +849,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Ordering ascending(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Ordering ascending(DynamicOperand operand) throws RepositoryException {
         if (!(operand instanceof DynamicOperandImpl)) {
             throw new RepositoryException("Unknown DynamicOperand implementation");
         }
@@ -883,8 +867,8 @@ public abstract class QueryObjectModelFa
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Ordering descending(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException {
+    @Override
+    public Ordering descending(DynamicOperand operand) throws RepositoryException {
         if (!(operand instanceof DynamicOperandImpl)) {
             throw new RepositoryException("Unknown DynamicOperand implementation");
         }
@@ -907,8 +891,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Column column(String propertyName)                                     // CM
-            throws InvalidQueryException, RepositoryException {
+    public Column column(String propertyName) throws RepositoryException {
         Name propName = null;
         if (propertyName != null) {
             try {
@@ -927,7 +910,7 @@ public abstract class QueryObjectModelFa
      * @param propertyName the property name, or null to include a column for
      *                     each single-value non-residual property of the
      *                     selector's node type
-     * @param columnName   the column name; must be null if <code>propertyName</code>
+     * @param columnName   the column name; must be null if {@code propertyName}
      *                     is null
      * @return the column; non-null
      * @throws javax.jcr.query.InvalidQueryException
@@ -935,8 +918,7 @@ public abstract class QueryObjectModelFa
      *                                       selector or is otherwise invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Column column(String propertyName, String columnName)                  // CM
-            throws InvalidQueryException, RepositoryException {
+    public Column column(String propertyName, String columnName) throws RepositoryException {
         if (propertyName == null && columnName != null) {
             throw new InvalidQueryException(
                     "columnName must be null if propertyName is null");
@@ -961,15 +943,14 @@ public abstract class QueryObjectModelFa
      *                     each single-value non-residual property of the
      *                     selector's node type
      * @param columnName   the column name; if null, defaults to
-     *                     <code>propertyName</code>; must be null if
-     *                     <code>propertyName</code> is null
+     *                     {@code propertyName}; must be null if
+     *                     {@code propertyName} is null
      * @throws javax.jcr.query.InvalidQueryException
      *                                       if the query is invalid
      * @throws javax.jcr.RepositoryException if the operation otherwise fails
      */
-    public Column column(String selectorName,
-                         String propertyName,
-                         String columnName) throws InvalidQueryException, RepositoryException {
+    @Override
+    public Column column(String selectorName, String propertyName, String columnName) throws RepositoryException {
         if (propertyName == null && columnName != null) {
             throw new InvalidQueryException(
                     "columnName must be null if propertyName is null");
@@ -1035,7 +1016,7 @@ public abstract class QueryObjectModelFa
         }
     }
 
-    private StaticOperand checkFullTextSearchExpression(StaticOperand fullTextSearchExpression)
+    private static StaticOperand checkFullTextSearchExpression(StaticOperand fullTextSearchExpression)
             throws RepositoryException {
         if (fullTextSearchExpression == null) {
             throw new InvalidQueryException(

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java Wed Sep  7 12:00:14 2011
@@ -16,18 +16,16 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 
 import javax.jcr.query.InvalidQueryException;
-
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Arrays;
-import java.util.Iterator;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * <code>QueryObjectModelTree</code> implements the root node of an object
+ * {@code QueryObjectModelTree} implements the root node of an object
  * query model tree.
  */
 public class QueryObjectModelTree extends AbstractQOMNode {
@@ -68,8 +66,7 @@ public class QueryObjectModelTree extend
         this.constraint = constraint;
         this.orderings = orderings;
         this.columns = columns;
-        for (Iterator it = Arrays.asList(source.getSelectors()).iterator(); it.hasNext(); ) {
-            SelectorImpl selector = (SelectorImpl) it.next();
+        for (SelectorImpl selector : Arrays.asList(source.getSelectors())) {
             if (selectors.put(selector.getSelectorQName(), selector) != null) {
                 throw new InvalidQueryException("Duplicate selector name: " +
                         selector.getSelectorName());
@@ -123,11 +120,11 @@ public class QueryObjectModelTree extend
     }
 
     /**
-     * Returns the selector with the given <code>name</code> or
-     * <code>null</code> if there is no selector with this name.
+     * Returns the selector with the given {@code name} or
+     * {@code null} if there is no selector with this name.
      *
      * @param name the name of a selector.
-     * @return the selector or <code>null</code> if there is no such selector.
+     * @return the selector or {@code null} if there is no such selector.
      */
     public SelectorImpl getSelector(Name name) {
         return (SelectorImpl) selectors.get(name);
@@ -136,11 +133,12 @@ public class QueryObjectModelTree extend
     //-----------------------< AbstractQOMNode >--------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -156,54 +154,66 @@ public class QueryObjectModelTree extend
         // - check for selector names
         try {
             accept(new DefaultTraversingQOMTreeVisitor() {
+                @Override
                 public Object visit(ChildNodeImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(ColumnImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(DescendantNodeImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(EquiJoinConditionImpl node, Object data)
                         throws Exception {
                     checkSelector(node.getSelector1QName());
                     return checkSelector(node.getSelector2QName());
                 }
 
+                @Override
                 public Object visit(FullTextSearchImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(FullTextSearchScoreImpl node, Object data)
                         throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(NodeLocalNameImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(NodeNameImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(PropertyExistenceImpl node, Object data)
                         throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(PropertyValueImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(SameNodeImpl node, Object data) throws Exception {
                     return checkSelector(node.getSelectorQName());
                 }
 
+                @Override
                 public Object visit(SameNodeJoinConditionImpl node, Object data)
                         throws Exception {
                     checkSelector(node.getSelector1QName());
@@ -215,7 +225,7 @@ public class QueryObjectModelTree extend
                     if (!selectors.containsKey(selectorName)) {
                         String msg = "Unknown selector: ";
                         if (selectorName != null) {
-                            msg += QueryObjectModelTree.this.getJCRName(selectorName);
+                            msg += getJCRName(selectorName);
                         } else {
                             msg += "<default>";
                         }
@@ -243,7 +253,7 @@ public class QueryObjectModelTree extend
                 builder.append(columns[i]);
             }
         } else {
-            builder.append("*");
+            builder.append('*');
         }
 
         builder.append(" FROM ");

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeImpl.java Wed Sep  7 12:00:14 2011
@@ -25,7 +25,7 @@ import javax.jcr.query.qom.SameNode;
 import javax.jcr.RepositoryException;
 
 /**
- * <code>SameNodeImpl</code>...
+ * {@code SameNodeImpl}...
  */
 public class SameNodeImpl extends ConstraintImpl implements SameNode {
 
@@ -39,9 +39,7 @@ public class SameNodeImpl extends Constr
      */
     private final Path path;
 
-    SameNodeImpl(NamePathResolver resolver,
-                 Name selectorName,
-                 Path path) throws InvalidQueryException, RepositoryException {
+    SameNodeImpl(NamePathResolver resolver, Name selectorName, Path path) throws RepositoryException {
         super(resolver);
         this.selectorName = selectorName;
         this.path = path;
@@ -57,6 +55,7 @@ public class SameNodeImpl extends Constr
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelectorName() {
         return getJCRName(selectorName);
     }
@@ -66,6 +65,7 @@ public class SameNodeImpl extends Constr
      *
      * @return the path; non-null
      */
+    @Override
     public String getPath() {
         return getJCRPath(path);
     }
@@ -82,11 +82,12 @@ public class SameNodeImpl extends Constr
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -94,7 +95,7 @@ public class SameNodeImpl extends Constr
     //------------------------< Object >----------------------------------------
 
     public String toString() {
-        return "ISSAMENODE(" + getSelectorName() + ", " + quote(path) + ")";
+        return "ISSAMENODE(" + getSelectorName() + ", " + quote(path) + ')';
     }
 
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeJoinConditionImpl.java?rev=1166138&r1=1166137&r2=1166138&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeJoinConditionImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SameNodeJoinConditionImpl.java Wed Sep  7 12:00:14 2011
@@ -16,18 +16,16 @@
  */
 package org.apache.jackrabbit.spi.commons.query.qom;
 
-import javax.jcr.query.qom.SameNodeJoinCondition;
-
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+
+import javax.jcr.query.qom.SameNodeJoinCondition;
 
 /**
- * <code>SameNodeJoinConditionImpl</code>...
+ * {@code SameNodeJoinConditionImpl}...
  */
-public class SameNodeJoinConditionImpl
-        extends JoinConditionImpl
-        implements SameNodeJoinCondition {
+public class SameNodeJoinConditionImpl extends JoinConditionImpl implements SameNodeJoinCondition {
 
     /**
      * The name of the first selector.
@@ -59,6 +57,7 @@ public class SameNodeJoinConditionImpl
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelector1Name() {
         return getJCRName(selector1Name);
     }
@@ -68,6 +67,7 @@ public class SameNodeJoinConditionImpl
      *
      * @return the selector name; non-null
      */
+    @Override
     public String getSelector2Name() {
         return getJCRName(selector2Name);
     }
@@ -77,6 +77,7 @@ public class SameNodeJoinConditionImpl
      *
      * @return the relative path, or null for none
      */
+    @Override
     public String getSelector2Path() {
         return getJCRPath(selector2Path);
     }
@@ -111,11 +112,12 @@ public class SameNodeJoinConditionImpl
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**
-     * Accepts a <code>visitor</code> and calls the appropriate visit method
+     * Accepts a {@code visitor} and calls the appropriate visit method
      * depending on the type of this QOM node.
      *
      * @param visitor the visitor.
      */
+    @Override
     public Object accept(QOMTreeVisitor visitor, Object data) throws Exception {
         return visitor.visit(this, data);
     }
@@ -132,7 +134,7 @@ public class SameNodeJoinConditionImpl
             builder.append(", ");
             builder.append(quote(selector2Path));
         }
-        builder.append(")");
+        builder.append(')');
         return builder.toString();
     }
 



Mime
View raw message