Minor clean up

Author: cowtowncoder

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AvroTestBase.java

@@ -9,8 +9,6 @@
 import junit.framework.TestCase;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -80,7 +78,7 @@ public abstract class AvroTestBase extends TestCase
     /**********************************************************
      */
 
-    protected static class PointLong
+    public static class PointLong
     {
         public long x, y;
 
@@ -92,7 +90,7 @@ public PointLong(long x0, long y0) {
         }
     }
 
-    protected static class PointDouble
+    public static class PointDouble
     {
         public double x, y;
 
@@ -104,7 +102,6 @@ public PointDouble(long x0, long y0) {
         }
     }
 
-    // public because needed by "AvroAliasTest"
     public static class Employee
     {
         public Employee() { }
@@ -127,7 +124,7 @@ public static Employee construct() {
     }
 
     @JsonPropertyOrder({"content", "images"})
-    protected static class MediaItem
+    static class MediaItem
     {
         private MediaContent _content;
         private List<Image> _images;
@@ -154,7 +151,7 @@ public void addPhoto(Image p) {
 
     @JsonPropertyOrder(alphabetic=true, value = {
             "uri","title","width","height","format","duration","size","bitrate","persons","player","copyright"})
-    protected static class MediaContent
+    static class MediaContent
     {
         public enum Player { JAVA, FLASH;  }
 
@@ -219,7 +216,7 @@ public void addPerson(String p) {
     }
 
     @JsonPropertyOrder({"uri","title","width","height","size"})
-    protected static class Image
+    static class Image
     {
         private String _uri;
         private String _title;
@@ -253,19 +250,6 @@ public Image(String uri, String title, int w, int h, Size s)
     // public because needed by "AvroAliasTest"
     public enum Size { SMALL, LARGE; }
 
-    protected enum ABC {
-		A, 
-		B, 
-		@JsonEnumDefaultValue
-		C; 
-    }
-
-    protected static class ABCDefaultClass {
-        public String name;
-        @JsonProperty(required = true)
-        public ABC abc;
-    }
-
     /*
     /**********************************************************
     /* Recycling for commonly needed helper objects

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/EnumTest.java

@@ -6,6 +6,8 @@
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Type;
 
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
 
 public class EnumTest extends AvroTestBase
@@ -38,6 +40,19 @@ protected static class EmployeeStr {
         public String gender;
     }
 
+    protected enum ABC {
+        A,
+        B,
+        @JsonEnumDefaultValue
+        C; 
+    }
+
+    protected static class ABCDefaultClass {
+        public String name;
+        @JsonProperty(required = true)
+        public ABC abc;
+    }
+
     private final AvroMapper MAPPER = newMapper();
 
     public void test_avroSchemaWithEnum_fromEnumValueToEnumValue() throws Exception