You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2017/09/07 17:09:53 UTC

[geode] branch develop updated: Revert "GEODE-3568: User can set a LuceneSerializer through the Java API"

This is an automated email from the ASF dual-hosted git repository.

upthewaterspout 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 7ed3737  Revert "GEODE-3568: User can set a LuceneSerializer through the Java API"
7ed3737 is described below

commit 7ed3737339629158bc52525ad5084ff99c66ab50
Author: Dan Smith <up...@apache.org>
AuthorDate: Thu Sep 7 10:08:10 2017 -0700

    Revert "GEODE-3568: User can set a LuceneSerializer through the Java API"
    
    This code is not ready for the develop branch yet, it is not yet fully
    implemented. Moving to feature/GEODE-3239.
    
    This reverts commit 51b13ab96d95af6d72ea2921ce575e8f4ecc97d7.
---
 .../java/org/apache/geode/cache/lucene/LuceneIndexFactory.java   | 9 ---------
 .../geode/cache/lucene/internal/LuceneIndexFactoryImpl.java      | 6 ------
 .../repository/serializer/HeterogeneousLuceneSerializer.java     | 5 -----
 .../lucene/internal/repository/serializer/LuceneSerializer.java  | 6 ------
 .../internal/repository/serializer/PdxLuceneSerializer.java      | 7 -------
 .../internal/repository/serializer/PrimitiveSerializer.java      | 7 -------
 .../repository/serializer/ReflectionLuceneSerializer.java        | 6 ------
 7 files changed, 46 deletions(-)

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 f01ef1b..a737cbe 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
@@ -14,7 +14,6 @@
  */
 package org.apache.geode.cache.lucene;
 
-import org.apache.geode.cache.lucene.internal.repository.serializer.LuceneSerializer;
 import org.apache.lucene.analysis.Analyzer;
 
 import java.util.Map;
@@ -82,12 +81,4 @@ public interface LuceneIndexFactory {
    */
   void create(String indexName, String regionPath);
 
-  /**
-   * Configure the way objects are converted to lucene documents for this lucene index
-   * 
-   * @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);
-
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
index 8ffe38c..b77d8b6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
@@ -15,7 +15,6 @@
 package org.apache.geode.cache.lucene.internal;
 
 import org.apache.geode.cache.lucene.LuceneIndexFactory;
-import org.apache.geode.cache.lucene.internal.repository.serializer.LuceneSerializer;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 
@@ -63,9 +62,4 @@ public class LuceneIndexFactoryImpl implements org.apache.geode.cache.lucene.Luc
     service.createIndex(indexName, regionPath, fields);
 
   }
-
-  @Override
-  public LuceneIndexFactory setLuceneSerializer(LuceneSerializer luceneSerializer) {
-    return this;
-  }
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
index 09d3832..3c2f8b7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
@@ -15,7 +15,6 @@
 package org.apache.geode.cache.lucene.internal.repository.serializer;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Map;
 
 import org.apache.logging.log4j.Logger;
@@ -103,9 +102,5 @@ public class HeterogeneousLuceneSerializer implements LuceneSerializer {
     }
   }
 
-  @Override
-  public Collection<Document> toDocuments(Object value) {
-    return null;
-  }
 
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/LuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/LuceneSerializer.java
index 8b9b664..fa38f47 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/LuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/LuceneSerializer.java
@@ -15,8 +15,6 @@
 
 package org.apache.geode.cache.lucene.internal.repository.serializer;
 
-import java.util.Collection;
-
 import org.apache.lucene.document.Document;
 
 /**
@@ -29,8 +27,4 @@ public interface LuceneSerializer {
    */
   void toDocument(Object value, Document doc);
 
-  /**
-   * Add the fields of the given value to a set of documents
-   */
-  Collection<Document> toDocuments(Object value);
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
index c9aaed2..f34390c 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
@@ -18,8 +18,6 @@ package org.apache.geode.cache.lucene.internal.repository.serializer;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.document.Document;
 
-import java.util.Collection;
-
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.pdx.PdxInstance;
 
@@ -52,9 +50,4 @@ class PdxLuceneSerializer implements LuceneSerializer {
       logger.debug("PdxLuceneSerializer.toDocument:" + doc);
     }
   }
-
-  @Override
-  public Collection<Document> toDocuments(Object value) {
-    return null;
-  }
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java
index 5e30a43..cf644a8 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/PrimitiveSerializer.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.lucene.internal.repository.serializer;
 
-import java.util.Collection;
-
 import org.apache.geode.cache.lucene.LuceneService;
 
 import org.apache.lucene.document.Document;
@@ -30,9 +28,4 @@ public class PrimitiveSerializer implements LuceneSerializer {
   public void toDocument(final Object value, final Document doc) {
     SerializerUtil.addField(doc, LuceneService.REGION_VALUE_FIELD, value);
   }
-
-  @Override
-  public Collection<Document> toDocuments(Object value) {
-    return null;
-  }
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
index 05cccc2..07a66fb 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
@@ -18,7 +18,6 @@ package org.apache.geode.cache.lucene.internal.repository.serializer;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -77,9 +76,4 @@ class ReflectionLuceneSerializer implements LuceneSerializer {
       logger.debug("ReflectionLuceneSerializer.toDocument:" + doc);
     }
   }
-
-  @Override
-  public Collection<Document> toDocuments(Object value) {
-    return null;
-  }
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].