Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4D173200CF0 for ; Thu, 7 Sep 2017 19:09:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4CC09161203; Thu, 7 Sep 2017 17:09:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6D2F21609E3 for ; Thu, 7 Sep 2017 19:09:57 +0200 (CEST) Received: (qmail 40714 invoked by uid 500); 7 Sep 2017 17:09:56 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 40705 invoked by uid 99); 7 Sep 2017 17:09:55 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2017 17:09:55 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 15A0D8158B; Thu, 7 Sep 2017 17:09:53 +0000 (UTC) Date: Thu, 07 Sep 2017 17:09:53 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: Revert "GEODE-3568: User can set a LuceneSerializer through the Java API" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150480419352.3901.750740154565331720@gitbox.apache.org> From: upthewaterspout@apache.org Reply-To: "commits@geode.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 51b13ab96d95af6d72ea2921ce575e8f4ecc97d7 X-Git-Newrev: 7ed3737339629158bc52525ad5084ff99c66ab50 X-Git-Rev: 7ed3737339629158bc52525ad5084ff99c66ab50 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Thu, 07 Sep 2017 17:09:58 -0000 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 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 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 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 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 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 toDocuments(Object value) { - return null; - } } -- To stop receiving notification emails like this one, please contact ['"commits@geode.apache.org" '].