Changeset 7163 for FCSSimpleEndpoint

Timestamp:

01/17/18 15:45:23 (6 years ago)

Author:

Oliver Schonefeld

Message:

• get rid of Contants class and move constant to QueryNode?

Location:

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser

Files:

• Constants.java (deleted)
• QueryGroup.java (modified) (2 diffs)
• QueryNode.java (modified) (1 diff)
• QueryParser.java (modified) (3 diffs)
• QuerySegment.java (modified) (2 diffs)

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/QueryGroup.java

@@ -83 +83 @@
         if (minOccurs != 1) {
             sb.append("@min=");
-            if (minOccurs == Constants.OCCURS_UNBOUNDED) {
+            if (minOccurs == QueryNode.OCCURS_UNBOUNDED) {
                 sb.append("*");
             } else {
@@ -92 +92 @@
         if (maxOccurs != 1) {
             sb.append("@max=");
-            if (maxOccurs == Constants.OCCURS_UNBOUNDED) {
+            if (maxOccurs == QueryNode.OCCURS_UNBOUNDED) {
                 sb.append("*");
             } else {

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/QueryNode.java

@@ -26 +26 @@
  */
 public abstract class QueryNode {
+    /**
+     * Atom occurrence it not bound.
+     */
+    public static final int OCCURS_UNBOUNDED = -1;
     protected final QueryNodeType nodeType;
     protected final List<QueryNode> children;

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/QueryParser.java

@@ -70 +70 @@
 public class QueryParser {
     private static final int[] REP_ZERO_OR_MORE =
-            new int[] { 0, Constants.OCCURS_UNBOUNDED };
+            new int[] { 0, QueryNode.OCCURS_UNBOUNDED };
     private static final int[] REP_ONE_OR_MORE =
-            new int[] { 1, Constants.OCCURS_UNBOUNDED };
+            new int[] { 1, QueryNode.OCCURS_UNBOUNDED };
     private static final int[] REP_ZERO_OR_ONE =
             new int[] { 0, 1 };
@@ -728 +728 @@
         int int2Idx = getChildIndex(ctx, FCSParser.INTEGER, int1Idx + 1);
         int min = 0;
-        int max = Constants.OCCURS_UNBOUNDED;
+        int max = QueryNode.OCCURS_UNBOUNDED;
         if (commaIdx != -1) {
             if (int1Idx < commaIdx) {
@@ -745 +745 @@
             max = min;
         }
-        if ((max != Constants.OCCURS_UNBOUNDED) && (min > max)) {
+        if ((max != QueryNode.OCCURS_UNBOUNDED) && (min > max)) {
             throw new ExpressionTreeBuilderException(
                     "bad qualifier: min > max (" + min + " > " + max + ")");

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/QuerySegment.java

@@ -83 +83 @@
         if (minOccurs != 1) {
             sb.append("@min=");
-            if (minOccurs == Constants.OCCURS_UNBOUNDED) {
+            if (minOccurs == QueryNode.OCCURS_UNBOUNDED) {
                 sb.append("*");
             } else {
@@ -92 +92 @@
         if (maxOccurs != 1) {
             sb.append("@max=");
-            if (maxOccurs == Constants.OCCURS_UNBOUNDED) {
+            if (maxOccurs == QueryNode.OCCURS_UNBOUNDED) {
                 sb.append("*");
             } else {