From bdd4370fe3fd7340121a6d9361bd7daa072b5f71 Mon Sep 17 00:00:00 2001
From: Rob Bygrave
Date: Thu, 17 Nov 2016 19:17:34 +1300
Subject: [PATCH] no effective change - format only
---
.../expression/AllEqualsExpression.java | 2 +-
.../expression/ArrayContainsExpression.java | 4 +-
.../expression/ArrayIsEmptyExpression.java | 3 +-
.../server/expression/BetweenExpression.java | 3 +-
.../expression/BetweenPropertyExpression.java | 3 +-
.../expression/DefaultExpressionFactory.java | 25 +-
.../expression/DefaultExpressionList.java | 24 +-
.../expression/DefaultExpressionRequest.java | 8 +-
.../expression/ExistsQueryExpression.java | 12 +-
.../expression/FilterExpressionList.java | 8 +-
.../server/expression/InExpression.java | 4 +-
.../server/expression/InQueryExpression.java | 6 +-
.../server/expression/IsEmptyExpression.java | 9 +-
.../server/expression/JsonPathExpression.java | 8 +-
.../server/expression/JunctionExpression.java | 18 +-
.../server/expression/LikeExpression.java | 4 +-
.../server/expression/LogicExpression.java | 6 +-
.../server/expression/NamedParamHelp.java | 2 +-
.../NestedPathWrapperExpression.java | 4 +-
.../server/expression/NullExpression.java | 2 +-
.../server/expression/PrepareDocNested.java | 8 +-
.../server/expression/SimpleExpression.java | 3 +-
.../server/expression/package.html | 22 +-
.../server/grammer/EqlAdapter.java | 37 +-
.../server/grammer/EqlAdapterHelper.java | 14 +-
.../server/grammer/OperatorMapping.java | 2 +-
.../server/grammer/ParseFetchConfig.java | 2 +-
.../server/grammer/antlr/EQLBaseListener.java | 1260 ++--
.../server/grammer/antlr/EQLLexer.java | 570 +-
.../server/grammer/antlr/EQLListener.java | 962 +--
.../server/grammer/antlr/EQLParser.java | 5208 +++++++++--------
.../ebeaninternal/server/idgen/package.html | 6 +-
.../server/lib/DaemonScheduleThreadPool.java | 6 +-
.../server/lib/DaemonThreadFactory.java | 50 +-
.../server/lib/ShutdownManager.java | 168 +-
.../ebeaninternal/server/lib/package.html | 10 +-
.../ebeaninternal/server/lib/util/Str.java | 2 +-
.../server/lib/util/StringHelper.java | 494 +-
.../server/lib/util/package.html | 6 +-
39 files changed, 4865 insertions(+), 4120 deletions(-)
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java
index 75d0504c0..0325a322d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java
@@ -49,7 +49,7 @@ class AllEqualsExpression extends NonPrepareExpression {
@Override
public void validate(SpiExpressionValidation validation) {
- for (String propName: propMap.keySet()) {
+ for (String propName : propMap.keySet()) {
validation.validate(propName);
}
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java
index e82fbd3c7..b65eed668 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java
@@ -64,8 +64,8 @@ public class ArrayContainsExpression extends AbstractExpression {
}
ArrayContainsExpression that = (ArrayContainsExpression) other;
return this.propName.equals(that.propName)
- && this.contains == that.contains
- && this.values.length == that.values.length;
+ && this.contains == that.contains
+ && this.values.length == that.values.length;
}
@Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
index 818ffa57d..2b7338c9e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java
@@ -39,8 +39,7 @@ public class ArrayIsEmptyExpression extends AbstractExpression {
return false;
}
ArrayIsEmptyExpression that = (ArrayIsEmptyExpression) other;
- return this.propName.equals(that.propName)
- && this.empty == that.empty;
+ return this.propName.equals(that.propName) && this.empty == that.empty;
}
@Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java
index 4d46dbafd..9888e89fd 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java
@@ -71,7 +71,6 @@ class BetweenExpression extends AbstractExpression {
@Override
public boolean isSameByBind(SpiExpression other) {
BetweenExpression that = (BetweenExpression) other;
- return low().equals(that.low())
- && high().equals(that.high());
+ return low().equals(that.low()) && high().equals(that.high());
}
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java
index 1a5958989..d8cc71871 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java
@@ -103,8 +103,7 @@ class BetweenPropertyExpression extends NonPrepareExpression {
}
BetweenPropertyExpression that = (BetweenPropertyExpression) other;
- return lowProperty.equals(that.lowProperty)
- && highProperty.equals(that.highProperty);
+ return lowProperty.equals(that.lowProperty) && highProperty.equals(that.highProperty);
}
@Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 2e0a7c1f9..3bcc1392c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -26,7 +26,7 @@ import java.util.Map;
*/
public class DefaultExpressionFactory implements SpiExpressionFactory {
- private static final Object[] EMPTY_ARRAY = new Object[] {};
+ private static final Object[] EMPTY_ARRAY = new Object[]{};
private final boolean nativeIlike;
@@ -37,7 +37,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
this.nativeIlike = nativeIlike;
}
- public ExpressionFactory createExpressionFactory(){
+ public ExpressionFactory createExpressionFactory() {
return this;
}
@@ -233,9 +233,9 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
if (bean == null || (!(bean instanceof EntityBean))) {
throw new IllegalStateException("Expecting an EntityBean");
}
- return (EntityBean)bean;
+ return (EntityBean) bean;
}
-
+
/**
* Case insensitive {@link #exampleLike(Object)}
*/
@@ -372,19 +372,19 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
}
/**
- * Exists subquery
+ * Exists subquery
*/
@Override
public Expression exists(Query> subQuery) {
- return new ExistsQueryExpression((SpiQuery>) subQuery, false);
+ return new ExistsQueryExpression((SpiQuery>) subQuery, false);
}
-
+
/**
- * Not exists subquery
+ * Not exists subquery
*/
@Override
public Expression notExists(Query> subQuery) {
- return new ExistsQueryExpression((SpiQuery>) subQuery, true);
+ return new ExistsQueryExpression((SpiQuery>) subQuery, true);
}
@Override
@@ -427,9 +427,8 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
* Expression where all the property names in the map are equal to the
* corresponding value.
*
- *
- * @param propertyMap
- * a map keyed by property names.
+ *
+ * @param propertyMap a map keyed by property names.
*/
public Expression allEq(Map propertyMap) {
return new AllEqualsExpression(propertyMap);
@@ -443,7 +442,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
*
*/
public Expression raw(String raw, Object value) {
- return new RawExpression(raw, new Object[] { value });
+ return new RawExpression(raw, new Object[]{value});
}
/**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
index fc0274859..381e93e86 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -1,6 +1,20 @@
package com.avaje.ebeaninternal.server.expression;
-import com.avaje.ebean.*;
+import com.avaje.ebean.Expression;
+import com.avaje.ebean.ExpressionFactory;
+import com.avaje.ebean.ExpressionList;
+import com.avaje.ebean.FetchPath;
+import com.avaje.ebean.FutureIds;
+import com.avaje.ebean.FutureList;
+import com.avaje.ebean.FutureRowCount;
+import com.avaje.ebean.Junction;
+import com.avaje.ebean.OrderBy;
+import com.avaje.ebean.PagedList;
+import com.avaje.ebean.Query;
+import com.avaje.ebean.QueryEachConsumer;
+import com.avaje.ebean.QueryEachWhileConsumer;
+import com.avaje.ebean.QueryIterator;
+import com.avaje.ebean.Version;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebean.search.Match;
import com.avaje.ebean.search.MultiMatch;
@@ -131,7 +145,7 @@ public class DefaultExpressionList implements SpiExpressionList {
// this is a Top level "text" expressions so we may need to wrap in Bool SHOULD etc.
if (list.isEmpty()) throw new IllegalStateException("empty expression list?");
- if (allDocNestedPath!=null) context.startNested(allDocNestedPath);
+ if (allDocNestedPath != null) context.startNested(allDocNestedPath);
int size = list.size();
SpiExpression first = list.get(0);
@@ -161,13 +175,13 @@ public class DefaultExpressionList implements SpiExpressionList {
if (implicitBool || explicitBool) {
context.endBoolGroup();
}
- if (allDocNestedPath!=null) context.endNested();
+ if (allDocNestedPath != null) context.endNested();
}
}
public void writeDocQuery(DocQueryContext context, SpiExpression idEquals) throws IOException {
- if (allDocNestedPath!=null) context.startNested(allDocNestedPath);
+ if (allDocNestedPath != null) context.startNested(allDocNestedPath);
int size = list.size();
if (size == 1 && idEquals == null) {
// only 1 expression - skip bool
@@ -186,7 +200,7 @@ public class DefaultExpressionList implements SpiExpressionList {
}
context.endBool();
}
- if (allDocNestedPath!=null) context.endNested();
+ if (allDocNestedPath != null) context.endNested();
}
@Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java
index 027718b4b..35b75c931 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java
@@ -1,9 +1,5 @@
package com.avaje.ebeaninternal.server.expression;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
import com.avaje.ebeaninternal.api.SpiExpressionList;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.core.DbExpressionHandler;
@@ -13,6 +9,10 @@ import com.avaje.ebeaninternal.server.deploy.DeployParser;
import com.avaje.ebeaninternal.server.persist.Binder;
import com.avaje.ebeaninternal.server.type.DataBind;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
public class DefaultExpressionRequest implements SpiExpressionRequest {
private final SpiOrmQueryRequest> queryRequest;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java
index 9f43cbb77..8de510482 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -1,8 +1,5 @@
package com.avaje.ebeaninternal.server.expression;
-import java.io.IOException;
-import java.util.List;
-
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
@@ -14,6 +11,9 @@ import com.avaje.ebeaninternal.api.SpiQuery;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.server.query.CQuery;
+import java.io.IOException;
+import java.util.List;
+
class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpression {
protected final boolean not;
@@ -29,7 +29,7 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
this.not = not;
}
- ExistsQueryExpression(boolean not, String sql , List