geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [34/40] geode git commit: GEODE-2980: remove unnecessary explicit keywords from interfaces
Date Thu, 15 Jun 2017 21:55:07 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
index bd189cf..03dc2fe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionInfo.java
@@ -36,7 +36,7 @@ public interface PartitionRegionInfo {
    * 
    * @return the full path of the partitioned region that this info describes
    */
-  public String getRegionPath();
+  String getRegionPath();
 
   /**
    * Returns an immutable set of <code>PartitionMemberInfo</code> representing every member that is
@@ -44,7 +44,7 @@ public interface PartitionRegionInfo {
    * 
    * @return set of member info configured for storage space
    */
-  public Set<PartitionMemberInfo> getPartitionMemberInfo();
+  Set<PartitionMemberInfo> getPartitionMemberInfo();
 
   /**
    * Returns the {@link org.apache.geode.cache.PartitionAttributes#getTotalNumBuckets() configured
@@ -52,7 +52,7 @@ public interface PartitionRegionInfo {
    * 
    * @return the configured number of buckets
    */
-  public int getConfiguredBucketCount();
+  int getConfiguredBucketCount();
 
   /**
    * Returns the number of actual buckets that have been created to hold data for the partitioned
@@ -60,7 +60,7 @@ public interface PartitionRegionInfo {
    * 
    * @return the current number of actual buckets that have been created
    */
-  public int getCreatedBucketCount();
+  int getCreatedBucketCount();
 
   /**
    * Returns the number of created buckets that have fewer than the
@@ -70,7 +70,7 @@ public interface PartitionRegionInfo {
    * @return the number of created buckets that have fewer than the configured redundant copies
    * @see #getActualRedundantCopies()
    */
-  public int getLowRedundancyBucketCount();
+  int getLowRedundancyBucketCount();
 
   /**
    * Returns the number of {@link org.apache.geode.cache.PartitionAttributes#getRedundantCopies()
@@ -78,7 +78,7 @@ public interface PartitionRegionInfo {
    * 
    * @return the number of redundant copies the partitioned region was configured for
    */
-  public int getConfiguredRedundantCopies();
+  int getConfiguredRedundantCopies();
 
   /**
    * Returns the lowest number of redundant copies for any bucket holding data for the partitioned
@@ -87,7 +87,7 @@ public interface PartitionRegionInfo {
    * 
    * @return the lowest number of redundant copies for any bucket of the partitioned region.
    */
-  public int getActualRedundantCopies();
+  int getActualRedundantCopies();
 
   /**
    * Returns the {@link org.apache.geode.cache.Region#getFullPath() full path} of the partitioned
@@ -98,5 +98,5 @@ public interface PartitionRegionInfo {
    * @return the full path of the partitioned region that the region is colocated with or null if
    *         there is none.
    */
-  public String getColocatedWith();
+  String getColocatedWith();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
index 7cfbc82..5db8155 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/PersistentID.java
@@ -39,17 +39,17 @@ public interface PersistentID extends DataSerializable {
   /**
    * The host on which the persistent data was last residing
    */
-  public abstract InetAddress getHost();
+  InetAddress getHost();
 
   /**
    * The directory which the persistent data was last residing in.
    */
-  public abstract String getDirectory();
+  String getDirectory();
 
   /**
    * The unique identifier for the persistent data.
    * 
    * @since GemFire 7.0
    */
-  public abstract UUID getUUID();
+  UUID getUUID();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java b/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
index 38de60d..140193d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Aggregator.java
@@ -27,16 +27,16 @@ public interface Aggregator {
    * 
    * @param value
    */
-  public void accumulate(Object value);
+  void accumulate(Object value);
 
   /**
    * Initialize the Aggregator
    */
-  public void init();
+  void init();
 
   /**
    * 
    * @return Return the result scalar value
    */
-  public Object terminate();
+  Object terminate();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
index 4711e92..ffc716a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributes.java
@@ -32,7 +32,7 @@ public interface CqAttributes {
    * @see CqListener
    * @return CQListener[] array of CqListner
    */
-  public CqListener[] getCqListeners();
+  CqListener[] getCqListeners();
 
   /**
    * Get the CqListener set with the CQ. Returns the CqListener associated with the CQ. If there are
@@ -41,6 +41,6 @@ public interface CqAttributes {
    * @see CqListener
    * @return CqListener Object, returns null if there is no CqListener.
    */
-  public CqListener getCqListener();
+  CqListener getCqListener();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
index ffdb9cf..f8e4594 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqAttributesMutator.java
@@ -30,7 +30,7 @@ public interface CqAttributesMutator {
    * @param aListener the user defined CQ listener to add to the CqQuery.
    * @throws IllegalArgumentException if <code>aListener</code> is null
    */
-  public void addCqListener(CqListener aListener);
+  void addCqListener(CqListener aListener);
 
   /**
    * Removes given CQ listener from the list of CQ listeners on this CqQuery. Does nothing if the
@@ -40,7 +40,7 @@ public interface CqAttributesMutator {
    * @param aListener the CQ listener to remove from the CqQuery.
    * @throws IllegalArgumentException if <code>aListener</code> is null
    */
-  public void removeCqListener(CqListener aListener);
+  void removeCqListener(CqListener aListener);
 
   /**
    * Adds the given set CqListner on this CQ. If the CQ already has CqListeners, this removes those
@@ -49,6 +49,6 @@ public interface CqAttributesMutator {
    * @param newListeners a possibly null or empty array of listeners to add to this CqQuery.
    * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
    */
-  public void initCqListeners(CqListener[] newListeners);
+  void initCqListeners(CqListener[] newListeners);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
index 24ae7f9..7463faf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqEvent.java
@@ -35,14 +35,14 @@ public interface CqEvent {
    * @see CqQuery
    * @return CqQuery object.
    */
-  public CqQuery getCq();
+  CqQuery getCq();
 
   /**
    * Get the operation on the base region that triggered this event.
    * 
    * @return Operation operation on the base region (on which CQ is created).
    */
-  public Operation getBaseOperation();
+  Operation getBaseOperation();
 
   /**
    * Get the operation on the query results. Supported operations include update, create, destroy,
@@ -50,7 +50,7 @@ public interface CqEvent {
    * 
    * @return Operation operation with respect to CQ.
    */
-  public Operation getQueryOperation();
+  Operation getQueryOperation();
 
   /**
    * Get the key relating to the event. In case of REGION_CLEAR and REGION_INVALIDATE operation, the
@@ -58,7 +58,7 @@ public interface CqEvent {
    * 
    * @return Object key.
    */
-  public Object getKey();
+  Object getKey();
 
   /**
    * Get the new value of the modification. If there is no new value returns null, this will happen
@@ -67,7 +67,7 @@ public interface CqEvent {
    * 
    * @return Object new/modified value.
    */
-  public Object getNewValue();
+  Object getNewValue();
 
   /**
    * If an error occurred, return the Throwable, otherwise return null. If an error occurred, then
@@ -76,7 +76,7 @@ public interface CqEvent {
    * 
    * @return Throwable exception related to error.
    */
-  public Throwable getThrowable();
+  Throwable getThrowable();
 
   /**
    * Get the delta modification. If there is no delta, returns null. New value may still be
@@ -85,6 +85,6 @@ public interface CqEvent {
    * @return byte[] delta value.
    * @since GemFire 6.5
    */
-  public byte[] getDeltaValue();
+  byte[] getDeltaValue();
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
index 0cb54ba..31d4ffc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqListener.java
@@ -38,7 +38,7 @@ public interface CqListener extends CacheCallback {
    * 
    * @see org.apache.geode.cache.query.CqQuery#executeWithInitialResults
    */
-  public void onEvent(CqEvent aCqEvent);
+  void onEvent(CqEvent aCqEvent);
 
   /**
    * This method is invoked when there is an error during CQ processing. The error can appear while
@@ -46,5 +46,5 @@ public interface CqListener extends CacheCallback {
    * the CQ query. This event does contain an error. The newValue may or may not be available, and
    * will be null if not available.
    */
-  public void onError(CqEvent aCqEvent);
+  void onError(CqEvent aCqEvent);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
index cddf0f4..1edf963 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqQuery.java
@@ -31,28 +31,28 @@ public interface CqQuery {
    * 
    * @return String the query string associated with CQ.
    */
-  public String getQueryString();
+  String getQueryString();
 
   /**
    * Get the query object generated for this CQs query.
    * 
    * @return Query query object for the query string.
    */
-  public Query getQuery();
+  Query getQuery();
 
   /**
    * Get the name of the CQ.
    * 
    * @return the name of the CQ.
    */
-  public String getName();
+  String getName();
 
   /**
    * Get statistics information for this CQ.
    * 
    * @return CqStatistics CQ statistics object.
    */
-  public CqStatistics getStatistics();
+  CqStatistics getStatistics();
 
   /**
    * Get CqAttributes for this CQ.
@@ -60,7 +60,7 @@ public interface CqQuery {
    * @see CqAttributes
    * @return CqAttributes cqAttribute set with this CqQuery.
    */
-  public CqAttributes getCqAttributes();
+  CqAttributes getCqAttributes();
 
   /**
    * Get CqAttributesMutator for this CQ.
@@ -68,7 +68,7 @@ public interface CqQuery {
    * @see CqAttributesMutator
    * @return CqAttributesMutator.
    */
-  public CqAttributesMutator getCqAttributesMutator();
+  CqAttributesMutator getCqAttributesMutator();
 
   /**
    * Starts executing the CQ or, if the CQ is in a stopped state, resumes execution. Gets the
@@ -84,7 +84,7 @@ public interface CqQuery {
    * @throws CqException if failed to execute and get initial results.
    * @return SelectResults resultset obtained by executing the query.
    */
-  public <E> CqResults<E> executeWithInitialResults()
+  <E> CqResults<E> executeWithInitialResults()
       throws CqClosedException, RegionNotFoundException, CqException;
 
   /**
@@ -97,7 +97,7 @@ public interface CqQuery {
    * @throws IllegalStateException if the CqQuery is in the RUNNING state already.
    * @throws CqException if failed to execute.
    */
-  public void execute() throws CqClosedException, RegionNotFoundException, CqException;
+  void execute() throws CqClosedException, RegionNotFoundException, CqException;
 
   /**
    * Stops this CqQuery without releasing resources. Puts the CqQuery into the STOPPED state. Can be
@@ -106,7 +106,7 @@ public interface CqQuery {
    * @throws IllegalStateException if the CqQuery is in the STOPPED state already.
    * @throws CqClosedException if the CQ is CLOSED.
    */
-  public void stop() throws CqClosedException, CqException;
+  void stop() throws CqClosedException, CqException;
 
   /**
    * Get the state of the CQ in CqState object form. CqState supports methods like isClosed(),
@@ -115,7 +115,7 @@ public interface CqQuery {
    * @see CqState
    * @return CqState state object of the CQ.
    */
-  public CqState getState();
+  CqState getState();
 
   /**
    * Close the CQ and stop execution. Releases the resources associated with this CqQuery.
@@ -124,28 +124,28 @@ public interface CqQuery {
    *         getName().
    * @throws CqException - if failure during cleanup of CQ resources.
    */
-  public void close() throws CqClosedException, CqException;
+  void close() throws CqClosedException, CqException;
 
   /**
    * This allows to check if the CQ is in running or active.
    * 
    * @return boolean true if running, false otherwise
    */
-  public boolean isRunning();
+  boolean isRunning();
 
   /**
    * This allows to check if the CQ is in stopped.
    * 
    * @return boolean true if stopped, false otherwise
    */
-  public boolean isStopped();
+  boolean isStopped();
 
   /**
    * This allows to check if the CQ is closed.
    * 
    * @return boolean true if closed, false otherwise
    */
-  public boolean isClosed();
+  boolean isClosed();
 
   /**
    * This allows to check if the CQ is durable.
@@ -153,6 +153,6 @@ public interface CqQuery {
    * @return boolean true if durable, false otherwise
    * @since GemFire 5.5
    */
-  public boolean isDurable();
+  boolean isDurable();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
index 38c47b5..6b1f30a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqServiceStatistics.java
@@ -28,28 +28,28 @@ public interface CqServiceStatistics {
    * 
    * @return long number of CQs
    */
-  public long numCqsActive();
+  long numCqsActive();
 
   /**
    * Get the total number of CQs created. This is a cumulative number.
    * 
    * @return long number of CQs created.
    */
-  public long numCqsCreated();
+  long numCqsCreated();
 
   /**
    * Get the total number of closed CQs. This is a cumulative number.
    * 
    * @return long number of CQs closed.
    */
-  public long numCqsClosed();
+  long numCqsClosed();
 
   /**
    * Get the number of stopped CQs currently.
    * 
    * @return number of CQs stopped.
    */
-  public long numCqsStopped();
+  long numCqsStopped();
 
   /**
    * Get number of CQs that are currently active or stopped. The CQs included in this number are
@@ -57,7 +57,7 @@ public interface CqServiceStatistics {
    * 
    * @return long number of CQs on client.
    */
-  public long numCqsOnClient();
+  long numCqsOnClient();
 
   /**
    * Get number of CQs on the given region. Active CQs and stopped CQs on this region are included
@@ -66,6 +66,6 @@ public interface CqServiceStatistics {
    * @param regionFullPath
    * @return long number of CQs on the region.
    */
-  public long numCqsOnRegion(String regionFullPath);
+  long numCqsOnRegion(String regionFullPath);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
index b9b16f5..d729a85 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqState.java
@@ -27,26 +27,26 @@ public interface CqState {
   /**
    * Returns the state in string form.
    */
-  public String toString();
+  String toString();
 
   /**
    * Returns true if the CQ is in Running state.
    */
-  public boolean isRunning();
+  boolean isRunning();
 
   /**
    * Returns true if the CQ is in Stopped state.
    */
-  public boolean isStopped();
+  boolean isStopped();
 
   /**
    * Returns true if the CQ is in Closed state.
    */
-  public boolean isClosed();
+  boolean isClosed();
 
   /**
    * Returns true if the CQ is in Closing state.
    */
-  public boolean isClosing();
+  boolean isClosing();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
index c492771..1ccfc66 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatistics.java
@@ -28,27 +28,27 @@ public interface CqStatistics {
    * 
    * @return long number of inserts.
    */
-  public long numInserts();
+  long numInserts();
 
   /**
    * Get number of Delete events qualified by this CQ.
    * 
    * @return long number of deletes.
    */
-  public long numDeletes();
+  long numDeletes();
 
   /**
    * Get number of Update events qualified by this CQ.
    * 
    * @return long number of updates.
    */
-  public long numUpdates();
+  long numUpdates();
 
   /**
    * Get total of all the events qualified by this CQ.
    * 
    * @return long total number of events.
    */
-  public long numEvents();
+  long numEvents();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
index 417c18d..5522889 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/CqStatusListener.java
@@ -29,10 +29,10 @@ public interface CqStatusListener extends CqListener {
   /**
    * Called when the cq loses connection with all servers
    */
-  public void onCqDisconnected();
+  void onCqDisconnected();
 
   /**
    * Called when the cq establishes a connection with a server
    */
-  public void onCqConnected();
+  void onCqConnected();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Index.java b/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
index b0ff47e..187cac1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Index.java
@@ -49,21 +49,21 @@ public interface Index {
   /**
    * Returns the unique name of this index
    */
-  public String getName();
+  String getName();
 
   /**
    * Get the index type
    * 
    * @return the type of index
    */
-  public IndexType getType();
+  IndexType getType();
 
   /**
    * The Region this index is on
    * 
    * @return the Region for this index
    */
-  public Region<?, ?> getRegion();
+  Region<?, ?> getRegion();
 
   /**
    * Get statistics information for this index.
@@ -73,39 +73,39 @@ public interface Index {
    *         On Map type indexes the stats are created at individual key level that can be viewed in
    *         VSD stats.
    */
-  public IndexStatistics getStatistics();
+  IndexStatistics getStatistics();
 
   /**
    * Get the original fromClause for this index.
    */
-  public String getFromClause();
+  String getFromClause();
 
   /**
    * Get the canonicalized fromClause for this index.
    */
-  public String getCanonicalizedFromClause();
+  String getCanonicalizedFromClause();
 
   /**
    * Get the original indexedExpression for this index.
    */
-  public String getIndexedExpression();
+  String getIndexedExpression();
 
   /**
    * Get the canonicalized indexedExpression for this index.
    */
-  public String getCanonicalizedIndexedExpression();
+  String getCanonicalizedIndexedExpression();
 
   /**
    * Get the original projectionAttributes for this expression.
    * 
    * @return the projectionAttributes, or "*" if there were none specified at index creation.
    */
-  public String getProjectionAttributes();
+  String getProjectionAttributes();
 
   /**
    * Get the canonicalized projectionAttributes for this expression.
    * 
    * @return the projectionAttributes, or "*" if there were none specified at index creation.
    */
-  public String getCanonicalizedProjectionAttributes();
+  String getCanonicalizedProjectionAttributes();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
index 29c5a41..097a0b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/IndexStatistics.java
@@ -26,47 +26,47 @@ public interface IndexStatistics {
   /**
    * Return the total number of times this index has been updated
    */
-  public long getNumUpdates();
+  long getNumUpdates();
 
   /**
    * Returns the total amount of time (in nanoseconds) spent updating this index.
    */
-  public long getTotalUpdateTime();
+  long getTotalUpdateTime();
 
   /**
    * Returns the total number of times this index has been accessed by a query.
    */
-  public long getTotalUses();
+  long getTotalUses();
 
   /**
    * Returns the number of keys in this index.
    */
-  public long getNumberOfKeys();
+  long getNumberOfKeys();
 
   /**
    * Returns the number of values in this index.
    */
-  public long getNumberOfValues();
+  long getNumberOfValues();
 
 
   /**
    * Return the number of values for the specified key in this index.
    */
-  public long getNumberOfValues(Object key);
+  long getNumberOfValues(Object key);
 
 
   /**
    * Return number of read locks taken on this index
    */
-  public int getReadLockCount();
+  int getReadLockCount();
 
   /**
    * Returns the number of keys in this index at the highest level
    */
-  public long getNumberOfMapIndexKeys();
+  long getNumberOfMapIndexKeys();
 
   /**
    * Returns the number of bucket indexes created in the Partitioned Region
    */
-  public int getNumberOfBucketIndexes();
+  int getNumberOfBucketIndexes();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Query.java b/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
index 8a7b4a5..ccc7a2b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
@@ -34,7 +34,7 @@ public interface Query {
    * 
    * @return the original query string
    */
-  public String getQueryString();
+  String getQueryString();
 
 
   /**
@@ -78,8 +78,8 @@ public interface Query {
    * @throws PartitionOfflineException If persistent data recovery is not complete for a partitioned
    *         region referred to in the query.
    */
-  public Object execute() throws FunctionDomainException, TypeMismatchException,
-      NameResolutionException, QueryInvocationTargetException;
+  Object execute() throws FunctionDomainException, TypeMismatchException, NameResolutionException,
+      QueryInvocationTargetException;
 
   /**
    * Executes this query with the given parameters and returns an object that represent its result.
@@ -125,7 +125,7 @@ public interface Query {
    *         region referred to in the query.
    * 
    */
-  public Object execute(Object[] params) throws FunctionDomainException, TypeMismatchException,
+  Object execute(Object[] params) throws FunctionDomainException, TypeMismatchException,
       NameResolutionException, QueryInvocationTargetException;
 
   /**
@@ -184,7 +184,7 @@ public interface Query {
    * @throws PartitionOfflineException If persistent data recovery is not complete for a partitioned
    *         region referred to in the query.
    */
-  public Object execute(RegionFunctionContext context) throws FunctionDomainException,
+  Object execute(RegionFunctionContext context) throws FunctionDomainException,
       TypeMismatchException, NameResolutionException, QueryInvocationTargetException;
 
   /**
@@ -244,9 +244,8 @@ public interface Query {
    * @throws PartitionOfflineException If persistent data recovery is not complete for a partitioned
    *         region referred to in the query.
    */
-  public Object execute(RegionFunctionContext context, Object[] params)
-      throws FunctionDomainException, TypeMismatchException, NameResolutionException,
-      QueryInvocationTargetException;
+  Object execute(RegionFunctionContext context, Object[] params) throws FunctionDomainException,
+      TypeMismatchException, NameResolutionException, QueryInvocationTargetException;
 
   /**
    * Compiles this <code>Query</code> to achieve higher performance execution.
@@ -257,7 +256,7 @@ public interface Query {
    * @deprecated as of 6.5
    */
   @Deprecated
-  public void compile() throws TypeMismatchException, NameResolutionException;
+  void compile() throws TypeMismatchException, NameResolutionException;
 
   /**
    * Return whether this query has been compiled into VM bytecodes.
@@ -266,11 +265,11 @@ public interface Query {
    * @deprecated as of 6.5
    */
   @Deprecated
-  public boolean isCompiled();
+  boolean isCompiled();
 
 
   /**
    * Get statistics information for this query.
    */
-  public QueryStatistics getStatistics();
+  QueryStatistics getStatistics();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
index f9e53ab..45db4fd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryService.java
@@ -37,7 +37,7 @@ import org.apache.geode.cache.query.internal.Undefined;
 public interface QueryService {
 
   /** The undefined constant */
-  public static final Object UNDEFINED = new Undefined();
+  Object UNDEFINED = new Undefined();
 
   /**
    * Constructs a new <code>Query</code> object.
@@ -47,7 +47,7 @@ public interface QueryService {
    * @throws QueryInvalidException if the syntax of the queryString is invalid.
    * @see Query
    */
-  public Query newQuery(String queryString);
+  Query newQuery(String queryString);
 
   /**
    * Create a hash index that can be used when executing equal and not equal queries. Hash index is
@@ -76,7 +76,7 @@ public interface QueryService {
    *         support indexes.
    * 
    */
-  public Index createHashIndex(String indexName, String indexedExpression, String regionPath)
+  Index createHashIndex(String indexName, String indexedExpression, String regionPath)
       throws IndexInvalidException, IndexNameConflictException, IndexExistsException,
       RegionNotFoundException, UnsupportedOperationException;
 
@@ -97,7 +97,7 @@ public interface QueryService {
    * 
    * @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
    */
-  public void defineKeyIndex(String indexName, String indexedExpression, String regionPath)
+  void defineKeyIndex(String indexName, String indexedExpression, String regionPath)
       throws RegionNotFoundException;
 
   /**
@@ -120,7 +120,7 @@ public interface QueryService {
    * @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
    * 
    */
-  public void defineHashIndex(String indexName, String indexedExpression, String regionPath)
+  void defineHashIndex(String indexName, String indexedExpression, String regionPath)
       throws RegionNotFoundException;
 
 
@@ -146,7 +146,7 @@ public interface QueryService {
    * 
    * @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
    */
-  public void defineHashIndex(String indexName, String indexedExpression, String regionPath,
+  void defineHashIndex(String indexName, String indexedExpression, String regionPath,
       String imports) throws RegionNotFoundException;
 
   /**
@@ -170,7 +170,7 @@ public interface QueryService {
    * @throws RegionNotFoundException if the region referred to in the fromClause doesn't exist
    * 
    */
-  public void defineIndex(String indexName, String indexedExpression, String regionPath)
+  void defineIndex(String indexName, String indexedExpression, String regionPath)
       throws RegionNotFoundException;
 
   /**
@@ -200,8 +200,8 @@ public interface QueryService {
    * @throws UnsupportedOperationException If Index is being created on a region which overflows to
    *         disk
    */
-  public void defineIndex(String indexName, String indexedExpression, String regionPath,
-      String imports) throws RegionNotFoundException;
+  void defineIndex(String indexName, String indexedExpression, String regionPath, String imports)
+      throws RegionNotFoundException;
 
   /**
    * Create a hash index that can be used when executing equal and not equal queries. Hash index is
@@ -232,7 +232,7 @@ public interface QueryService {
    * @throws UnsupportedOperationException If Index is being created on a region which overflows to
    *         disk
    */
-  public Index createHashIndex(String indexName, String indexedExpression, String regionPath,
+  Index createHashIndex(String indexName, String indexedExpression, String regionPath,
       String imports) throws IndexInvalidException, IndexNameConflictException,
       IndexExistsException, RegionNotFoundException, UnsupportedOperationException;
 
@@ -274,7 +274,7 @@ public interface QueryService {
    * 
    */
   @Deprecated
-  public Index createIndex(String indexName, IndexType indexType, String indexedExpression,
+  Index createIndex(String indexName, IndexType indexType, String indexedExpression,
       String fromClause) throws IndexInvalidException, IndexNameConflictException,
       IndexExistsException, RegionNotFoundException, UnsupportedOperationException;
 
@@ -317,7 +317,7 @@ public interface QueryService {
    *         disk
    */
   @Deprecated
-  public Index createIndex(String indexName, IndexType indexType, String indexedExpression,
+  Index createIndex(String indexName, IndexType indexType, String indexedExpression,
       String fromClause, String imports) throws IndexInvalidException, IndexNameConflictException,
       IndexExistsException, RegionNotFoundException, UnsupportedOperationException;
 
@@ -349,7 +349,7 @@ public interface QueryService {
    *         support indexes.
    * 
    */
-  public Index createIndex(String indexName, String indexedExpression, String regionPath)
+  Index createIndex(String indexName, String indexedExpression, String regionPath)
       throws IndexInvalidException, IndexNameConflictException, IndexExistsException,
       RegionNotFoundException, UnsupportedOperationException;
 
@@ -383,9 +383,9 @@ public interface QueryService {
    * @throws UnsupportedOperationException If Index is being created on a region which overflows to
    *         disk
    */
-  public Index createIndex(String indexName, String indexedExpression, String regionPath,
-      String imports) throws IndexInvalidException, IndexNameConflictException,
-      IndexExistsException, RegionNotFoundException, UnsupportedOperationException;
+  Index createIndex(String indexName, String indexedExpression, String regionPath, String imports)
+      throws IndexInvalidException, IndexNameConflictException, IndexExistsException,
+      RegionNotFoundException, UnsupportedOperationException;
 
   /**
    * Create a key index that can be used when executing queries. The key index expression indicates
@@ -412,7 +412,7 @@ public interface QueryService {
    * @throws UnsupportedOperationException If Index is being created on a region which overflows to
    *         disk
    */
-  public Index createKeyIndex(String indexName, String indexedExpression, String regionPath)
+  Index createKeyIndex(String indexName, String indexedExpression, String regionPath)
       throws IndexInvalidException, IndexNameConflictException, IndexExistsException,
       RegionNotFoundException, UnsupportedOperationException;
 
@@ -423,12 +423,12 @@ public interface QueryService {
    * @throws MultiIndexCreationException which consists a map of failed indexNames and the
    *         Exceptions.
    */
-  public List<Index> createDefinedIndexes() throws MultiIndexCreationException;
+  List<Index> createDefinedIndexes() throws MultiIndexCreationException;
 
   /**
    * Clears all the indexes that were defined using {@link #defineIndex(String, String, String)}
    */
-  public boolean clearDefinedIndexes();
+  boolean clearDefinedIndexes();
 
   /**
    * Get the Index from the specified Region with the specified name.
@@ -436,14 +436,14 @@ public interface QueryService {
    * @param region the Region for the requested index
    * @return the index of the region with this name, or null if there isn't one
    */
-  public Index getIndex(Region<?, ?> region, String indexName);
+  Index getIndex(Region<?, ?> region, String indexName);
 
   /**
    * Get a collection of all the indexes in the Cache.
    * 
    * @return the collection of all indexes in this Cache
    */
-  public Collection<Index> getIndexes();
+  Collection<Index> getIndexes();
 
   /**
    * Get a collection of all the indexes on the specified Region
@@ -451,7 +451,7 @@ public interface QueryService {
    * @param region the region for the requested indexes
    * @return the collection of indexes on the specified region
    */
-  public Collection<Index> getIndexes(Region<?, ?> region);
+  Collection<Index> getIndexes(Region<?, ?> region);
 
   /**
    * 
@@ -465,26 +465,26 @@ public interface QueryService {
    * @return the collection of indexes for the specified region and type
    */
   @Deprecated
-  public Collection<Index> getIndexes(Region<?, ?> region, IndexType indexType);
+  Collection<Index> getIndexes(Region<?, ?> region, IndexType indexType);
 
   /**
    * Remove the specified index.
    * 
    * @param index the Index to remove
    */
-  public void removeIndex(Index index);
+  void removeIndex(Index index);
 
   /**
    * Remove all the indexes from this cache.
    */
-  public void removeIndexes();
+  void removeIndexes();
 
   /**
    * Remove all the indexes on the specified Region
    * 
    * @param region the Region to remove all indexes from
    */
-  public void removeIndexes(Region<?, ?> region);
+  void removeIndexes(Region<?, ?> region);
 
 
   // CQ Service related APIs.
@@ -506,8 +506,7 @@ public interface QueryService {
    *         supported, and it must be a region path. Bind parameters in the query are not yet
    *         supported.
    */
-  public CqQuery newCq(String queryString, CqAttributes cqAttr)
-      throws QueryInvalidException, CqException;
+  CqQuery newCq(String queryString, CqAttributes cqAttr) throws QueryInvalidException, CqException;
 
   /**
    * Constructs a new continuous query, represented by an instance of CqQuery. The CqQuery is not
@@ -527,7 +526,7 @@ public interface QueryService {
    *         supported, and it must be a region path. Bind parameters in the query are not yet
    *         supported.
    */
-  public CqQuery newCq(String queryString, CqAttributes cqAttr, boolean isDurable)
+  CqQuery newCq(String queryString, CqAttributes cqAttr, boolean isDurable)
       throws QueryInvalidException, CqException;
 
   /**
@@ -551,7 +550,7 @@ public interface QueryService {
    *         supported.
    *
    */
-  public CqQuery newCq(String name, String queryString, CqAttributes cqAttr)
+  CqQuery newCq(String name, String queryString, CqAttributes cqAttr)
       throws QueryInvalidException, CqExistsException, CqException;
 
 
@@ -577,7 +576,7 @@ public interface QueryService {
    *         supported.
    *
    */
-  public CqQuery newCq(String name, String queryString, CqAttributes cqAttr, boolean isDurable)
+  CqQuery newCq(String name, String queryString, CqAttributes cqAttr, boolean isDurable)
       throws QueryInvalidException, CqExistsException, CqException;
 
   /**
@@ -587,7 +586,7 @@ public interface QueryService {
    * 
    * @since GemFire 5.5
    */
-  public void closeCqs();
+  void closeCqs();
 
   /**
    * Retrieve all registered Continuous Queries. This is a collection of CqQuery objects.
@@ -595,7 +594,7 @@ public interface QueryService {
    * @since GemFire 5.5
    * @return CqQuery[] list of registered CQs, null if there are no CQs.
    */
-  public CqQuery[] getCqs();
+  CqQuery[] getCqs();
 
   /**
    * Retrieves all the registered Continuous Queries for a given region. This is a collection of
@@ -605,7 +604,7 @@ public interface QueryService {
    * @return CqQuery[] list of registered CQs on the specified region, null if there are no CQs.
    * @exception CqException if the region does not exist.
    */
-  public CqQuery[] getCqs(String regionName) throws CqException;
+  CqQuery[] getCqs(String regionName) throws CqException;
 
   /**
    * Retrieves the Continuous Query specified by the name.
@@ -614,7 +613,7 @@ public interface QueryService {
    * @param cqName - String, name of the CQ
    * @return CqQuery object, null if no CqQuery object is found.
    */
-  public CqQuery getCq(String cqName);
+  CqQuery getCq(String cqName);
 
   /**
    * Starts execution of all the registered continuous queries for this client. This is
@@ -625,7 +624,7 @@ public interface QueryService {
    * @since GemFire 5.5
    * @throws CqException if failure to execute CQ.
    */
-  public void executeCqs() throws CqException;
+  void executeCqs() throws CqException;
 
   /**
    * Stops execution of all the continuous queries for this client to become inactive. This is
@@ -636,7 +635,7 @@ public interface QueryService {
    * @since GemFire 5.5
    * @throws CqException if failure to execute CQ.
    */
-  public void stopCqs() throws CqException;
+  void stopCqs() throws CqException;
 
   /**
    * Starts execution of all the continuous queries registered on the specified region for this
@@ -647,7 +646,7 @@ public interface QueryService {
    * @since GemFire 5.5
    * @throws CqException if failure to stop CQs.
    */
-  public void executeCqs(String regionName) throws CqException;
+  void executeCqs(String regionName) throws CqException;
 
   /**
    * Stops execution of all the continuous queries registered on the specified region for this
@@ -659,7 +658,7 @@ public interface QueryService {
    * @since GemFire 5.5
    * @throws CqException if failure to execute CQs.
    */
-  public void stopCqs(String regionName) throws CqException;
+  void stopCqs(String regionName) throws CqException;
 
   /**
    * Retrieves all the durable CQs registered by the client calling this method.
@@ -667,7 +666,7 @@ public interface QueryService {
    * @since GemFire 7.0
    * @return List of names of registered durable CQs, empty list if no durable cqs.
    */
-  public List<String> getAllDurableCqsFromServer() throws CqException;
+  List<String> getAllDurableCqsFromServer() throws CqException;
 
   /**
    * Returns CqServiceStatistics object, which provides helper methods to get CQ service related
@@ -682,6 +681,6 @@ public interface QueryService {
    * @return CqServiceStatistics
    * 
    */
-  public CqServiceStatistics getCqStatistics();
+  CqServiceStatistics getCqStatistics();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/QueryStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryStatistics.java
index c5c2ed2..a6546d0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryStatistics.java
@@ -24,11 +24,11 @@ public interface QueryStatistics {
   /**
    * Returns the total number of times the query has been executed.
    */
-  public long getNumExecutions();
+  long getNumExecutions();
 
   /**
    * Returns the total amount of time (in nanoseconds) spent executing the query.
    */
-  public long getTotalExecutionTime();
+  long getTotalExecutionTime();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
index 71a45c2..32c6b0b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/SelectResults.java
@@ -68,7 +68,7 @@ public interface SelectResults<E> extends Collection<E> {
    * 
    * @return true if this collection is modifiable, false if not.
    */
-  public boolean isModifiable();
+  boolean isModifiable();
 
   /**
    * Return the number of times element occurs in this collection, that is the number of duplicates
@@ -79,7 +79,7 @@ public interface SelectResults<E> extends Collection<E> {
    * @return the number of occurrances of element
    * @since GemFire 5.1
    */
-  public int occurrences(E element);
+  int occurrences(E element);
 
   /**
    * Returns this <code>SelectResults</code> as a <code>java.util.Set</code>. If this collection is
@@ -88,7 +88,7 @@ public interface SelectResults<E> extends Collection<E> {
    * 
    * @return Is this collection as a <code>java.util.Set</code>?
    */
-  public Set<E> asSet();
+  Set<E> asSet();
 
   /**
    * Returns this <code>SelectedResults</code> as a <code>java.util.List</code>. If this collection
@@ -97,14 +97,14 @@ public interface SelectResults<E> extends Collection<E> {
    * 
    * @return this collection as a java.util.List
    */
-  public List<E> asList();
+  List<E> asList();
 
   /**
    * Return the ObjectType for the type of collection this represents.
    * 
    * @return the CollectionType for the type of collection this represents
    */
-  public CollectionType getCollectionType();
+  CollectionType getCollectionType();
 
   /**
    * Specify a new elementType, overriding any existing known elementType. This modifies the
@@ -113,6 +113,6 @@ public interface SelectResults<E> extends Collection<E> {
    * 
    * @param elementType the new elementType
    */
-  public void setElementType(ObjectType elementType);
+  void setElementType(ObjectType elementType);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java b/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
index 735d2fb..beb96c2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Struct.java
@@ -38,17 +38,17 @@ public interface Struct {
    *
    * @see StructType#getFieldIndex
    */
-  public Object get(String fieldName);
+  Object get(String fieldName);
 
   /**
    * Get the values in this struct
    * 
    * @return the array of values
    */
-  public Object[] getFieldValues();
+  Object[] getFieldValues();
 
   /**
    * Returns the <code>StructType</code> that describes the fields of this <code>Struct</code>.
    */
-  public StructType getStructType();
+  StructType getStructType();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
index ed9142a..2e78936 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Filter.java
@@ -30,7 +30,7 @@ public interface Filter {
    * 
    * @return SelectResults
    */
-  public SelectResults filterEvaluate(ExecutionContext context, SelectResults iterationLimit)
+  SelectResults filterEvaluate(ExecutionContext context, SelectResults iterationLimit)
       throws FunctionDomainException, TypeMismatchException, NameResolutionException,
       QueryInvocationTargetException;
 
@@ -85,7 +85,7 @@ public interface Filter {
    * @throws NameResolutionException
    * @throws QueryInvocationTargetException
    */
-  public SelectResults filterEvaluate(ExecutionContext context, SelectResults iterationLimit,
+  SelectResults filterEvaluate(ExecutionContext context, SelectResults iterationLimit,
       boolean completeExpansionNeeded, CompiledValue iterOperands, RuntimeIterator[] indpndntItrs,
       boolean isIntersection, boolean conditioningNeeded, boolean evaluateProjection)
       throws FunctionDomainException, TypeMismatchException, NameResolutionException,
@@ -105,11 +105,11 @@ public interface Filter {
    * @throws NameResolutionException
    * @throws QueryInvocationTargetException
    */
-  public SelectResults auxFilterEvaluate(ExecutionContext context,
-      SelectResults intermediateResults) throws FunctionDomainException, TypeMismatchException,
-      NameResolutionException, QueryInvocationTargetException;
+  SelectResults auxFilterEvaluate(ExecutionContext context, SelectResults intermediateResults)
+      throws FunctionDomainException, TypeMismatchException, NameResolutionException,
+      QueryInvocationTargetException;
 
-  public int getSizeEstimate(ExecutionContext context) throws FunctionDomainException,
+  int getSizeEstimate(ExecutionContext context) throws FunctionDomainException,
       TypeMismatchException, NameResolutionException, QueryInvocationTargetException;
 
   /**
@@ -121,7 +121,7 @@ public interface Filter {
    * @throws NameResolutionException
    * @throws QueryInvocationTargetException
    */
-  public boolean isProjectionEvaluationAPossibility(ExecutionContext context)
+  boolean isProjectionEvaluationAPossibility(ExecutionContext context)
       throws FunctionDomainException, TypeMismatchException, NameResolutionException,
       QueryInvocationTargetException;
 
@@ -136,8 +136,8 @@ public interface Filter {
    * @throws TypeMismatchException
    * @throws NameResolutionException
    */
-  public boolean isConditioningNeededForIndex(RuntimeIterator independentIter,
-      ExecutionContext context, boolean completeExpnsNeeded)
+  boolean isConditioningNeededForIndex(RuntimeIterator independentIter, ExecutionContext context,
+      boolean completeExpnsNeeded)
       throws AmbiguousNameException, TypeMismatchException, NameResolutionException;
 
   /**
@@ -155,7 +155,7 @@ public interface Filter {
       throws FunctionDomainException, TypeMismatchException, NameResolutionException,
       QueryInvocationTargetException;
 
-  public int getOperator();
+  int getOperator();
 
   /**
    * This method returns the boolean indicating whether limit can be applied at index level. It
@@ -165,11 +165,10 @@ public interface Filter {
    * 
    * @return true if limit can be applied at index level
    */
-  public boolean isLimitApplicableAtIndexLevel(ExecutionContext context)
-      throws FunctionDomainException, TypeMismatchException, NameResolutionException,
-      QueryInvocationTargetException;
+  boolean isLimitApplicableAtIndexLevel(ExecutionContext context) throws FunctionDomainException,
+      TypeMismatchException, NameResolutionException, QueryInvocationTargetException;
 
-  public boolean isOrderByApplicableAtIndexLevel(ExecutionContext context,
+  boolean isOrderByApplicableAtIndexLevel(ExecutionContext context,
       String canonicalizedOrderByClause) throws FunctionDomainException, TypeMismatchException,
       NameResolutionException, QueryInvocationTargetException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
index 0e5f909..3cdc595 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/HashingStrategy.java
@@ -35,7 +35,7 @@ public interface HashingStrategy extends Serializable {
    * @param o object for which the hash-code is to be computed
    * @return the hashCode
    */
-  public int hashCode(Object o);
+  int hashCode(Object o);
 
   /**
    * Compares o1 and o2 for equality. Strategy implementors may use the objects' own equals()
@@ -45,5 +45,5 @@ public interface HashingStrategy extends Serializable {
    * @param o2 an <code>Object</code> value
    * @return true if the objects are equal according to this strategy.
    */
-  public boolean equals(Object o1, Object o2);
+  boolean equals(Object o1, Object o2);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
index 6887776..f724897 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Negatable.java
@@ -18,6 +18,6 @@ package org.apache.geode.cache.query.internal;
  * Marker interface to mark CompiledValue classes that know how to negate themselves.
  */
 public interface Negatable {
-  public void negate();
+  void negate();
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
index 270fb71..be6acd7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutor.java
@@ -28,9 +28,9 @@ import org.apache.geode.cache.query.TypeMismatchException;
  */
 public interface QueryExecutor {
   // TODO Yogesh , fix this signature
-  public Object executeQuery(DefaultQuery query, Object[] parameters, Set buckets)
+  Object executeQuery(DefaultQuery query, Object[] parameters, Set buckets)
       throws FunctionDomainException, TypeMismatchException, NameResolutionException,
       QueryInvocationTargetException;
 
-  public String getName();
+  String getName();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
index e5f4b2a..35a1bea 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructFields.java
@@ -31,13 +31,13 @@ import org.apache.geode.cache.query.types.CollectionType;
  */
 public interface StructFields {
 
-  public boolean addFieldValues(Object[] fieldValues);
+  boolean addFieldValues(Object[] fieldValues);
 
-  public boolean removeFieldValues(Object[] fieldValues);
+  boolean removeFieldValues(Object[] fieldValues);
 
-  public Iterator fieldValuesIterator();
+  Iterator fieldValuesIterator();
 
-  public CollectionType getCollectionType();
+  CollectionType getCollectionType();
 
-  public boolean containsFieldValues(Object[] fieldValues);
+  boolean containsFieldValues(Object[] fieldValues);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
index e017c3c..d718359 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQ.java
@@ -29,10 +29,10 @@ public interface ClientCQ extends InternalCqQuery {
    * @param sendRequestToServer true to send the request to server.
    * @throws CqException
    */
-  public abstract void close(boolean sendRequestToServer) throws CqClosedException, CqException;
+  void close(boolean sendRequestToServer) throws CqClosedException, CqException;
 
-  public abstract void setProxyCache(ProxyCache proxyCache);
+  void setProxyCache(ProxyCache proxyCache);
 
-  public abstract void createOn(Connection recoveredConnection, boolean isDurable);
+  void createOn(Connection recoveredConnection, boolean isDurable);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
index 8d7096b..35e5c32 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqService.java
@@ -61,71 +61,68 @@ public interface CqService {
    *         parameters in the query are not supported for the initial release.
    *
    */
-  public abstract ClientCQ newCq(String cqName, String queryString, CqAttributes cqAttributes,
-      InternalPool pool, boolean isDurable)
-      throws QueryInvalidException, CqExistsException, CqException;
+  ClientCQ newCq(String cqName, String queryString, CqAttributes cqAttributes, InternalPool pool,
+      boolean isDurable) throws QueryInvalidException, CqExistsException, CqException;
 
   /**
    * Retrieve a cq by client cq name from server
    * 
    * @return the CqQuery or null if not found
    */
-  public abstract CqQuery getClientCqFromServer(ClientProxyMembershipID clientProxyId,
-      String clientCqName);
+  CqQuery getClientCqFromServer(ClientProxyMembershipID clientProxyId, String clientCqName);
 
   /**
    * Retrieve a CqQuery by name.
    * 
    * @return the CqQuery or null if not found
    */
-  public abstract InternalCqQuery getCq(String cqName);
+  InternalCqQuery getCq(String cqName);
 
   /**
    * Retrieve all registered CQs
    */
-  public abstract Collection<? extends InternalCqQuery> getAllCqs();
+  Collection<? extends InternalCqQuery> getAllCqs();
 
   /**
    * Retruns all the cqs on a given region.
    * 
    */
-  public abstract Collection<? extends InternalCqQuery> getAllCqs(String regionName)
-      throws CqException;
+  Collection<? extends InternalCqQuery> getAllCqs(String regionName) throws CqException;
 
   /**
    * Executes all the cqs on this client.
    */
-  public abstract void executeAllClientCqs() throws CqException;
+  void executeAllClientCqs() throws CqException;
 
   /**
    * Executes all the cqs on a given region.
    */
-  public abstract void executeAllRegionCqs(String regionName) throws CqException;
+  void executeAllRegionCqs(String regionName) throws CqException;
 
   /**
    * Executes all the given cqs.
    */
-  public abstract void executeCqs(Collection<? extends InternalCqQuery> cqs) throws CqException;
+  void executeCqs(Collection<? extends InternalCqQuery> cqs) throws CqException;
 
   /**
    * Stops all the cqs on a given region.
    */
-  public abstract void stopAllClientCqs() throws CqException;
+  void stopAllClientCqs() throws CqException;
 
   /**
    * Stops all the cqs on a given region.
    */
-  public abstract void stopAllRegionCqs(String regionName) throws CqException;
+  void stopAllRegionCqs(String regionName) throws CqException;
 
   /**
    * Stops all the specified cqs.
    */
-  public abstract void stopCqs(Collection<? extends InternalCqQuery> cqs) throws CqException;
+  void stopCqs(Collection<? extends InternalCqQuery> cqs) throws CqException;
 
   /**
    * Closes all the cqs on a given region.
    */
-  public abstract void closeCqs(String regionName) throws CqException;
+  void closeCqs(String regionName) throws CqException;
 
   /**
    * Called directly on server side.
@@ -134,20 +131,19 @@ public interface CqService {
    * @param clientProxyId
    * @throws CqException
    */
-  public abstract void closeCq(String cqName, ClientProxyMembershipID clientProxyId)
-      throws CqException;
+  void closeCq(String cqName, ClientProxyMembershipID clientProxyId) throws CqException;
 
-  public abstract void closeAllCqs(boolean clientInitiated);
+  void closeAllCqs(boolean clientInitiated);
 
-  public abstract void closeAllCqs(boolean clientInitiated,
-      Collection<? extends InternalCqQuery> cqs, boolean keepAlive);
+  void closeAllCqs(boolean clientInitiated, Collection<? extends InternalCqQuery> cqs,
+      boolean keepAlive);
 
   /**
    * Get statistics information for all CQs
    * 
    * @return the CqServiceStatistics
    */
-  public abstract CqServiceStatistics getCqStatistics();
+  CqServiceStatistics getCqStatistics();
 
   /**
    * Server side method.
@@ -155,7 +151,7 @@ public interface CqService {
    * @param clientProxyId
    * @throws CqException
    */
-  public abstract void closeClientCqs(ClientProxyMembershipID clientProxyId) throws CqException;
+  void closeClientCqs(ClientProxyMembershipID clientProxyId) throws CqException;
 
   /**
    * Returns all the CQs registered by the client.
@@ -163,7 +159,7 @@ public interface CqService {
    * @param clientProxyId
    * @return CQs registered by the client.
    */
-  public abstract List<ServerCQ> getAllClientCqs(ClientProxyMembershipID clientProxyId);
+  List<ServerCQ> getAllClientCqs(ClientProxyMembershipID clientProxyId);
 
   /**
    * Returns all the durable client CQs registered by the client.
@@ -171,8 +167,7 @@ public interface CqService {
    * @param clientProxyId
    * @return CQs registered by the client.
    */
-  public abstract List<String> getAllDurableClientCqs(ClientProxyMembershipID clientProxyId)
-      throws CqException;
+  List<String> getAllDurableClientCqs(ClientProxyMembershipID clientProxyId) throws CqException;
 
   /**
    * Invokes the CqListeners for the given CQs.
@@ -182,30 +177,30 @@ public interface CqService {
    * @param key
    * @param value
    */
-  public abstract void dispatchCqListeners(HashMap<String, Integer> cqs, int messageType,
-      Object key, Object value, byte[] delta, QueueManager qManager, EventID eventId);
+  void dispatchCqListeners(HashMap<String, Integer> cqs, int messageType, Object key, Object value,
+      byte[] delta, QueueManager qManager, EventID eventId);
 
-  public abstract void processEvents(CacheEvent event, Profile localProfile, Profile[] profiles,
+  void processEvents(CacheEvent event, Profile localProfile, Profile[] profiles,
       FilterRoutingInfo frInfo) throws CqException;
 
-  public UserAttributes getUserAttributes(String cqName);
+  UserAttributes getUserAttributes(String cqName);
 
   /**
    * Closes the CqService.
    */
-  public void close();
+  void close();
 
   /**
    * Returns true if the CQ service has not been closed yet.
    */
-  public boolean isRunning();
+  boolean isRunning();
 
-  public void start();
+  void start();
 
   /**
    * @return Returns the serverCqName.
    */
-  public String constructServerCqName(String cqName, ClientProxyMembershipID clientProxyId);
+  String constructServerCqName(String cqName, ClientProxyMembershipID clientProxyId);
 
   /**
    * Called directly on server side.
@@ -214,7 +209,7 @@ public interface CqService {
    * @param clientId
    * @throws CqException
    */
-  public void stopCq(String cqName, ClientProxyMembershipID clientId) throws CqException;
+  void stopCq(String cqName, ClientProxyMembershipID clientId) throws CqException;
 
   /**
    * Called directly on the server side.
@@ -222,11 +217,11 @@ public interface CqService {
    * @param cqState new state
    * @param cQuery
    */
-  public void resumeCQ(int cqState, ServerCQ cQuery);
+  void resumeCQ(int cqState, ServerCQ cQuery);
 
-  public void cqsDisconnected(Pool pool);
+  void cqsDisconnected(Pool pool);
 
-  public void cqsConnected(Pool pool);
+  void cqsConnected(Pool pool);
 
   /**
    * Executes the given CqQuery, if the CqQuery for that name is not there it registers the one and
@@ -244,7 +239,7 @@ public interface CqService {
    * @throws IllegalStateException if this is called at client side.
    * @throws CqException
    */
-  public ServerCQ executeCq(String cqName, String queryString, int cqState,
+  ServerCQ executeCq(String cqName, String queryString, int cqState,
       ClientProxyMembershipID clientProxyId, CacheClientNotifier ccn, boolean isDurable,
       boolean manageEmptyRegions, int regionDataPolicy, Map emptyRegionsMap)
       throws CqException, RegionNotFoundException, CqClosedException;
@@ -255,7 +250,7 @@ public interface CqService {
    * @param clientProxyId
    * @throws CqException
    */
-  public void closeNonDurableClientCqs(ClientProxyMembershipID clientProxyId) throws CqException;
+  void closeNonDurableClientCqs(ClientProxyMembershipID clientProxyId) throws CqException;
 
-  public abstract List<String> getAllDurableCqsFromServer(InternalPool pool);
+  List<String> getAllDurableCqsFromServer(InternalPool pool);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
index af03d9f..aebc999 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/InternalCqQuery.java
@@ -27,9 +27,9 @@ public interface InternalCqQuery extends CqQuery {
   /**
    * sets the CqName.
    */
-  public abstract void setName(String cqName);
+  void setName(String cqName);
 
-  public String getName();
+  String getName();
 
   /**
    * Closes the Query. On Client side, sends the cq close request to server. On Server side, takes
@@ -38,42 +38,42 @@ public interface InternalCqQuery extends CqQuery {
    * @param sendRequestToServer true to send the request to server.
    * @throws CqException
    */
-  public abstract void close(boolean sendRequestToServer) throws CqClosedException, CqException;
+  void close(boolean sendRequestToServer) throws CqClosedException, CqException;
 
 
-  public abstract LocalRegion getCqBaseRegion();
+  LocalRegion getCqBaseRegion();
 
   /**
    * @return Returns the serverCqName.
    */
-  public abstract String getServerCqName();
+  String getServerCqName();
 
   /**
    * Sets the state of the cq. Server side method. Called during cq registration time.
    */
-  public abstract void setCqState(int state);
+  void setCqState(int state);
 
   /**
    * get the region name in CQ query
    */
-  public String getRegionName();
+  String getRegionName();
 
-  public abstract void setCqService(CqService cqService);
+  void setCqService(CqService cqService);
 
   /**
    * Returns a reference to VSD stats of the CQ
    * 
    * @return VSD stats of the CQ
    */
-  public CqQueryVsdStats getVsdStats();
+  CqQueryVsdStats getVsdStats();
 
-  public abstract CqState getState();
+  CqState getState();
 
-  public String getQueryString();
+  String getQueryString();
 
-  public abstract boolean isDurable();
+  boolean isDurable();
 
-  public abstract void close() throws CqClosedException, CqException;
+  void close() throws CqClosedException, CqException;
 
-  public abstract void stop() throws CqClosedException, CqException;
+  void stop() throws CqClosedException, CqException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
index d0485e9..f75dcad 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQ.java
@@ -25,12 +25,12 @@ public interface ServerCQ extends InternalCqQuery {
   /**
    * @return the filterID
    */
-  public abstract Long getFilterID();
+  Long getFilterID();
 
   /**
    * @param filterID the filterID to set
    */
-  public abstract void setFilterID(Long filterID);
+  void setFilterID(Long filterID);
 
   /**
    * Register the Query on server.
@@ -39,15 +39,15 @@ public interface ServerCQ extends InternalCqQuery {
    * @param p_ccn
    * @throws CqException
    */
-  public abstract void registerCq(ClientProxyMembershipID p_clientProxyId,
-      CacheClientNotifier p_ccn, int p_cqState) throws CqException, RegionNotFoundException;
+  void registerCq(ClientProxyMembershipID p_clientProxyId, CacheClientNotifier p_ccn, int p_cqState)
+      throws CqException, RegionNotFoundException;
 
   /**
    * Adds into the CQ Results key cache.
    * 
    * @param key
    */
-  public abstract void addToCqResultKeys(Object key);
+  void addToCqResultKeys(Object key);
 
   /**
    * Removes the key from CQ Results key cache.
@@ -56,17 +56,17 @@ public interface ServerCQ extends InternalCqQuery {
    * @param isTokenMode if true removes the key if its in destroy token mode if false removes the
    *        key without any check.
    */
-  public abstract void removeFromCqResultKeys(Object key, boolean isTokenMode);
+  void removeFromCqResultKeys(Object key, boolean isTokenMode);
 
   /**
    * Sets the CQ Results key cache state as initialized.
    */
-  public abstract void setCqResultsCacheInitialized();
+  void setCqResultsCacheInitialized();
 
   /**
    * Returns true if old value is required for query processing.
    */
-  public abstract boolean isOldValueRequiredForQueryProcessing(Object key);
+  boolean isOldValueRequiredForQueryProcessing(Object key);
 
   /**
    * Closes the Query. On Client side, sends the cq close request to server. On Server side, takes
@@ -75,12 +75,12 @@ public interface ServerCQ extends InternalCqQuery {
    * @param sendRequestToServer true to send the request to server.
    * @throws CqException
    */
-  public abstract void close(boolean sendRequestToServer) throws CqClosedException, CqException;
+  void close(boolean sendRequestToServer) throws CqClosedException, CqException;
 
 
-  public abstract boolean isPR();
+  boolean isPR();
 
-  public ClientProxyMembershipID getClientProxyId();
+  ClientProxyMembershipID getClientProxyId();
 
-  public void stop() throws CqClosedException, CqException;
+  void stop() throws CqClosedException, CqException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index 2433178..bda8161 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -231,7 +231,7 @@ public class IndexManager {
 
   /** Test Hook */
   public interface TestHook {
-    public void hook(final int spot) throws RuntimeException;
+    void hook(final int spot) throws RuntimeException;
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
index ab07f15..e4fc0e2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
@@ -36,9 +36,9 @@ public interface IndexProtocol extends Index {
    * Constants that indicate three situations where we are removing a mapping. Some implementations
    * of index handle some of the cases and not others.
    */
-  static final int OTHER_OP = 0; // not an UPDATE but some other operation
-  static final int BEFORE_UPDATE_OP = 1; // handled when there is no reverse map
-  static final int AFTER_UPDATE_OP = 2; // handled when there is a reverse map
+  int OTHER_OP = 0; // not an UPDATE but some other operation
+  int BEFORE_UPDATE_OP = 1; // handled when there is no reverse map
+  int AFTER_UPDATE_OP = 2; // handled when there is a reverse map
 
   boolean addIndexMapping(RegionEntry entry) throws IMQException;
 
@@ -173,7 +173,7 @@ public interface IndexProtocol extends Index {
    * 
    * @return String array containing canonicalized definitions
    */
-  public String[] getCanonicalizedIteratorDefinitions();
+  String[] getCanonicalizedIteratorDefinitions();
 
   /**
    * Asif: Object type of the data ( tuple ) contained in the Index Results . It will be either of
@@ -181,11 +181,11 @@ public interface IndexProtocol extends Index {
    * 
    * @return ObjectType
    */
-  public ObjectType getResultSetType();
+  ObjectType getResultSetType();
 
-  public int getSizeEstimate(Object key, int op, int matchLevel) throws TypeMismatchException;
+  int getSizeEstimate(Object key, int op, int matchLevel) throws TypeMismatchException;
 
-  public boolean isMatchingWithIndexExpression(CompiledValue condnExpr, String condnExprStr,
+  boolean isMatchingWithIndexExpression(CompiledValue condnExpr, String condnExprStr,
       ExecutionContext context)
       throws AmbiguousNameException, TypeMismatchException, NameResolutionException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
index ba94485..21a2453 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexStore.java
@@ -31,7 +31,7 @@ public interface IndexStore {
    * @param indexKey
    * @param re
    */
-  public void addMapping(Object indexKey, RegionEntry re) throws IMQException;
+  void addMapping(Object indexKey, RegionEntry re) throws IMQException;
 
   /**
    * Remove a mapping from the index store If entry at indexKey is not found, we must crawl the
@@ -40,7 +40,7 @@ public interface IndexStore {
    * @param indexKey
    * @param re
    */
-  public void removeMapping(Object indexKey, RegionEntry re) throws IMQException;
+  void removeMapping(Object indexKey, RegionEntry re) throws IMQException;
 
   /**
    * Update a mapping in the index store. This method adds a new mapping and removes the old mapping
@@ -49,61 +49,61 @@ public interface IndexStore {
    * @param oldKey
    * @param re
    */
-  public void updateMapping(Object indexKey, Object oldKey, RegionEntry re, Object oldValue)
+  void updateMapping(Object indexKey, Object oldKey, RegionEntry re, Object oldValue)
       throws IMQException;
 
-  public String printAll();
+  String printAll();
 
   /**
    * Return all of the IndexStoreEntries that map to a given region key.
    */
-  public CloseableIterator<IndexStoreEntry> get(Object indexKey);
+  CloseableIterator<IndexStoreEntry> get(Object indexKey);
 
   /**
    * Return all of the IndexStoreEntries in the range between start and end.
    */
-  public CloseableIterator<IndexStoreEntry> iterator(Object start, boolean startInclusive,
-      Object end, boolean endInclusive, Collection keysToRemove);
+  CloseableIterator<IndexStoreEntry> iterator(Object start, boolean startInclusive, Object end,
+      boolean endInclusive, Collection keysToRemove);
 
   /**
    * Return all of the IndexStorageEntries that from start to the tail of the map.
    */
-  public CloseableIterator<IndexStoreEntry> iterator(Object start, boolean startInclusive,
+  CloseableIterator<IndexStoreEntry> iterator(Object start, boolean startInclusive,
       Collection keysToRemove);
 
   /**
    * Return all of the IndexStorageEntries in the map.
    */
-  public CloseableIterator<IndexStoreEntry> iterator(Collection keysToRemove);
+  CloseableIterator<IndexStoreEntry> iterator(Collection keysToRemove);
 
   /**
    * Return all of the IndexStoreEntries from the end to the head of the map.
    */
-  public CloseableIterator<IndexStoreEntry> descendingIterator(Object end, boolean endInclusive,
+  CloseableIterator<IndexStoreEntry> descendingIterator(Object end, boolean endInclusive,
       Collection keysToRemove);
 
   /**
    * Return all of the IndexStoreEntries in the map in descending order.
    */
-  public CloseableIterator<IndexStoreEntry> descendingIterator(Collection keysToRemove);
+  CloseableIterator<IndexStoreEntry> descendingIterator(Collection keysToRemove);
 
   /**
    * Return all of the IndexStoreEntries in the range between end and start.
    */
-  public CloseableIterator<IndexStoreEntry> descendingIterator(Object start, boolean startInclusive,
+  CloseableIterator<IndexStoreEntry> descendingIterator(Object start, boolean startInclusive,
       Object end, boolean endInclusive, Collection keysToRemove);
 
   /**
    * Return the number of IndexStoreEntries that map to a given Index key.
    */
-  public int size(Object key);
+  int size(Object key);
 
   /**
    * Return the total keys in the Index store
    */
-  public int size();
+  int size();
 
-  public boolean clear();
+  boolean clear();
 
   interface IndexStoreEntry {
     /**
@@ -130,15 +130,15 @@ public interface IndexStore {
     boolean isUpdateInProgress();
   }
 
-  public boolean isIndexOnRegionKeys();
+  boolean isIndexOnRegionKeys();
 
-  public void setIndexOnRegionKeys(boolean indexOnRegionKeys);
+  void setIndexOnRegionKeys(boolean indexOnRegionKeys);
 
-  public boolean isIndexOnValues();
+  boolean isIndexOnValues();
 
-  public void setIndexOnValues(boolean indexOnValues);
+  void setIndexOnValues(boolean indexOnValues);
 
-  public Object getTargetObject(RegionEntry entry);
+  Object getTargetObject(RegionEntry entry);
 
-  public Object getTargetObjectInVM(RegionEntry entry);
+  Object getTargetObjectInVM(RegionEntry entry);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
index c367c8a..19b98c6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexedExpressionEvaluator.java
@@ -30,21 +30,21 @@ import org.apache.geode.internal.cache.RegionEntry;
  */
 public interface IndexedExpressionEvaluator {
 
-  public String getIndexedExpression();
+  String getIndexedExpression();
 
-  public String getFromClause();
+  String getFromClause();
 
-  public String getProjectionAttributes();
+  String getProjectionAttributes();
 
   /** @param add true if adding to index, false if removing */
-  public void evaluate(RegionEntry target, boolean add) throws IMQException;
+  void evaluate(RegionEntry target, boolean add) throws IMQException;
 
-  public void initializeIndex(boolean loadEntries) throws IMQException;
+  void initializeIndex(boolean loadEntries) throws IMQException;
 
-  public ObjectType getIndexResultSetType();
+  ObjectType getIndexResultSetType();
 
-  public void expansion(List expandedResults, Object lowerBoundKey, Object upperBoundKey,
+  void expansion(List expandedResults, Object lowerBoundKey, Object upperBoundKey,
       int lowerBoundOperator, int upperBoundOperator, Object value) throws IMQException;
 
-  public List getAllDependentIterators();
+  List getAllDependentIterators();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
index 2752b7a..9fbee8f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
@@ -25,7 +25,7 @@ public interface CollectionType extends ObjectType {
   /**
    * Return the type of the elements of this collection type.
    */
-  public ObjectType getElementType();
+  ObjectType getElementType();
 
   /**
    * Return whether duplicates are kept in this type of collection. Duplicates are two objects are
@@ -33,12 +33,12 @@ public interface CollectionType extends ObjectType {
    * 
    * @return true if duplicates have been retained, false if duplicates have been eliminated
    */
-  public boolean allowsDuplicates();
+  boolean allowsDuplicates();
 
   /**
    * Return whether this collection type has ordered elements.
    * 
    * @return true if this collection type is ordered, false if not
    */
-  public boolean isOrdered();
+  boolean isOrdered();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
index 519d42a..f4f0e52 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
@@ -29,11 +29,11 @@ public interface MapType extends CollectionType {
    * 
    * @return the ObjectType of the keys in this type of map.
    */
-  public ObjectType getKeyType();
+  ObjectType getKeyType();
 
   /**
    * Return the type of the entries in this map. In the context of the query language, the entries
    * in a map are structs with key and value fields.
    */
-  public StructType getEntryType();
+  StructType getEntryType();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
index 76a12a6..9a05839 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
@@ -38,21 +38,21 @@ public interface ObjectType extends DataSerializable {
    * also considered CollectionTypes in the context of the query language and therefore return true
    * to this method.
    */
-  public boolean isCollectionType();
+  boolean isCollectionType();
 
   /** Return true if this is a MapType */
-  public boolean isMapType();
+  boolean isMapType();
 
   /** Return true if this is a StructType */
-  public boolean isStructType();
+  boolean isStructType();
 
   /**
    * @return the simple name for the class this resolves to without including the package
    */
-  public String getSimpleClassName();
+  String getSimpleClassName();
 
   /**
    * @return the Class that this type corresponds to.
    */
-  public Class resolveClass();
+  Class resolveClass();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
index 30aa957..7fcd950 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
@@ -44,6 +44,6 @@ public interface StructType extends ObjectType {
    * @throws IllegalArgumentException If this <code>StructType</code> does not contain a field named
    *         <code>fieldName</code>.
    */
-  public int getFieldIndex(String fieldName);
+  int getFieldIndex(String fieldName);
 
 }


Mime
View raw message