This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 064a89b GEODE-2953: Expand wildcard imports in geode-core.cache.
(#1911)
064a89b is described below
commit 064a89b40bb98c34225ed40a37df3e5cf5b0394c
Author: Patrick Rhomberg <[email protected]>
AuthorDate: Thu May 3 10:35:01 2018 -0700
GEODE-2953: Expand wildcard imports in geode-core.cache. (#1911)
---
.../geode/cache/CommitDistributionException.java | 3 +-
.../java/org/apache/geode/cache/DataPolicy.java | 2 +-
.../org/apache/geode/cache/InterestPolicy.java | 2 +-
.../java/org/apache/geode/cache/LossAction.java | 7 ++--
.../java/org/apache/geode/cache/MirrorType.java | 2 +-
.../java/org/apache/geode/cache/Operation.java | 2 +-
.../apache/geode/cache/RegionAccessException.java | 7 ++--
.../geode/cache/RegionDistributionException.java | 7 ++--
.../org/apache/geode/cache/ResumptionAction.java | 6 ++--
.../main/java/org/apache/geode/cache/Scope.java | 3 +-
.../apache/geode/cache/SubscriptionAttributes.java | 7 +++-
.../geode/cache/client/ClientRegionShortcut.java | 6 +++-
.../internal/ExplicitConnectionSourceImpl.java | 7 +++-
.../query/internal/AbstractCompiledValue.java | 15 +++++++--
.../internal/AbstractGroupOrRangeJunction.java | 16 +++++++--
.../cache/query/internal/AllGroupJunction.java | 6 +++-
.../cache/query/internal/CompiledBindArgument.java | 2 +-
.../cache/query/internal/CompiledConstruction.java | 11 +++++--
.../cache/query/internal/CompiledFunction.java | 13 ++++++--
.../geode/cache/query/internal/CompiledID.java | 10 ++++--
.../query/internal/CompiledIndexOperation.java | 17 +++++++---
.../cache/query/internal/CompiledLiteral.java | 6 +++-
.../cache/query/internal/CompiledNegation.java | 11 +++++--
.../geode/cache/query/internal/CompiledPath.java | 12 +++++--
.../geode/cache/query/internal/CompiledRegion.java | 8 +++--
.../cache/query/internal/CompiledUnaryMinus.java | 4 ++-
.../cache/query/internal/CompiledUndefined.java | 12 +++++--
.../cache/query/internal/DefaultQueryService.java | 37 +++++++++++++++++++--
.../geode/cache/query/internal/Functions.java | 16 ++++++---
.../apache/geode/cache/query/internal/QRegion.java | 38 ++++++++++++++++++----
.../apache/geode/cache/query/internal/QScope.java | 4 ++-
.../geode/cache/query/internal/QueryObserver.java | 7 ++--
.../cache/query/internal/QueryObserverAdapter.java | 7 ++--
.../query/internal/ResultsCollectionWrapper.java | 27 +++++++++++----
.../geode/cache/query/internal/ResultsSet.java | 16 ++++++---
.../cache/query/internal/SortedResultSet.java | 24 ++++++++++----
.../cache/query/internal/SortedStructSet.java | 25 ++++++++++----
.../geode/cache/query/internal/StructSet.java | 17 +++++++---
.../geode/cache/query/internal/Undefined.java | 5 ++-
.../cache/query/internal/index/RangeIndex.java | 3 +-
.../geode/cache/query/internal/parse/ASTAnd.java | 2 +-
.../cache/query/internal/parse/ASTCombination.java | 2 +-
.../cache/query/internal/parse/ASTCompareOp.java | 2 +-
.../query/internal/parse/ASTConstruction.java | 5 +--
.../query/internal/parse/ASTConversionExpr.java | 2 +-
.../cache/query/internal/parse/ASTGroupBy.java | 2 +-
.../cache/query/internal/parse/ASTIdentifier.java | 2 +-
.../cache/query/internal/parse/ASTImport.java | 4 +--
.../geode/cache/query/internal/parse/ASTIn.java | 2 +-
.../cache/query/internal/parse/ASTIteratorDef.java | 2 +-
.../geode/cache/query/internal/parse/ASTLike.java | 2 +-
.../geode/cache/query/internal/parse/ASTLimit.java | 2 +-
.../cache/query/internal/parse/ASTLiteral.java | 10 +++---
.../query/internal/parse/ASTMethodInvocation.java | 2 +-
.../geode/cache/query/internal/parse/ASTOr.java | 2 +-
.../cache/query/internal/parse/ASTOrderBy.java | 2 +-
.../cache/query/internal/parse/ASTPostfix.java | 4 +--
.../cache/query/internal/parse/ASTProjection.java | 2 +-
.../cache/query/internal/parse/ASTRegionPath.java | 2 +-
.../cache/query/internal/parse/ASTSelect.java | 4 +--
.../query/internal/parse/ASTSortCriterion.java | 2 +-
.../geode/cache/query/internal/parse/ASTType.java | 4 +--
.../cache/query/internal/parse/ASTTypeCast.java | 2 +-
.../geode/cache/query/internal/parse/ASTUnary.java | 2 +-
.../query/internal/parse/ASTUndefinedExpr.java | 2 +-
.../cache/query/internal/parse/ASTUnsupported.java | 2 +-
.../cache/query/internal/parse/UtilParser.java | 11 +++++--
.../query/internal/types/CollectionTypeImpl.java | 11 +++++--
.../internal/types/ExtendedNumericComparator.java | 2 +-
.../cache/query/internal/types/MapTypeImpl.java | 8 +++--
.../query/internal/types/NumericComparator.java | 2 +-
.../cache/query/internal/types/StructTypeImpl.java | 9 ++---
.../query/internal/types/TemporalComparator.java | 2 +-
73 files changed, 402 insertions(+), 144 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
b/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
index 9f4ee97..564af9a 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.cache;
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
/**
* Indicates that an attempt to notify required participants of a transaction
involving one or more
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
index d16ce15..69620fe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache;
-import java.io.*;
+import java.io.ObjectStreamException;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
b/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
index 3fd2071..5a38127 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestPolicy.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache;
-import java.io.*;
+import java.io.ObjectStreamException;
/**
* Enumerated type for region subscription interest policy. The interest
policy specifies what data
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
b/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
index 2cd18e5..5ad3fb7 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LossAction.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.cache;
-import java.io.*;
-import java.util.*;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
b/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
index e08f724..f942505 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/MirrorType.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache;
-import java.io.*;
+import java.io.ObjectStreamException;
/**
* Enumerated type for region mirroring.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Operation.java
b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
index 4ce16aa..3807add 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Operation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache;
-import java.io.*;
+import java.io.ObjectStreamException;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.internal.cache.OpType;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
index ba0cc2b..139faf6 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.cache;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.membership.InternalRole;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
index be57600..b166310 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.cache;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.membership.InternalRole;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
b/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
index c8d4ad5..895ad46 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ResumptionAction.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.cache;
-import java.io.*;
-import java.util.*;
+import java.io.ObjectStreamException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Scope.java
b/geode-core/src/main/java/org/apache/geode/cache/Scope.java
index e736e5a..ee154a7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Scope.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Scope.java
@@ -16,7 +16,8 @@
package org.apache.geode.cache;
-import java.io.*;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
b/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
index 662650c..4ae1a6e 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/SubscriptionAttributes.java
@@ -14,7 +14,12 @@
*/
package org.apache.geode.cache;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import org.apache.geode.DataSerializable;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
index 0d3ca3a..ff03740 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java
@@ -15,7 +15,11 @@
package org.apache.geode.cache.client;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAlgorithm;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.RegionAttributes;
/**
* Each enum represents a predefined {@link RegionAttributes} in a {@link
ClientCache}. These enum
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
index 5ac9655..b769878 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
@@ -15,7 +15,12 @@
package org.apache.geode.cache.client.internal;
import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import org.apache.logging.log4j.Logger;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
index 3565478..fdac70d 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java
@@ -14,12 +14,21 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
index f7d036c..4207488 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
@@ -18,9 +18,19 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
-
-import org.apache.geode.cache.query.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
index 1938e21..fbfce9d 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java
@@ -17,7 +17,11 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
index 24f8b2f..ef544dd 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledBindArgument.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Set;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.AmbiguousNameException;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
index 325ff2b..f353a38 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledConstruction.java
@@ -15,9 +15,16 @@
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.Assert;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
index ca883ee..0148ac3 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledFunction.java
@@ -15,9 +15,16 @@
package org.apache.geode.cache.query.internal;
-import java.util.*;
-
-import org.apache.geode.cache.query.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
index 300185c..c7e0ff0 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledID.java
@@ -14,10 +14,16 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.cache.PartitionedRegion;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
index 0a066d0..ba14960 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledIndexOperation.java
@@ -15,10 +15,19 @@
package org.apache.geode.cache.query.internal;
import java.lang.reflect.Array;
-import java.util.*;
-
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.geode.cache.EntryDestroyedException;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
index 3fc47e5..79fe626 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledLiteral.java
@@ -15,7 +15,11 @@
package org.apache.geode.cache.query.internal;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.pdx.internal.PdxString;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledNegation.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledNegation.java
index 0bb8673..fd56518 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledNegation.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledNegation.java
@@ -15,9 +15,16 @@
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
index 92eb985..f88c4bc 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledPath.java
@@ -15,11 +15,19 @@
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.cache.PartitionedRegion;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
index 5a80613..c02f4bc 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledRegion.java
@@ -14,11 +14,13 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Set;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
index f1da35b..412c560 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUnaryMinus.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
import org.apache.geode.cache.query.AmbiguousNameException;
import org.apache.geode.cache.query.FunctionDomainException;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
index ef55d6c..4d0fe4a 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledUndefined.java
@@ -14,9 +14,17 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.index.IndexData;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.IndexUtils;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
index 05d897e..d91eb1c 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
@@ -15,8 +15,16 @@
package org.apache.geode.cache.query.internal;
import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import org.apache.logging.log4j.Logger;
@@ -28,11 +36,34 @@ import org.apache.geode.cache.client.internal.InternalPool;
import org.apache.geode.cache.client.internal.ProxyCache;
import org.apache.geode.cache.client.internal.ServerProxy;
import org.apache.geode.cache.client.internal.UserAttributes;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.AmbiguousNameException;
+import org.apache.geode.cache.query.CqAttributes;
+import org.apache.geode.cache.query.CqException;
+import org.apache.geode.cache.query.CqExistsException;
+import org.apache.geode.cache.query.CqQuery;
+import org.apache.geode.cache.query.CqServiceStatistics;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.IndexCreationException;
+import org.apache.geode.cache.query.IndexExistsException;
+import org.apache.geode.cache.query.IndexNameConflictException;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.MultiIndexCreationException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryExecutionLowMemoryException;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.RegionNotFoundException;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.cq.ClientCQ;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
-import org.apache.geode.cache.query.internal.index.*;
+import org.apache.geode.cache.query.internal.index.AbstractIndex;
+import org.apache.geode.cache.query.internal.index.IndexCreationData;
+import org.apache.geode.cache.query.internal.index.IndexData;
+import org.apache.geode.cache.query.internal.index.IndexManager;
+import org.apache.geode.cache.query.internal.index.IndexUtils;
+import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.ForceReattemptException;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
index edfd2c7..0864478 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Functions.java
@@ -15,10 +15,18 @@
package org.apache.geode.cache.query.internal;
-import java.text.*;
-import java.util.*;
-
-import org.apache.geode.cache.query.*;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.internal.PdxString;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
index ff124c9..c3822e8 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QRegion.java
@@ -14,14 +14,40 @@
*/
package org.apache.geode.cache.query.internal;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.AttributesMutator;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheLoaderException;
+import org.apache.geode.cache.CacheStatistics;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.EntryExistsException;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionExistsException;
+import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
+import org.apache.geode.cache.query.internal.types.TypeUtils;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
index dc39504..88d1ffa 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QScope.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* Nested name scope for name resolution Currently allow only one iterator per
scope, and can be
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
index ef7d300..39ccabd 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserver.java
@@ -14,9 +14,12 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Collection;
+import java.util.Set;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.SelectResults;
/**
* This interface is used by testing/debugging code to be notified of query
events. See the
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
index cc2b2dd..c80b7f5 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverAdapter.java
@@ -14,9 +14,12 @@
*/
package org.apache.geode.cache.query.internal;
-import java.util.*;
+import java.util.Collection;
+import java.util.Set;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.SelectResults;
/**
* This class provides 'do-nothing' implementations of all of the methods of
interface
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
index 9ced3ae..7ee0137 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
@@ -14,15 +14,28 @@
*/
package org.apache.geode.cache.query.internal;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
-import java.util.*;
-
-import org.apache.geode.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.cache.query.types.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
index 22bcabc..2c991eb 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
@@ -18,12 +18,20 @@ package org.apache.geode.cache.query.internal;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
index 2183e69..e19c6bb 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
@@ -15,13 +15,23 @@
package org.apache.geode.cache.query.internal;
-import java.io.*;
-import java.util.*;
-
-import org.apache.geode.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.cache.query.types.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
index ca59fc0..7e285c3 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
@@ -14,13 +14,24 @@
*/
package org.apache.geode.cache.query.internal;
-import java.io.*;
-import java.util.*;
-
-import org.apache.geode.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.cache.query.types.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.internal.types.StructTypeImpl;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
index 5870632..cc96a97 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
@@ -17,16 +17,25 @@ package org.apache.geode.cache.query.internal;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import it.unimi.dsi.fastutil.objects.AbstractObjectIterator;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.types.*;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.internal.types.StructTypeImpl;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
index afd5e6c..709f661 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
@@ -15,7 +15,10 @@
package org.apache.geode.cache.query.internal;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.internal.DataSerializableFixedID;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
index 042c616..9b433ec 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.cache.query.internal.index;
-import static java.lang.Integer.*;
+import static java.lang.Integer.MAX_VALUE;
+import static java.lang.Integer.valueOf;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
index ebb6472..be5ac1b 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
index dd69ab5..fc40286 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
index d5dc3b7..08062b2 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
index afd3275..4979372 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
@@ -16,9 +16,10 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
-import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.ResultsSet;
import org.apache.geode.internal.Assert;
public class ASTConstruction extends GemFireAST {
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
index 803e3b8..6c4a05a 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
index 384c21d..bce6092 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
index ce91520..3e8d690 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
index 1c814c3..0648dfe 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
@@ -16,8 +16,8 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
-import antlr.collections.*;
+import antlr.Token;
+import antlr.collections.AST;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
index e5a1135..80ed5e2 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
index 6598c0f..1320333 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.internal.Assert;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
index 31dfd2c..127e498 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
index a2c8bfd..1094147 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
index c59c589..9fe556f 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
@@ -16,12 +16,14 @@
package org.apache.geode.cache.query.internal.parse;
-import java.sql.*;
-import java.util.*;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.StringTokenizer;
-import antlr.*;
+import antlr.Token;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
index 7b0f7fd..c259149 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
index 7694949..821d056 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
index 81181bb..89a47f3 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
index a7a2ff4..7c8b047 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
@@ -16,8 +16,8 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
-import antlr.collections.*;
+import antlr.Token;
+import antlr.collections.AST;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
index c252cb9..7cfdbf6 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
index be4e80b..c6cd7b8 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
index ccf9d9f..eb81c91 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
@@ -19,8 +19,8 @@ package org.apache.geode.cache.query.internal.parse;
import java.util.HashMap;
import java.util.Map;
-import antlr.*;
-import antlr.collections.*;
+import antlr.Token;
+import antlr.collections.AST;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
index 84bc7ca..14140c8 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
index 5243895..8760fa3 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
@@ -16,10 +16,10 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.Assert;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
index 4c86f59..4de6779 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
index 9221593..106e8ca 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.internal.Support;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
index 5a0f312..7bef233 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
@@ -16,7 +16,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
index c24eed9..7f53cc4 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.parse;
-import antlr.*;
+import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
index bc7a5fd..bd5b250 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/UtilParser.java
@@ -20,10 +20,15 @@
package org.apache.geode.cache.query.internal.parse;
-import java.io.*;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
-import antlr.*;
-import antlr.collections.*;
+import antlr.LLkParser;
+import antlr.ParserSharedInputState;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.collections.AST;
import antlr.debug.misc.ASTFrame;
public class UtilParser extends LLkParser {
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
index b7573c2..f563337 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
@@ -18,7 +18,13 @@ package org.apache.geode.cache.query.internal.types;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Region;
@@ -27,7 +33,8 @@ import org.apache.geode.cache.query.internal.ResultsSet;
import org.apache.geode.cache.query.internal.SortedResultSet;
import org.apache.geode.cache.query.internal.SortedStructSet;
import org.apache.geode.cache.query.internal.StructSet;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.types.CollectionType;
+import org.apache.geode.cache.query.types.ObjectType;
/**
* Implementation of CollectionType
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
index 797d425..8b42b19 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.types;
-import java.util.*;
+import java.util.Comparator;
import org.apache.geode.cache.query.internal.NullToken;
import org.apache.geode.cache.query.internal.Undefined;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
index 63e72e0..e682850 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
@@ -15,10 +15,14 @@
package org.apache.geode.cache.query.internal.types;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.types.MapType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.cache.query.types.StructType;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
index 84da972..c2b58e2 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.types;
-import java.util.*;
+import java.util.Comparator;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
index a93f7dd..a7a7c38 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
@@ -18,12 +18,13 @@ package org.apache.geode.cache.query.internal.types;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.*;
-import org.apache.geode.cache.query.types.*;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.StructImpl;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
index dd64769..5eb2753 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
@@ -15,7 +15,7 @@
package org.apache.geode.cache.query.internal.types;
-import java.util.*;
+import java.util.Comparator;
/**
--
To stop receiving notification emails like this one, please contact
[email protected].
