You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/01/31 19:53:33 UTC
[geode] branch develop updated: GEODE-4433: Remove unnecessary
modifiers from interfaces outside geode-core
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 9cf05c1 GEODE-4433: Remove unnecessary modifiers from interfaces outside geode-core
9cf05c1 is described below
commit 9cf05c18b638dd47fbae881e6e2bec1722f97508
Author: Patrick Rhomberg <Pu...@users.noreply.github.com>
AuthorDate: Wed Jan 31 11:53:30 2018 -0800
GEODE-4433: Remove unnecessary modifiers from interfaces outside geode-core
---
.../session/internal/common/SessionCache.java | 12 ++++----
.../session/internal/filter/SessionManager.java | 16 +++++-----
.../filter/attributes/SessionAttributes.java | 24 +++++++--------
.../internal/jmx/SessionStatisticsMXBean.java | 6 ++--
.../geode/modules/gatewaydelta/GatewayDelta.java | 6 ++--
.../modules/gatewaydelta/GatewayDeltaEvent.java | 2 +-
.../modules/session/catalina/SessionCache.java | 36 +++++++++++-----------
.../modules/session/catalina/SessionManager.java | 26 ++++++++--------
.../internal/DeltaSessionAttributeEvent.java | 3 +-
.../geode/experimental/driver/JSONWrapper.java | 6 ++--
geode-json/src/main/java/org/json/JSONString.java | 2 +-
.../java/org/apache/geode/test/junit/Repeat.java | 2 +-
.../java/org/apache/geode/test/junit/Retry.java | 2 +-
.../serializable/FieldsOfTemporaryFolder.java | 6 ++--
.../junit/rules/serializable/FieldsOfTestName.java | 2 +-
.../junit/rules/serializable/FieldsOfTimeout.java | 6 ++--
.../geode/test/junit/runners/SuiteRunner.java | 2 +-
.../org/apache/geode/cache/lucene/LuceneIndex.java | 10 +++---
.../geode/cache/lucene/LuceneIndexFactory.java | 2 +-
.../org/apache/geode/cache/lucene/LuceneQuery.java | 12 ++++----
.../geode/cache/lucene/LuceneQueryFactory.java | 8 ++---
.../geode/cache/lucene/LuceneQueryProvider.java | 2 +-
.../geode/cache/lucene/LuceneResultStruct.java | 6 ++--
.../apache/geode/cache/lucene/LuceneService.java | 18 +++++------
.../cache/lucene/PageableLuceneQueryResults.java | 8 ++---
.../geode/cache/lucene/internal/IndexListener.java | 8 ++---
.../cache/lucene/internal/InternalLuceneIndex.java | 6 ++--
.../internal/repository/IndexRepository.java | 4 +--
.../internal/repository/IndexResultCollector.java | 4 +--
.../lucene/management/LuceneServiceMXBean.java | 6 ++--
.../CustomMappingJackson2HttpMessageConverter.java | 4 +--
31 files changed, 128 insertions(+), 129 deletions(-)
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
index 2bbd957..1d2be3c 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
@@ -28,26 +28,26 @@ public interface SessionCache {
/**
* Initialize the cache and create the appropriate region.
*/
- public void initialize();
+ void initialize();
/**
* Stop the cache.
*/
- public void stop();
+ void stop();
/**
* Retrieve the cache reference.
*
* @return a {@code GemFireCache} reference
*/
- public GemFireCache getCache();
+ GemFireCache getCache();
/**
* Get the {@code Region} being used by client code to put attributes.
*
* @return a {@code Region<String, HttpSession>} reference
*/
- public Region<String, HttpSession> getOperatingRegion();
+ Region<String, HttpSession> getOperatingRegion();
/**
* Get the backing {@code Region} being used. This may not be the same as the region being used by
@@ -55,12 +55,12 @@ public interface SessionCache {
*
* @return a {@code Region<String, HttpSession>} reference
*/
- public Region<String, HttpSession> getSessionRegion();
+ Region<String, HttpSession> getSessionRegion();
/**
* Is this cache client-server? The only other alternative is peer-to-peer.
*
* @return true if this cache is client-server.
*/
- public boolean isClientServer();
+ boolean isClientServer();
}
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
index 2c476d5..582f8ca 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
@@ -32,19 +32,19 @@ public interface SessionManager {
* the same classloader. This is so that during shutdown, the manager can decide whether or
* not to also stop the cache. This option allows the filter's classloader to be passed in.
*/
- public void start(Object config, ClassLoader loader);
+ void start(Object config, ClassLoader loader);
/**
* Stop the session manager and free up any resources.
*/
- public void stop();
+ void stop();
/**
* Write the session to the region
*
* @param session the session to write
*/
- public void putSession(HttpSession session);
+ void putSession(HttpSession session);
/**
* Return a session if it exists or null otherwise
@@ -52,28 +52,28 @@ public interface SessionManager {
* @param id The session id to attempt to retrieve
* @return a HttpSession object if a session was found otherwise null.
*/
- public HttpSession getSession(String id);
+ HttpSession getSession(String id);
/**
* Create a new session, wrapping a container session.
*
* @return the HttpSession object
*/
- public HttpSession wrapSession(ServletContext context, int maxInactiveInterval);
+ HttpSession wrapSession(ServletContext context, int maxInactiveInterval);
/**
* Destroy the session associated with the given id.
*
* @param id The id of the session to destroy.
*/
- public void destroySession(String id);
+ void destroySession(String id);
/**
* Returns the cookie name used to hold the session id. By default this is JSESSIONID.
*
* @return the name of the cookie which contains the session id
*/
- public String getSessionCookieName();
+ String getSessionCookieName();
/**
* Get the JVM Id - this is a unique string used internally to identify who last touched a
@@ -81,5 +81,5 @@ public interface SessionManager {
*
* @return the jvm id
*/
- public String getJvmId();
+ String getJvmId();
}
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
index f0fd2d5..6daed5e 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
@@ -32,7 +32,7 @@ public interface SessionAttributes extends DataSerializable {
*
* @param session the session to set
*/
- public void setSession(GemfireHttpSession session);
+ void setSession(GemfireHttpSession session);
/**
* Set an attribute value.
@@ -41,7 +41,7 @@ public interface SessionAttributes extends DataSerializable {
* @param value the value for the attribute
* @return the value object
*/
- public Object putAttribute(String attr, Object value);
+ Object putAttribute(String attr, Object value);
/**
* Retrieve an attribute's value.
@@ -49,7 +49,7 @@ public interface SessionAttributes extends DataSerializable {
* @param attr the name of the attribute
* @return the object associated with the attribute or null if none exists.
*/
- public Object getAttribute(String attr);
+ Object getAttribute(String attr);
/**
* Remove the named attribute.
@@ -57,61 +57,61 @@ public interface SessionAttributes extends DataSerializable {
* @param attr the name of the attribute to remove
* @return the value of the attribute removed or null if the named attribute did not exist.
*/
- public Object removeAttribute(String attr);
+ Object removeAttribute(String attr);
/**
* Return a set of all attribute names.
*
* @return a set of all attribute names
*/
- public Set<String> getAttributeNames();
+ Set<String> getAttributeNames();
/**
* Set the max inactive interval for replication to other systems
*
* @param interval the time interval in seconds
*/
- public void setMaxInactiveInterval(int interval);
+ void setMaxInactiveInterval(int interval);
/**
* Retrieve the max inactive interval
*
* @return the max inactive interval in seconds
*/
- public int getMaxIntactiveInterval();
+ int getMaxIntactiveInterval();
/**
* Set the last accessed time for replication to other systems
*
* @param time the last accessed time in milliseconds
*/
- public void setLastAccessedTime(long time);
+ void setLastAccessedTime(long time);
/**
* Return the last accessed time in milliseconds
*
* @return the last accessed time
*/
- public long getLastAccessedTime();
+ long getLastAccessedTime();
/**
* Explicitly flush the attributes to backing store.
*/
- public void flush();
+ void flush();
/**
* Return the last jvm which 'owned' these attributes
*
* @return the jvmId
*/
- public String getJvmOwnerId();
+ String getJvmOwnerId();
/**
* Set the jvmId. This is set every time the attributes are flushed to the cache.
*
* @param jvmId
*/
- public void setJvmOwnerId(String jvmId);
+ void setJvmOwnerId(String jvmId);
/**
* Return the creation of time of this session in milliseconds
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
index 1821f62..6676f09 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
@@ -20,9 +20,9 @@ package org.apache.geode.modules.session.internal.jmx;
*/
public interface SessionStatisticsMXBean {
- public int getActiveSessions();
+ int getActiveSessions();
- public int getTotalSessions();
+ int getTotalSessions();
- public long getRegionUpdates();
+ long getRegionUpdates();
}
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
index 92cde0a..88c3fd9 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
@@ -16,9 +16,9 @@ package org.apache.geode.modules.gatewaydelta;
public interface GatewayDelta {
- public static final String GATEWAY_DELTA_REGION_NAME = "__gatewayDelta";
+ String GATEWAY_DELTA_REGION_NAME = "__gatewayDelta";
- public GatewayDeltaEvent getCurrentGatewayDeltaEvent();
+ GatewayDeltaEvent getCurrentGatewayDeltaEvent();
- public void setCurrentGatewayDeltaEvent(GatewayDeltaEvent currentGatewayDeltaEvent);
+ void setCurrentGatewayDeltaEvent(GatewayDeltaEvent currentGatewayDeltaEvent);
}
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
index d54e90b..134e4f1 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
@@ -18,5 +18,5 @@ import org.apache.geode.cache.Cache;
public interface GatewayDeltaEvent {
- public void apply(Cache cache);
+ void apply(Cache cache);
}
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
index 06492ee..2c0dfd7 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
@@ -26,39 +26,39 @@ import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics
public interface SessionCache {
- public void initialize();
+ void initialize();
- public String getDefaultRegionAttributesId();
+ String getDefaultRegionAttributesId();
- public boolean getDefaultEnableLocalCache();
+ boolean getDefaultEnableLocalCache();
- public String getSessionRegionName();
+ String getSessionRegionName();
- public String getOperatingRegionName();
+ String getOperatingRegionName();
- public void putSession(Session session);
+ void putSession(Session session);
- public HttpSession getSession(String sessionId);
+ HttpSession getSession(String sessionId);
- public void destroySession(String sessionId);
+ void destroySession(String sessionId);
- public void touchSessions(Set<String> sessionIds);
+ void touchSessions(Set<String> sessionIds);
- public DeltaSessionStatistics getStatistics();
+ DeltaSessionStatistics getStatistics();
- public GemFireCache getCache();
+ GemFireCache getCache();
- public Region<String, HttpSession> getSessionRegion();
+ Region<String, HttpSession> getSessionRegion();
- public Region<String, HttpSession> getOperatingRegion();
+ Region<String, HttpSession> getOperatingRegion();
- public boolean isPeerToPeer();
+ boolean isPeerToPeer();
- public boolean isClientServer();
+ boolean isClientServer();
- public Set<String> keySet();
+ Set<String> keySet();
- public int size();
+ int size();
- public boolean isBackingCacheAvailable();
+ boolean isBackingCacheAvailable();
}
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
index e739fa4..52337c1 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
@@ -18,29 +18,29 @@ import org.apache.juli.logging.Log;
public interface SessionManager {
- public String getRegionName();
+ String getRegionName();
- public String getRegionAttributesId();
+ String getRegionAttributesId();
- public int getMaxInactiveInterval();
+ int getMaxInactiveInterval();
- public boolean getEnableGatewayReplication();
+ boolean getEnableGatewayReplication();
- public boolean getEnableGatewayDeltaReplication();
+ boolean getEnableGatewayDeltaReplication();
- public boolean getEnableDebugListener();
+ boolean getEnableDebugListener();
- public boolean getEnableLocalCache();
+ boolean getEnableLocalCache();
- public boolean isCommitValveEnabled();
+ boolean isCommitValveEnabled();
- public boolean isCommitValveFailfastEnabled();
+ boolean isCommitValveFailfastEnabled();
- public boolean isBackingCacheAvailable();
+ boolean isBackingCacheAvailable();
- public boolean getPreferDeserializedForm();
+ boolean getPreferDeserializedForm();
- public String getStatisticsName();
+ String getStatisticsName();
- public Log getLogger();
+ Log getLogger();
}
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
index 896eb86..be02962 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
@@ -15,10 +15,9 @@
package org.apache.geode.modules.session.catalina.internal;
import org.apache.geode.DataSerializable;
-import org.apache.geode.modules.session.catalina.DeltaSession;
import org.apache.geode.modules.session.catalina.DeltaSessionInterface;
public interface DeltaSessionAttributeEvent extends DataSerializable {
- public void apply(DeltaSessionInterface session);
+ void apply(DeltaSessionInterface session);
}
diff --git a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/JSONWrapper.java b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/JSONWrapper.java
index 79527fe..53cbfd6 100644
--- a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/JSONWrapper.java
+++ b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/JSONWrapper.java
@@ -35,17 +35,17 @@ import org.apache.geode.annotations.Experimental;
@Experimental
public interface JSONWrapper extends Comparable<JSONWrapper> {
- public static JSONWrapper wrapJSON(String jsonDocument) {
+ static JSONWrapper wrapJSON(String jsonDocument) {
if (jsonDocument == null) {
throw new IllegalArgumentException("wrapped document may not be null");
}
return new JSONWrapperImpl(jsonDocument);
}
- public String getJSON();
+ String getJSON();
- static class JSONWrapperImpl implements JSONWrapper {
+ class JSONWrapperImpl implements JSONWrapper {
protected final String jsonDocument;
diff --git a/geode-json/src/main/java/org/json/JSONString.java b/geode-json/src/main/java/org/json/JSONString.java
index 8759eda..9d0d312 100755
--- a/geode-json/src/main/java/org/json/JSONString.java
+++ b/geode-json/src/main/java/org/json/JSONString.java
@@ -13,5 +13,5 @@ public interface JSONString {
*
* @return A strictly syntactically correct JSON text.
*/
- public String toJSONString();
+ String toJSONString();
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/Repeat.java b/geode-junit/src/main/java/org/apache/geode/test/junit/Repeat.java
index c65823f..87cdb5f 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/Repeat.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/Repeat.java
@@ -32,7 +32,7 @@ import java.lang.annotation.Target;
@SuppressWarnings("unused")
public @interface Repeat {
- public static int DEFAULT = 1;
+ int DEFAULT = 1;
int value() default DEFAULT;
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/Retry.java b/geode-junit/src/main/java/org/apache/geode/test/junit/Retry.java
index 7e6315e..8652f03 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/Retry.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/Retry.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
@Target({ElementType.METHOD})
public @interface Retry {
- public static int DEFAULT = 1;
+ int DEFAULT = 1;
int value() default DEFAULT;
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java
index 3a6d66c..e55c9ae 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java
@@ -18,7 +18,7 @@ package org.apache.geode.test.junit.rules.serializable;
* Names of member fields in {@link org.junit.rules.TemporaryFolder}.
*/
interface FieldsOfTemporaryFolder {
- static final String FIELD_PARENT_FOLDER = "parentFolder"; // java.io.File
- static final String FIELD_ASSURE_DELETION = "assureDeletion"; // boolean (since JUnit 4.13)
- static final String FIELD_FOLDER = "folder"; // java.io.File
+ String FIELD_PARENT_FOLDER = "parentFolder"; // java.io.File
+ String FIELD_ASSURE_DELETION = "assureDeletion"; // boolean (since JUnit 4.13)
+ String FIELD_FOLDER = "folder"; // java.io.File
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java
index 541a98a..ffe340f 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java
@@ -18,5 +18,5 @@ package org.apache.geode.test.junit.rules.serializable;
* Names of member fields in {@link org.junit.rules.TestName}.
*/
interface FieldsOfTestName {
- static final String FIELD_NAME = "name"; // String
+ String FIELD_NAME = "name"; // String
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java
index c6f8568..d79f942 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java
@@ -18,7 +18,7 @@ package org.apache.geode.test.junit.rules.serializable;
* Names of member fields in {@link org.junit.rules.Timeout}.
*/
interface FieldsOfTimeout {
- static final String FIELD_TIMEOUT = "timeout"; // long
- static final String FIELD_TIME_UNIT = "timeUnit"; // java.util.concurrent.TimeUnit
- static final String FIELD_LOOK_FOR_STUCK_THREAD = "lookForStuckThread"; // boolean
+ String FIELD_TIMEOUT = "timeout"; // long
+ String FIELD_TIME_UNIT = "timeUnit"; // java.util.concurrent.TimeUnit
+ String FIELD_LOOK_FOR_STUCK_THREAD = "lookForStuckThread"; // boolean
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java b/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java
index 19bb530..f165e86 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java
@@ -45,7 +45,7 @@ public class SuiteRunner extends Suite {
/**
* @return the classes to be run
*/
- public Class<?> value();
+ Class<?> value();
}
public SuiteRunner(final Class<?> testClass, final RunnerBuilder builder)
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndex.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndex.java
index 92370b7..3b48919 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndex.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndex.java
@@ -49,7 +49,7 @@ public interface LuceneIndex {
*
* @return Name of the LuceneIndex
*/
- public String getName();
+ String getName();
/**
* Returns the path of the region on which the LuceneIndex was created. The region name is
@@ -57,7 +57,7 @@ public interface LuceneIndex {
*
* @return Path of the region
*/
- public String getRegionPath();
+ String getRegionPath();
/**
* Returns a string array containing the fields on which the LuceneIndex was created. These fields
@@ -66,7 +66,7 @@ public interface LuceneIndex {
*
* @return String array containing the field names
*/
- public String[] getFieldNames();
+ String[] getFieldNames();
/**
* Returns a map containing the field name and the {@link Analyzer} used to tokenize the field.
@@ -76,11 +76,11 @@ public interface LuceneIndex {
* @return a map containing pairs of the indexed field name and the corresponding {@link Analyzer}
* being used on each indexed field.
*/
- public Map<String, Analyzer> getFieldAnalyzers();
+ Map<String, Analyzer> getFieldAnalyzers();
/**
* Return the {@link LuceneSerializer} associated with this index
*/
- public LuceneSerializer getLuceneSerializer();
+ LuceneSerializer getLuceneSerializer();
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java
index b054ee4..9d8f13e 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneIndexFactory.java
@@ -87,5 +87,5 @@ public interface LuceneIndexFactory {
* @param luceneSerializer A callback which converts a region value to a lucene document or
* documents to be stored in the index.
*/
- public LuceneIndexFactory setLuceneSerializer(LuceneSerializer luceneSerializer);
+ LuceneIndexFactory setLuceneSerializer(LuceneSerializer luceneSerializer);
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java
index 8233c84..cbd80aa 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java
@@ -55,7 +55,7 @@ public interface LuceneQuery<K, V> {
* Lucene query goes offline.
* @throws CancelException if a cancel is in progress while the Lucene query was being executed.
*/
- public Collection<K> findKeys() throws LuceneQueryException;
+ Collection<K> findKeys() throws LuceneQueryException;
/**
* Execute the query and return the region values that match this query, up to the limit specified
@@ -70,7 +70,7 @@ public interface LuceneQuery<K, V> {
* Lucene query goes offline.
* @throws CancelException if a cancel is in progress while the Lucene query was being executed.
*/
- public Collection<V> findValues() throws LuceneQueryException;
+ Collection<V> findValues() throws LuceneQueryException;
/**
* Execute the query and return a list of {@link LuceneResultStruct}s that match this query, up to
@@ -86,7 +86,7 @@ public interface LuceneQuery<K, V> {
* Lucene query goes offline.
* @throws CancelException if a cancel is in progress while the Lucene query was being executed.
*/
- public List<LuceneResultStruct<K, V>> findResults() throws LuceneQueryException;
+ List<LuceneResultStruct<K, V>> findResults() throws LuceneQueryException;
/**
* Execute the query and get a {@link PageableLuceneQueryResults}. The
@@ -102,7 +102,7 @@ public interface LuceneQuery<K, V> {
* Lucene query goes offline.
* @throws CancelException if a cancel is in progress while the Lucene query was being executed.
*/
- public PageableLuceneQueryResults<K, V> findPages() throws LuceneQueryException;
+ PageableLuceneQueryResults<K, V> findPages() throws LuceneQueryException;
/**
* Gets the page size setting of current query. This page size is set while creating
@@ -110,7 +110,7 @@ public interface LuceneQuery<K, V> {
*
* @return int value representing the page size of the current query
*/
- public int getPageSize();
+ int getPageSize();
/**
* Get limit size setting of current query. This value is the maximum number of results that can
@@ -119,6 +119,6 @@ public interface LuceneQuery<K, V> {
*
* @return int value representing the limit of the current query
*/
- public int getLimit();
+ int getLimit();
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java
index e09b66c..9663d18 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java
@@ -34,12 +34,12 @@ public interface LuceneQueryFactory {
/**
* Default query result limit is 100
*/
- public static final int DEFAULT_LIMIT = 100;
+ int DEFAULT_LIMIT = 100;
/**
* Default page size of result is 0, which means no pagination
*/
- public static final int DEFAULT_PAGESIZE = 0;
+ int DEFAULT_PAGESIZE = 0;
/**
* Set page size for a query result. The default page size is 0 which means no pagination.
@@ -74,7 +74,7 @@ public interface LuceneQueryFactory {
* @param <V> the value type in the query results
* @return LuceneQuery object
*/
- public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString,
+ <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString,
String defaultField);
/**
@@ -105,6 +105,6 @@ public interface LuceneQueryFactory {
* @param <V> the value type in the query results
* @return LuceneQuery object
*/
- public <K, V> LuceneQuery<K, V> create(String indexName, String regionName,
+ <K, V> LuceneQuery<K, V> create(String indexName, String regionName,
LuceneQueryProvider provider);
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java
index fa49d96..06aa49f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryProvider.java
@@ -41,6 +41,6 @@ public interface LuceneQueryProvider extends Serializable {
* propagated to callers of the {@link LuceneQuery} find methods.
*/
- public Query getQuery(LuceneIndex index) throws LuceneQueryException;
+ Query getQuery(LuceneIndex index) throws LuceneQueryException;
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java
index e6dbc66..0fbc95d 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java
@@ -27,7 +27,7 @@ public interface LuceneResultStruct<K, V> {
* @return The region key of the entry matching the query
*
*/
- public K getKey();
+ K getKey();
/**
* Returns the Apache Geode region key of the result matching the Lucene Query
@@ -35,7 +35,7 @@ public interface LuceneResultStruct<K, V> {
* @return the region value of the entry matching the query.
*
*/
- public V getValue();
+ V getValue();
/**
* Return score the score of the entry matching the query. Scores are computed by Lucene based on
@@ -44,5 +44,5 @@ public interface LuceneResultStruct<K, V> {
* @return float value representing the score of the entry obtained as a result of executing the
* Lucene query.
*/
- public float getScore();
+ float getScore();
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
index 3a197cc..8fd9789 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
@@ -101,12 +101,12 @@ public interface LuceneService {
* only work if the region value is a String or Number, in which case a Lucene document will be
* created with a single field with this name.
*/
- public String REGION_VALUE_FIELD = "__REGION_VALUE_FIELD";
+ String REGION_VALUE_FIELD = "__REGION_VALUE_FIELD";
/**
* Get a factory for creating a Lucene index on this member.
*/
- public LuceneIndexFactory createIndexFactory();
+ LuceneIndexFactory createIndexFactory();
/**
* Destroy the Lucene index
@@ -114,14 +114,14 @@ public interface LuceneService {
* @param indexName the name of the index to destroy
* @param regionPath the path of the region whose index to destroy
*/
- public void destroyIndex(String indexName, String regionPath);
+ void destroyIndex(String indexName, String regionPath);
/**
* Destroy all the Lucene indexes for the region
*
* @param regionPath The path of the region on which to destroy the indexes
*/
- public void destroyIndexes(String regionPath);
+ void destroyIndexes(String regionPath);
/**
* Get the Lucene index object specified by region name and index name
@@ -130,26 +130,26 @@ public interface LuceneService {
* @param regionPath region name
* @return LuceneIndex object
*/
- public LuceneIndex getIndex(String indexName, String regionPath);
+ LuceneIndex getIndex(String indexName, String regionPath);
/**
* get all the Lucene indexes.
*
* @return all index objects in a Collection
*/
- public Collection<LuceneIndex> getAllIndexes();
+ Collection<LuceneIndex> getAllIndexes();
/**
* Create a factory for building a Lucene query.
*/
- public LuceneQueryFactory createLuceneQueryFactory();
+ LuceneQueryFactory createLuceneQueryFactory();
/**
* returns the cache to which the LuceneService belongs
*
* @return Cache
*/
- public Cache getCache();
+ Cache getCache();
/**
@@ -171,6 +171,6 @@ public interface LuceneService {
*
* @return true if entries are flushed within timeout, false if the timeout has elapsed
*/
- public boolean waitUntilFlushed(String indexName, String regionPath, long timeout, TimeUnit unit)
+ boolean waitUntilFlushed(String indexName, String regionPath, long timeout, TimeUnit unit)
throws InterruptedException;
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java
index d96cda1..4a08909 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/PageableLuceneQueryResults.java
@@ -37,26 +37,26 @@ public interface PageableLuceneQueryResults<K, V> extends Iterator<List<LuceneRe
*
* @return int value representing total number of hits for this query across all pages.
*/
- public int size();
+ int size();
/**
* Returns the maximum score value across all pages.
*
* @return float value representing the maximum score across all the Lucene result pages.
*/
- public float getMaxScore();
+ float getMaxScore();
/**
* Get the next page of results.
*
* @return a page of results, or null if there are no more pages
*/
- public List<LuceneResultStruct<K, V>> next();
+ List<LuceneResultStruct<K, V>> next();
/**
* True if there is another page of results in PageableLuceneQueryResults.
*
* @return boolean value, true if another Lucene result page is present, false otherwise.
*/
- public boolean hasNext();
+ boolean hasNext();
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java
index aba5f57..a2ad892 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexListener.java
@@ -22,12 +22,12 @@ import org.apache.geode.cache.lucene.LuceneIndex;
public interface IndexListener {
- public void beforeIndexCreated(final String indexName, String regionPath, final Analyzer analyzer,
+ void beforeIndexCreated(final String indexName, String regionPath, final Analyzer analyzer,
final Map<String, Analyzer> fieldAnalyzers, final String... fields);
- public void afterIndexCreated(LuceneIndex index);
+ void afterIndexCreated(LuceneIndex index);
- public void beforeIndexDestroyed(LuceneIndex index);
+ void beforeIndexDestroyed(LuceneIndex index);
- public void afterIndexDestroyed(LuceneIndex index);
+ void afterIndexDestroyed(LuceneIndex index);
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java
index 6eae4f4..72d2c9a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/InternalLuceneIndex.java
@@ -20,16 +20,16 @@ import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
public interface InternalLuceneIndex extends LuceneIndex {
- public RepositoryManager getRepositoryManager();
+ RepositoryManager getRepositoryManager();
/**
* Dump the files for this index to the given directory.
*/
- public void dumpFiles(String directory);
+ void dumpFiles(String directory);
/**
* Destroy the index
*/
- public void destroy(boolean initiator);
+ void destroy(boolean initiator);
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java
index a46e95f..a4b7e1b 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexRepository.java
@@ -58,7 +58,7 @@ public interface IndexRepository {
*
* @throws IOException
*/
- public void query(Query query, int limit, IndexResultCollector collector) throws IOException;
+ void query(Query query, int limit, IndexResultCollector collector) throws IOException;
/**
* Commit the changes to all lucene index
@@ -74,7 +74,7 @@ public interface IndexRepository {
*
* @return true if this repository is closed.
*/
- public boolean isClosed();
+ boolean isClosed();
/**
* For debugging purposes, return the underlying IndexWriter
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java
index 5166817..a52c042 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/IndexResultCollector.java
@@ -31,14 +31,14 @@ public interface IndexResultCollector {
*
* @return Name/identifier of this collector
*/
- public String getName();
+ String getName();
/**
* Returns the number of Lucene query results that are being stored in the IndexResultCollector
*
* @return number of results collected by this collector
*/
- public int size();
+ int size();
/**
* Collects a corresponding pair of Apache Geode key and Lucene score assigned to the document
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneServiceMXBean.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneServiceMXBean.java
index 80ad575..cea187d 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneServiceMXBean.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/management/LuceneServiceMXBean.java
@@ -30,7 +30,7 @@ public interface LuceneServiceMXBean {
*
* @return an array of LuceneIndexMetrics for the LuceneIndexes defined in this member
*/
- public LuceneIndexMetrics[] listIndexMetrics();
+ LuceneIndexMetrics[] listIndexMetrics();
/**
* Returns an array of {@link LuceneIndexMetrics} for the
@@ -42,7 +42,7 @@ public interface LuceneServiceMXBean {
* @return an array of LuceneIndexMetrics for the LuceneIndex instances defined on the input
* region in this member
*/
- public LuceneIndexMetrics[] listIndexMetrics(String regionPath);
+ LuceneIndexMetrics[] listIndexMetrics(String regionPath);
/**
* Returns a {@link LuceneIndexMetrics} for the {@link org.apache.geode.cache.lucene.LuceneIndex}
@@ -54,5 +54,5 @@ public interface LuceneServiceMXBean {
* @return a LuceneIndexMetrics for the LuceneIndex with the input index name defined on the input
* region in this member.
*/
- public LuceneIndexMetrics listIndexMetrics(String regionPath, String indexName);
+ LuceneIndexMetrics listIndexMetrics(String regionPath, String indexName);
}
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
index 1196394..6b01192 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
@@ -118,9 +118,9 @@ public class CustomMappingJackson2HttpMessageConverter extends MappingJackson2Ht
protected interface HttpOutputMessageWrapper extends HttpOutputMessage {
- public long getContentLength();
+ long getContentLength();
- public void flush() throws IOException;
+ void flush() throws IOException;
}
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.