Skip to content

Commit

Permalink
HSEARCH-872 Move relevant parts of operations to serializer sip package
Browse files Browse the repository at this point in the history 
Also rename Model to JavaSerialization (provider)
Move JavaSerialization provider to dedicated package
  • Loading branch information
@emmanuelbernard @Sanne
emmanuelbernard authored and Sanne committed Aug 26, 2011
1 parent 377c76a commit 925398c
Show file tree
Hide file tree
Showing 29 changed files with 57 additions and 74 deletions.
6 changes: 3 additions & 3 deletions ...ain/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroDeserializer.java
View file
Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions .../main/java/org/hibernate/search/indexes/serialization/codex/avro/impl/AvroSerializer.java
View file
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions .../src/main/java/org/hibernate/search/indexes/serialization/codex/impl/CopyTokenStream.java
View file
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/org/hibernate/search/indexes/serialization/codex/impl/LuceneWorkHydrator.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...e/search/indexes/serialization/codex/impl/PluggableSerializationLuceneWorkSerializer.java
View file
Expand Up @@ -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;

Expand Down
5 changes: 3 additions & 2 deletions ...ization/codex/impl/ModelDeserializer.java → ...n/impl/JavaSerializationDeserializer.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -56,7 +57,7 @@
/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
public class ModelDeserializer implements Deserializer {
public class JavaSerializationDeserializer implements Deserializer {
private static final Log log = LoggerFactory.make();

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...odex/impl/ModelSerializationProvider.java → ...vaSerializationSerializationProvider.java
View file
Expand Up @@ -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;
Expand All @@ -27,14 +27,14 @@
/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
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();
}
}
9 changes: 5 additions & 4 deletions ...alization/codex/impl/ModelSerializer.java → ...ion/impl/JavaSerializationSerializer.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -54,7 +55,7 @@
/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
public class ModelSerializer implements Serializer {
public class JavaSerializationSerializer implements Serializer {
private Serializable id;
private Set<Operation> ops;
private Set<SerializableFieldable> serialFields;
Expand Down
2 changes: 1 addition & 1 deletion ...n/operations/impl/LuceneFieldContext.java → ...ization/codex/spi/LuceneFieldContext.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tions/impl/LuceneNumericFieldContext.java → .../codex/spi/LuceneNumericFieldContext.java
View file
Expand Up @@ -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;

Expand Down
4 changes: 0 additions & 4 deletions ...rc/main/java/org/hibernate/search/indexes/serialization/codex/spi/LuceneWorksBuilder.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
*/
Expand Down
2 changes: 1 addition & 1 deletion ...on/operations/impl/SerializableIndex.java → ...lization/codex/spi/SerializableIndex.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
Expand Down
2 changes: 1 addition & 1 deletion ...on/operations/impl/SerializableStore.java → ...lization/codex/spi/SerializableStore.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
Expand Down
2 changes: 1 addition & 1 deletion ...erations/impl/SerializableTermVector.java → ...ion/codex/spi/SerializableTermVector.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
Expand Down
2 changes: 1 addition & 1 deletion ...rations/impl/SerializableTokenStream.java → ...on/codex/spi/SerializableTokenStream.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ...search/src/main/java/org/hibernate/search/indexes/serialization/codex/spi/Serializer.java
View file
Expand Up @@ -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.
Expand Down
32 changes: 0 additions & 32 deletions ...c/main/java/org/hibernate/search/indexes/serialization/operations/impl/OperationType.java
View file

This file was deleted.

2 changes: 2 additions & 0 deletions ...a/org/hibernate/search/indexes/serialization/operations/impl/SerializableBinaryField.java
View file
Expand Up @@ -20,6 +20,8 @@
*/
package org.hibernate.search.indexes.serialization.operations.impl;

import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext;

/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
Expand Down
2 changes: 2 additions & 0 deletions ...a/org/hibernate/search/indexes/serialization/operations/impl/SerializableDoubleField.java
View file
Expand Up @@ -20,6 +20,8 @@
*/
package org.hibernate.search.indexes.serialization.operations.impl;

import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext;

/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/org/hibernate/search/indexes/serialization/operations/impl/SerializableField.java
View file
Expand Up @@ -20,6 +20,8 @@
*/
package org.hibernate.search.indexes.serialization.operations.impl;

import org.hibernate.search.indexes.serialization.codex.spi.LuceneFieldContext;

/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
Expand Down
2 changes: 2 additions & 0 deletions ...va/org/hibernate/search/indexes/serialization/operations/impl/SerializableFloatField.java
View file
Expand Up @@ -20,6 +20,8 @@
*/
package org.hibernate.search.indexes.serialization.operations.impl;

import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext;

/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
Expand Down
2 changes: 2 additions & 0 deletions ...java/org/hibernate/search/indexes/serialization/operations/impl/SerializableIntField.java
View file
Expand Up @@ -20,6 +20,8 @@
*/
package org.hibernate.search.indexes.serialization.operations.impl;

import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext;

/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
Expand Down
2 changes: 2 additions & 0 deletions ...ava/org/hibernate/search/indexes/serialization/operations/impl/SerializableLongField.java
View file
Expand Up @@ -20,6 +20,8 @@
*/
package org.hibernate.search.indexes.serialization.operations.impl;

import org.hibernate.search.indexes.serialization.codex.spi.LuceneNumericFieldContext;

/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
Expand Down
3 changes: 3 additions & 0 deletions .../org/hibernate/search/indexes/serialization/operations/impl/SerializableNumericField.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
*/
Expand Down
3 changes: 3 additions & 0 deletions ...a/org/hibernate/search/indexes/serialization/operations/impl/SerializableReaderField.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
*/
Expand Down
5 changes: 5 additions & 0 deletions ...a/org/hibernate/search/indexes/serialization/operations/impl/SerializableStringField.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
*/
Expand Down
4 changes: 4 additions & 0 deletions .../hibernate/search/indexes/serialization/operations/impl/SerializableTokenStreamField.java
View file
Expand Up @@ -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 <emmanuel@hibernate.org>
*/
Expand Down
6 changes: 0 additions & 6 deletions hibernate-search/src/main/java/org/hibernate/search/util/logging/impl/Log.java
View file
Expand Up @@ -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;
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...rnate-search/src/test/java/org/hibernate/search/test/serialization/SerializationTest.java
View file
Expand Up @@ -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;
Expand Down

0 comments on commit 925398c

Please sign in to comment.