svn commit: r1299760 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query: ParserSQL2.java XPathToSQL2Converter.java

[md...@apache.org]

Author: mduerig
Date: Mon Mar 12 17:56:26 2012
New Revision: 1299760

URL: http://svn.apache.org/viewvc?rev=1299760&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- make fields final where possible

Modified:
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java?rev=1299760&r1=1299759&r2=1299760&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java Mon Mar 12 17:56:26 2012
@@ -75,10 +75,11 @@ public class ParserSQL2 {
     private ArrayList<Selector> selectors;
 
     // SQL injection protection: if disabled, literals are not allowed
-    private boolean allowTextLiterals = true, allowNumberLiterals = true;
+    private final boolean allowTextLiterals = true;
+    private final boolean allowNumberLiterals = true;
 
-    private QueryObjectModelFactoryImpl factory;
-    private ValueFactory valueFactory;
+    private final QueryObjectModelFactoryImpl factory;
+    private final ValueFactory valueFactory;
 
     /**
      * Create a new parser. A parser can be re-used, but it is not thread safe.

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java?rev=1299760&r1=1299759&r2=1299760&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java Mon Mar 12 17:56:26 2012
@@ -632,7 +632,7 @@ public class XPathToSQL2Converter {
     }
 
     static class Literal extends Expression {
-        String value;
+        final String value;
         Literal(String value) {
             this.value = value;
         }
@@ -648,7 +648,7 @@ public class XPathToSQL2Converter {
     }
 
     static class Property extends Expression {
-        String name;
+        final String name;
         Property(String name) {
             this.name = name;
         }
@@ -658,7 +658,7 @@ public class XPathToSQL2Converter {
     }
 
     static class Parenthesis extends Expression {
-        Expression expr;
+        final Expression expr;
         public Parenthesis(Expression expr) {
             this.expr = expr;
         }
@@ -668,8 +668,8 @@ public class XPathToSQL2Converter {
     }
 
     static class Condition extends Expression {
-        Expression left;
-        String operator;
+        final Expression left;
+        final String operator;
         Expression right;
         Condition(Expression left, String operator, Expression right) {
             this.left = left;
@@ -690,7 +690,7 @@ public class XPathToSQL2Converter {
 
     static class Function extends Expression {
         String name;
-        ArrayList<Expression> params = new ArrayList<Expression>();
+        final ArrayList<Expression> params = new ArrayList<Expression>();
 
         public String toString() {
             StringBuilder buff = new StringBuilder(name);