svn commit: r1611772 - in /avro/trunk: CHANGES.txt lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java

[cutting]

Author: cutting
Date: Fri Jul 18 19:11:17 2014
New Revision: 1611772

URL: http://svn.apache.org/r1611772
Log:
AVRO-1546. Java: Change GenericData.Record#toString() to not escape forward 
slashes.  Contributed by Brandon Forehand.

Modified:
    avro/trunk/CHANGES.txt
    
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java
    
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java

Modified: avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1611772&r1=1611771&r2=1611772&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Jul 18 19:11:17 2014
@@ -66,6 +66,9 @@ Avro 1.7.7 (23 July 2014)
     AVRO-1536. Ruby: Remove monkeypatching of Enumerable.
     (Willem van Bergen via martinkl)
 
+    AVRO-1546. Java: Change GenericData.Record#toString() to not
+    escape forward slashes. (Brandon Forehand via cutting)
+
   BUG FIXES
 
     AVRO-1446. C#: Correctly handle system errors in RPC.

Modified: 
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java?rev=1611772&r1=1611771&r2=1611772&view=diff
==============================================================================
--- 
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java
 (original)
+++ 
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java
 Fri Jul 18 19:11:17 2014
@@ -502,9 +502,6 @@ public class GenericData {
         case '\t':
           builder.append("\\t");
           break;
-        case '/':
-          builder.append("\\/");
-          break;
         default:
           // Reference: http://www.unicode.org/versions/Unicode5.1.0/
           if((ch>='\u0000' && ch<='\u001F') || (ch>='\u007F' && ch<='\u009F') 
|| (ch>='\u2000' && ch<='\u20FF')){

Modified: 
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java?rev=1611772&r1=1611771&r2=1611772&view=diff
==============================================================================
--- 
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
 (original)
+++ 
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
 Fri Jul 18 19:11:17 2014
@@ -318,6 +318,11 @@ public class TestGenericData {
     mapper.readTree(parser);
   }
 
+  @Test public void testToStringDoesNotEscapeForwardSlash() throws Exception {
+    GenericData data = GenericData.get();
+    assertEquals("\"/\"", data.toString("/"));
+  }
+
   @Test public void testToStringNanInfinity() throws Exception {
     GenericData data = GenericData.get();
     assertEquals("\"Infinity\"",data.toString(Float.POSITIVE_INFINITY));