[
https://issues.apache.org/jira/browse/GEODE-4112?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16299264#comment-16299264
]
ASF GitHub Bot commented on GEODE-4112:
---------------------------------------
nabarunnag closed pull request #1185: GEODE-4112: Replaced FunctionAdapter with
Function
URL: https://github.com/apache/geode/pull/1185
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
index 99da3f9727..b1b974d1b4 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
@@ -23,7 +23,7 @@
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.execute.FunctionAdapter;
+import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.LuceneService;
@@ -46,13 +46,15 @@
*
* @see Cache
* @see org.apache.geode.cache.execute.Function
- * @see FunctionAdapter
+ * @see Function
* @see FunctionContext
* @see InternalEntity
* @see LuceneIndexDetails
*/
@SuppressWarnings("unused")
-public class LuceneCreateIndexFunction extends FunctionAdapter implements
InternalEntity {
+public class LuceneCreateIndexFunction implements InternalEntity, Function {
+
+ private static final long serialVersionUID = 3061443846664615818L;
public String getId() {
return LuceneCreateIndexFunction.class.getName();
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
index 2b0e0f2300..dd90116856 100755
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction.java
@@ -16,8 +16,7 @@
package org.apache.geode.cache.lucene.internal.cli.functions;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.execute.FunctionAdapter;
+import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
@@ -35,14 +34,16 @@
*
* @see Cache
* @see org.apache.geode.cache.execute.Function
- * @see FunctionAdapter
+ * @see Function
* @see FunctionContext
* @see InternalEntity
* @see LuceneIndexDetails
* @see LuceneIndexInfo
*/
@SuppressWarnings("unused")
-public class LuceneDescribeIndexFunction extends FunctionAdapter implements
InternalEntity {
+public class LuceneDescribeIndexFunction implements InternalEntity, Function {
+
+ private static final long serialVersionUID = 1776072528558670172L;
public String getId() {
return LuceneDescribeIndexFunction.class.getName();
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
index 0732d2b32e..34d445b22b 100755
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction.java
@@ -19,8 +19,7 @@
import java.util.Set;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.execute.FunctionAdapter;
+import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
@@ -37,13 +36,15 @@
*
* @see Cache
* @see org.apache.geode.cache.execute.Function
- * @see FunctionAdapter
+ * @see Function
* @see FunctionContext
* @see InternalEntity
* @see LuceneIndexDetails
*/
@SuppressWarnings("unused")
-public class LuceneListIndexFunction extends FunctionAdapter implements
InternalEntity {
+public class LuceneListIndexFunction implements InternalEntity, Function {
+
+ private static final long serialVersionUID = -2320432506763893879L;
public String getId() {
return LuceneListIndexFunction.class.getName();
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
index 6bc2d92522..0a6cc3ec3e 100755
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
@@ -21,6 +21,7 @@
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.lucene.LuceneQuery;
@@ -42,14 +43,16 @@
*
* @see Cache
* @see org.apache.geode.cache.execute.Function
- * @see FunctionAdapter
+ * @see Function
* @see FunctionContext
* @see InternalEntity
* @see LuceneIndexDetails
* @see LuceneIndexInfo
*/
@SuppressWarnings("unused")
-public class LuceneSearchIndexFunction<K, V> extends FunctionAdapter
implements InternalEntity {
+public class LuceneSearchIndexFunction<K, V> implements InternalEntity,
Function {
+
+ private static final long serialVersionUID = 163818919780803222L;
public String getId() {
return LuceneSearchIndexFunction.class.getName();
diff --git
a/geode-lucene/src/main/resources/org/apache/geode/internal/sanctioned-geode-lucene-serializables.txt
b/geode-lucene/src/main/resources/org/apache/geode/internal/sanctioned-geode-lucene-serializables.txt
index 8b513a6a4f..a15e2d8aeb 100755
---
a/geode-lucene/src/main/resources/org/apache/geode/internal/sanctioned-geode-lucene-serializables.txt
+++
b/geode-lucene/src/main/resources/org/apache/geode/internal/sanctioned-geode-lucene-serializables.txt
@@ -9,11 +9,11 @@
org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails,true,1,fieldAnalyz
org/apache/geode/cache/lucene/internal/cli/LuceneIndexInfo,true,1,fieldAnalyzers:java/lang/String[],searchableFieldNames:java/lang/String[],serializer:java/lang/String
org/apache/geode/cache/lucene/internal/cli/LuceneQueryInfo,true,1,defaultField:java/lang/String,keysOnly:boolean,limit:int,queryString:java/lang/String
org/apache/geode/cache/lucene/internal/cli/LuceneSearchResults,false,exceptionFlag:boolean,exceptionMessage:java/lang/String,key:java/lang/String,score:float,value:java/lang/String
-org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction,false
-org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction,false
+org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction,true,3061443846664615818
+org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunction,true,1776072528558670172
org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunction,false
-org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction,false
-org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction,false
+org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunction,true,-2320432506763893879
+org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction,true,163818919780803222
org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles,true,1
org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction,true,1
org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction,true,1
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Replace FunctionAdapter with Function in geode-lucene module
> ------------------------------------------------------------
>
> Key: GEODE-4112
> URL: https://issues.apache.org/jira/browse/GEODE-4112
> Project: Geode
> Issue Type: Bug
> Components: lucene
> Reporter: nabarun
> Assignee: nabarun
>
> Replace FunctionAdapter with Function in geode-lucene module
> NOTE: As a fix for this issue SerialVersionUIDs were added. Java
> serialization isn't really used for these functions but that the
> serialVersionUID was added anyways. It was a pre-emptive measure.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
