From 925398c86b46b1f9b4821061636cc3f07dd0fca8 Mon Sep 17 00:00:00 2001 From: Emmanuel Bernard Date: Fri, 26 Aug 2011 15:54:40 +0200 Subject: [PATCH] HSEARCH-872 Move relevant parts of operations to serializer sip package Also rename Model to JavaSerialization (provider) Move JavaSerialization provider to dedicated package --- .../codex/avro/impl/AvroDeserializer.java | 6 ++-- .../codex/avro/impl/AvroSerializer.java | 5 ++- .../codex/impl/CopyTokenStream.java | 3 +- .../codex/impl/LuceneWorkHydrator.java | 6 ++-- ...ableSerializationLuceneWorkSerializer.java | 4 +-- .../impl/JavaSerializationDeserializer.java} | 5 +-- ...vaSerializationSerializationProvider.java} | 8 ++--- .../impl/JavaSerializationSerializer.java} | 9 +++--- .../spi}/LuceneFieldContext.java | 2 +- .../spi}/LuceneNumericFieldContext.java | 2 +- .../codex/spi/LuceneWorksBuilder.java | 4 --- .../impl => codex/spi}/SerializableIndex.java | 2 +- .../impl => codex/spi}/SerializableStore.java | 2 +- .../spi}/SerializableTermVector.java | 2 +- .../spi}/SerializableTokenStream.java | 2 +- .../serialization/codex/spi/Serializer.java | 2 -- .../operations/impl/OperationType.java | 32 ------------------- .../impl/SerializableBinaryField.java | 2 ++ .../impl/SerializableDoubleField.java | 2 ++ .../operations/impl/SerializableField.java | 2 ++ .../impl/SerializableFloatField.java | 2 ++ .../operations/impl/SerializableIntField.java | 2 ++ .../impl/SerializableLongField.java | 2 ++ .../impl/SerializableNumericField.java | 3 ++ .../impl/SerializableReaderField.java | 3 ++ .../impl/SerializableStringField.java | 5 +++ .../impl/SerializableTokenStreamField.java | 4 +++ .../search/util/logging/impl/Log.java | 6 ---- .../test/serialization/SerializationTest.java | 2 +- 29 files changed, 57 insertions(+), 74 deletions(-) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/{impl/ModelDeserializer.java => javaserialization/impl/JavaSerializationDeserializer.java} (97%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/{impl/ModelSerializationProvider.java => javaserialization/impl/JavaSerializationSerializationProvider.java} (84%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/{impl/ModelSerializer.java => javaserialization/impl/JavaSerializationSerializer.java} (94%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/{operations/impl => codex/spi}/LuceneFieldContext.java (98%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/{operations/impl => codex/spi}/LuceneNumericFieldContext.java (96%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/{operations/impl => codex/spi}/SerializableIndex.java (94%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/{operations/impl => codex/spi}/SerializableStore.java (94%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/{operations/impl => codex/spi}/SerializableTermVector.java (94%) rename hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/{operations/impl => codex/spi}/SerializableTokenStream.java (95%) delete mode 100644 hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/OperationType.java diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroDeserializer.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroDeserializer.java index fc26964b379..129111c409e 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroDeserializer.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroDeserializer.java @@ -37,9 +37,9 @@ import org.hibernate.search.indexes.serialization.codex.spi.Deserializer; import org.hibernate.search.indexes.serialization.codex.spi.LuceneWorksBuilder; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableIndex; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableStore; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableTermVector; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableIndex; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableStore; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTermVector; import org.hibernate.search.util.logging.impl.Log; import org.hibernate.search.util.logging.impl.LoggerFactory; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroSerializer.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroSerializer.java index cab531544c7..843a86b0bc2 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroSerializer.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroSerializer.java @@ -48,11 +48,10 @@ import org.apache.lucene.util.AttributeImpl; import org.apache.solr.handler.AnalysisRequestHandlerBase; -import org.hibernate.search.SearchException; import org.hibernate.search.backend.LuceneWork; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; import org.hibernate.search.indexes.serialization.codex.spi.Serializer; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneFieldContext; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneNumericFieldContext; import org.hibernate.search.util.logging.impl.Log; import org.hibernate.search.util.logging.impl.LoggerFactory; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/CopyTokenStream.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/CopyTokenStream.java index 1e0363b64a2..cfd08401d85 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/CopyTokenStream.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/CopyTokenStream.java @@ -29,8 +29,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.util.AttributeImpl; -import org.hibernate.search.SearchException; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableTokenStream; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTokenStream; import org.hibernate.search.util.logging.impl.Log; import org.hibernate.search.util.logging.impl.LoggerFactory; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/LuceneWorkHydrator.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/LuceneWorkHydrator.java index fa07dcf3405..50c7a5cc405 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/LuceneWorkHydrator.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/LuceneWorkHydrator.java @@ -53,9 +53,9 @@ import org.hibernate.search.engine.spi.EntityIndexBinder; import org.hibernate.search.engine.spi.SearchFactoryImplementor; import org.hibernate.search.indexes.serialization.codex.spi.LuceneWorksBuilder; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableIndex; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableStore; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableTermVector; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableIndex; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableStore; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTermVector; import org.hibernate.search.util.impl.ClassLoaderHelper; import org.hibernate.search.util.logging.impl.Log; import org.hibernate.search.util.logging.impl.LoggerFactory; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/PluggableSerializationLuceneWorkSerializer.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/PluggableSerializationLuceneWorkSerializer.java index cf345210ada..959e0e81f8b 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/PluggableSerializationLuceneWorkSerializer.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/PluggableSerializationLuceneWorkSerializer.java @@ -37,11 +37,11 @@ import org.hibernate.search.backend.UpdateLuceneWork; import org.hibernate.search.engine.spi.SearchFactoryImplementor; import org.hibernate.search.indexes.serialization.codex.spi.Deserializer; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; import org.hibernate.search.indexes.serialization.codex.spi.LuceneWorkSerializer; import org.hibernate.search.indexes.serialization.codex.spi.SerializationProvider; import org.hibernate.search.indexes.serialization.codex.spi.Serializer; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneFieldContext; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneNumericFieldContext; import org.hibernate.search.util.logging.impl.Log; import org.hibernate.search.util.logging.impl.LoggerFactory; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelDeserializer.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationDeserializer.java similarity index 97% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelDeserializer.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationDeserializer.java index 11b794b67a8..b2e3a6da6b1 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelDeserializer.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationDeserializer.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.codex.impl; +package org.hibernate.search.indexes.serialization.codex.javaserialization.impl; import java.io.ByteArrayInputStream; import java.util.List; @@ -28,6 +28,7 @@ import org.hibernate.search.SearchException; import org.hibernate.search.indexes.serialization.codex.avro.impl.AvroSerializationProvider; +import org.hibernate.search.indexes.serialization.codex.impl.SerializationHelper; import org.hibernate.search.indexes.serialization.codex.spi.Deserializer; import org.hibernate.search.indexes.serialization.codex.spi.LuceneWorksBuilder; import org.hibernate.search.indexes.serialization.operations.impl.Add; @@ -56,7 +57,7 @@ /** * @author Emmanuel Bernard */ -public class ModelDeserializer implements Deserializer { +public class JavaSerializationDeserializer implements Deserializer { private static final Log log = LoggerFactory.make(); @Override diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelSerializationProvider.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationSerializationProvider.java similarity index 84% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelSerializationProvider.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationSerializationProvider.java index 10b9c82a6ee..bd17d95b455 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelSerializationProvider.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationSerializationProvider.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.codex.impl; +package org.hibernate.search.indexes.serialization.codex.javaserialization.impl; import org.hibernate.search.indexes.serialization.codex.spi.Deserializer; import org.hibernate.search.indexes.serialization.codex.spi.SerializationProvider; @@ -27,14 +27,14 @@ /** * @author Emmanuel Bernard */ -public class ModelSerializationProvider implements SerializationProvider { +public class JavaSerializationSerializationProvider implements SerializationProvider { @Override public Serializer getSerializer() { - return new ModelSerializer(); + return new JavaSerializationSerializer(); } @Override public Deserializer getDeserializer() { - return new ModelDeserializer(); + return new JavaSerializationDeserializer(); } } diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelSerializer.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationSerializer.java similarity index 94% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelSerializer.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationSerializer.java index e47a0bc56b5..f6b7fdc63e7 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/impl/ModelSerializer.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/javaserialization/impl/JavaSerializationSerializer.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.codex.impl; +package org.hibernate.search.indexes.serialization.codex.javaserialization.impl; import java.io.Serializable; import java.util.HashSet; @@ -29,11 +29,12 @@ import org.apache.lucene.document.Fieldable; import org.hibernate.search.backend.LuceneWork; +import org.hibernate.search.indexes.serialization.codex.impl.SerializationHelper; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; import org.hibernate.search.indexes.serialization.codex.spi.Serializer; import org.hibernate.search.indexes.serialization.operations.impl.Add; import org.hibernate.search.indexes.serialization.operations.impl.Delete; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneFieldContext; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneNumericFieldContext; import org.hibernate.search.indexes.serialization.operations.impl.Message; import org.hibernate.search.indexes.serialization.operations.impl.Operation; import org.hibernate.search.indexes.serialization.operations.impl.OptimizeAll; @@ -54,7 +55,7 @@ /** * @author Emmanuel Bernard */ -public class ModelSerializer implements Serializer { +public class JavaSerializationSerializer implements Serializer { private Serializable id; private Set ops; private Set serialFields; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/LuceneFieldContext.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneFieldContext.java similarity index 98% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/LuceneFieldContext.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneFieldContext.java index 9aa3a131860..f520bd5fed8 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/LuceneFieldContext.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneFieldContext.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.operations.impl; +package org.hibernate.search.indexes.serialization.codex.spi; import java.io.Reader; import java.io.Serializable; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/LuceneNumericFieldContext.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneNumericFieldContext.java similarity index 96% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/LuceneNumericFieldContext.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneNumericFieldContext.java index 0e87f79aaca..7e43fe74513 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/LuceneNumericFieldContext.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneNumericFieldContext.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.operations.impl; +package org.hibernate.search.indexes.serialization.codex.spi; import org.apache.lucene.document.NumericField; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneWorksBuilder.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneWorksBuilder.java index c3f3cb4e3ef..4b62466958f 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneWorksBuilder.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneWorksBuilder.java @@ -26,10 +26,6 @@ import org.apache.lucene.util.AttributeImpl; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableIndex; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableStore; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableTermVector; - /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIndex.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableIndex.java similarity index 94% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIndex.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableIndex.java index ccb144967db..930d42d22c0 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIndex.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableIndex.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.operations.impl; +package org.hibernate.search.indexes.serialization.codex.spi; /** * @author Emmanuel Bernard diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStore.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableStore.java similarity index 94% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStore.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableStore.java index 561174250b1..7f997b029f7 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStore.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableStore.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.operations.impl; +package org.hibernate.search.indexes.serialization.codex.spi; /** * @author Emmanuel Bernard diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTermVector.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableTermVector.java similarity index 94% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTermVector.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableTermVector.java index 512e5a3391d..982d42cf6b2 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTermVector.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableTermVector.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.operations.impl; +package org.hibernate.search.indexes.serialization.codex.spi; /** * @author Emmanuel Bernard diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStream.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableTokenStream.java similarity index 95% rename from hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStream.java rename to hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableTokenStream.java index b3a8e13273d..b918c85f49d 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStream.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/SerializableTokenStream.java @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.hibernate.search.indexes.serialization.operations.impl; +package org.hibernate.search.indexes.serialization.codex.spi; import java.io.Serializable; import java.util.List; diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/Serializer.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/Serializer.java index 94a1d9826ba..dbbe50eed9e 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/Serializer.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/Serializer.java @@ -26,8 +26,6 @@ import org.apache.lucene.document.Fieldable; import org.hibernate.search.backend.LuceneWork; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneFieldContext; -import org.hibernate.search.indexes.serialization.operations.impl.LuceneNumericFieldContext; /** * Contract between Hibernate Search and the Serialization mechanism. diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/OperationType.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/OperationType.java deleted file mode 100644 index 9c1cf7435fe..00000000000 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/OperationType.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.search.indexes.serialization.operations.impl; - -/** - * @author Emmanuel Bernard - */ -public enum OperationType { - ADD, - UPDATE, - DELETE, - PURGE_ALL, - OPTIMIZE -} diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableBinaryField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableBinaryField.java index ace77eb544e..d220f6af384 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableBinaryField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableBinaryField.java @@ -20,6 +20,8 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableDoubleField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableDoubleField.java index 814b46a13c7..8009fd7186d 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableDoubleField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableDoubleField.java @@ -20,6 +20,8 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableField.java index 54373fed7d8..c6d76d3e72f 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableField.java @@ -20,6 +20,8 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableFloatField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableFloatField.java index 4bef352e565..9a427156332 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableFloatField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableFloatField.java @@ -20,6 +20,8 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIntField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIntField.java index 75f6814c4a9..c892ee0b673 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIntField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIntField.java @@ -20,6 +20,8 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableLongField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableLongField.java index d822d8a8a2e..10ea17e49bd 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableLongField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableLongField.java @@ -20,6 +20,8 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableNumericField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableNumericField.java index bcc365952b7..6ad44399550 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableNumericField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableNumericField.java @@ -20,6 +20,9 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableStore; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableReaderField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableReaderField.java index 8c509753a48..35c05d528d7 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableReaderField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableReaderField.java @@ -20,6 +20,9 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTermVector; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStringField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStringField.java index 0f0b9b97e97..af6167acb46 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStringField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableStringField.java @@ -20,6 +20,11 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableIndex; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableStore; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTermVector; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStreamField.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStreamField.java index 9cd81af8439..bc0c64b4ed6 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStreamField.java +++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableTokenStreamField.java @@ -20,6 +20,10 @@ */ package org.hibernate.search.indexes.serialization.operations.impl; +import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTermVector; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTokenStream; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-search/src/main/java/org/hibernate/search/util/logging/impl/Log.java b/hibernate-search/src/main/java/org/hibernate/search/util/logging/impl/Log.java index 5546321ebef..a3880b3dc6d 100644 --- a/hibernate-search/src/main/java/org/hibernate/search/util/logging/impl/Log.java +++ b/hibernate-search/src/main/java/org/hibernate/search/util/logging/impl/Log.java @@ -28,12 +28,8 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.Properties; -import org.apache.lucene.document.Field; -import org.apache.lucene.document.Fieldable; -import org.apache.lucene.document.NumericField; import org.apache.lucene.index.CorruptIndexException; import org.jboss.logging.BasicLogger; import org.jboss.logging.Cause; @@ -42,8 +38,6 @@ import org.jboss.logging.MessageLogger; import org.hibernate.search.SearchException; -import org.hibernate.search.indexes.serialization.codex.avro.impl.AvroSerializationProvider; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableTermVector; /** * Hibernate Search's log abstraction layer on top of JBoss Logging. diff --git a/hibernate-search/src/test/java/org/hibernate/search/test/serialization/SerializationTest.java b/hibernate-search/src/test/java/org/hibernate/search/test/serialization/SerializationTest.java index 2cd3f37bdd2..eba38fdcc72 100644 --- a/hibernate-search/src/test/java/org/hibernate/search/test/serialization/SerializationTest.java +++ b/hibernate-search/src/test/java/org/hibernate/search/test/serialization/SerializationTest.java @@ -64,7 +64,7 @@ import org.hibernate.search.indexes.serialization.codex.impl.PluggableSerializationLuceneWorkSerializer; import org.hibernate.search.indexes.serialization.codex.impl.SerializationHelper; import org.hibernate.search.indexes.serialization.codex.spi.LuceneWorkSerializer; -import org.hibernate.search.indexes.serialization.operations.impl.SerializableTokenStream; +import org.hibernate.search.indexes.serialization.codex.spi.SerializableTokenStream; import org.hibernate.search.test.SearchTestCase; import org.hibernate.search.util.logging.impl.Log; import org.hibernate.search.util.logging.impl.LoggerFactory;