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

Timestamp:

01/10/22 12:04:49 (2 years ago)

Author:

Oliver Schonefeld

Message:

• cleanup

File:

• FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/QueryParser.java (modified) (10 diffs)

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

@@ -41 +41 @@
 import eu.clarin.sru.fcs.qlparser.FCSLexer;
 import eu.clarin.sru.fcs.qlparser.FCSParser;
-import eu.clarin.sru.fcs.qlparser.FCSParserBaseVisitor;
 import eu.clarin.sru.fcs.qlparser.FCSParser.AttributeContext;
 import eu.clarin.sru.fcs.qlparser.FCSParser.Expression_andContext;
@@ -64 +63 @@
 import eu.clarin.sru.fcs.qlparser.FCSParser.Within_partContext;
 import eu.clarin.sru.fcs.qlparser.FCSParser.Within_part_simpleContext;
+import eu.clarin.sru.fcs.qlparser.FCSParserBaseVisitor;
 
 
@@ -209 +209 @@
                 throw new IllegalArgumentException("initStackSize < 1");
             }
-            this.stack = new ArrayDeque<Object>(initStackSize);
+            this.stack = new ArrayDeque<>(initStackSize);
         }
 
@@ -226 +226 @@
             if (w_ctx != null) {
                 QueryNode within = (QueryNode) stack.pop();
-                QueryNode query  = (QueryNode) stack.pop();;
+                QueryNode query  = (QueryNode) stack.pop();
                 stack.push(new QueryWithWithin(query, within));
             }
@@ -263 +263 @@
             super.visitQuery_disjunction(ctx);
             if (stack.size() > pos) {
-                List<QueryNode> items = new ArrayList<QueryNode>();
+                List<QueryNode> items = new ArrayList<>();
                 while (stack.size() > pos) {
                     items.add(0, (QueryNode) stack.pop());
@@ -291 +291 @@
             super.visitQuery_sequence(ctx);
             if (stack.size() > pos) {
-                List<QueryNode> items = new ArrayList<QueryNode>();
+                List<QueryNode> items = new ArrayList<>();
                 while (stack.size() > pos) {
                     items.add(0, (QueryNode) stack.pop());
@@ -518 +518 @@
             super.visitExpression_or(ctx);
             if (stack.size() > pos) {
-                final List<QueryNode> children = new ArrayList<QueryNode>();
+                final List<QueryNode> children = new ArrayList<>();
                 while (stack.size() > pos) {
                     children.add(0, (QueryNode) stack.pop());
@@ -545 +545 @@
             super.visitExpression_and(ctx);
             if (stack.size() > pos) {
-                final List<QueryNode> children = new ArrayList<QueryNode>();
+                final List<QueryNode> children = new ArrayList<>();
                 while (stack.size() > pos) {
                     children.add(0, (QueryNode) stack.pop());
@@ -615 +615 @@
                 final String s = f_ctx.getText();
 
-                Set<RegexFlag> flags = new HashSet<RegexFlag>();
+                Set<RegexFlag> flags = new HashSet<>();
                 for (int i = 0; i < s.length(); i++) {
                     switch (s.charAt(i)) {
@@ -990 +990 @@
                 String msg, RecognitionException e) {
             if (errors == null) {
-                errors = new ArrayList<String>();
+                errors = new ArrayList<>();
             }