Browse Source

HADOOP-6492. Make some Avro serialization APIs public. Contributed by Aaron Kimball.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@899866 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 15 years ago
parent
commit
4cd159e83e

+ 3 - 0
CHANGES.txt

@@ -101,6 +101,9 @@ Trunk (unreleased changes)
 
     HADOOP-6155. Deprecate RecordIO anticipating Avro. (Tom White via cdouglas)
 
+    HADOOP-6492. Make some Avro serialization APIs public.
+    (Aaron Kimball via cutting)
+
   OPTIMIZATIONS
 
   BUG FIXES

+ 2 - 2
src/java/org/apache/hadoop/io/serializer/SerializationBase.java

@@ -77,8 +77,8 @@ public abstract class SerializationBase<T> extends Configured
    */
   public abstract DeserializerBase<T> getDeserializer(
       Map<String, String> metadata);
-  
-  protected Class<?> getClassFromMetadata(Map<String, String> metadata) {
+
+  public Class<?> getClassFromMetadata(Map<String, String> metadata) {
     String classname = metadata.get(CLASS_KEY);
     if (classname == null) {
       return null;

+ 3 - 3
src/java/org/apache/hadoop/io/serializer/avro/AvroGenericSerialization.java

@@ -46,18 +46,18 @@ public class AvroGenericSerialization extends AvroSerialization<Object> {
   }
 
   @Override
-  protected DatumReader getReader(Map<String, String> metadata) {
+  public DatumReader getReader(Map<String, String> metadata) {
     Schema schema = Schema.parse(metadata.get(AVRO_SCHEMA_KEY));
     return new GenericDatumReader<Object>(schema);
   }
 
   @Override
-  protected Schema getSchema(Map<String, String> metadata) {
+  public Schema getSchema(Map<String, String> metadata) {
     return Schema.parse(metadata.get(AVRO_SCHEMA_KEY));
   }
 
   @Override
-  protected DatumWriter getWriter(Map<String, String> metadata) {
+  public DatumWriter getWriter(Map<String, String> metadata) {
     return new GenericDatumWriter<Object>();
   }
 

+ 3 - 3
src/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerialization.java

@@ -76,7 +76,7 @@ public class AvroReflectSerialization extends AvroSerialization<Object>{
   }
 
   @Override
-  protected DatumReader getReader(Map<String, String> metadata) {
+  public DatumReader getReader(Map<String, String> metadata) {
     try {
       return new ReflectDatumReader(getClassFromMetadata(metadata));
     } catch (Exception e) {
@@ -85,13 +85,13 @@ public class AvroReflectSerialization extends AvroSerialization<Object>{
   }
 
   @Override
-  protected Schema getSchema(Map<String, String> metadata) {
+  public Schema getSchema(Map<String, String> metadata) {
     Class<?> c = getClassFromMetadata(metadata);
     return ReflectData.get().getSchema(c);
   }
 
   @Override
-  protected DatumWriter getWriter(Map<String, String> metadata) {
+  public DatumWriter getWriter(Map<String, String> metadata) {
     return new ReflectDatumWriter();
   }
 

+ 3 - 3
src/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java

@@ -51,17 +51,17 @@ public abstract class AvroSerialization<T> extends SerializationBase<T> {
   /**
    * Return an Avro Schema instance for the given class and metadata.
    */
-  protected abstract Schema getSchema(Map<String, String> metadata);
+  public abstract Schema getSchema(Map<String, String> metadata);
 
   /**
    * Create and return Avro DatumWriter for the given metadata.
    */
-  protected abstract DatumWriter<T> getWriter(Map<String, String> metadata);
+  public abstract DatumWriter<T> getWriter(Map<String, String> metadata);
 
   /**
    * Create and return Avro DatumReader for the given metadata.
    */
-  protected abstract DatumReader<T> getReader(Map<String, String> metadata);
+  public abstract DatumReader<T> getReader(Map<String, String> metadata);
 
   class AvroSerializer extends SerializerBase<T> {
 

+ 3 - 3
src/java/org/apache/hadoop/io/serializer/avro/AvroSpecificSerialization.java

@@ -47,7 +47,7 @@ public class AvroSpecificSerialization
   }
 
   @Override
-  protected DatumReader getReader(Map<String, String> metadata) {
+  public DatumReader getReader(Map<String, String> metadata) {
     try {
       return new SpecificDatumReader(getClassFromMetadata(metadata));
     } catch (Exception e) {
@@ -56,13 +56,13 @@ public class AvroSpecificSerialization
   }
 
   @Override
-  protected Schema getSchema(Map<String, String> metadata) {
+  public Schema getSchema(Map<String, String> metadata) {
     Class<?> c = getClassFromMetadata(metadata);
     return SpecificData.get().getSchema(c);
   }
 
   @Override
-  protected DatumWriter getWriter(Map<String, String> metadata) {
+  public DatumWriter getWriter(Map<String, String> metadata) {
     return new SpecificDatumWriter();
   }