Sun, 18 Jun 2017 23:18:45 +0100
8172297: In java 8, the marshalling with JAX-WS does not escape carriage return
Reviewed-by: lancea
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. Oracle designates this |
aoqi@0 | 8 | * particular file as subject to the "Classpath" exception as provided |
aoqi@0 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
aoqi@0 | 10 | * |
aoqi@0 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 15 | * accompanied this code). |
aoqi@0 | 16 | * |
aoqi@0 | 17 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 20 | * |
aoqi@0 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 22 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 23 | * questions. |
aoqi@0 | 24 | */ |
aoqi@0 | 25 | |
aoqi@0 | 26 | package com.sun.xml.internal.bind.marshaller; |
aoqi@0 | 27 | |
aoqi@0 | 28 | import java.io.IOException; |
aoqi@0 | 29 | import java.io.Writer; |
aoqi@0 | 30 | import java.nio.charset.Charset; |
aoqi@0 | 31 | import java.nio.charset.CharsetEncoder; |
aoqi@0 | 32 | |
aoqi@0 | 33 | /** |
aoqi@0 | 34 | * Uses JDK1.4 NIO functionality to escape characters smartly. |
aoqi@0 | 35 | * |
aoqi@0 | 36 | * @since 1.0.1 |
aoqi@0 | 37 | * @author |
aoqi@0 | 38 | * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) |
aoqi@0 | 39 | */ |
aoqi@0 | 40 | public class NioEscapeHandler implements CharacterEscapeHandler { |
aoqi@0 | 41 | |
aoqi@0 | 42 | private final CharsetEncoder encoder; |
aoqi@0 | 43 | |
aoqi@0 | 44 | // exposing those variations upset javac 1.3.1, since it needs to |
aoqi@0 | 45 | // know about those classes to determine which overloaded version |
aoqi@0 | 46 | // of the method it wants to use. So comment it out for the compatibility. |
aoqi@0 | 47 | |
aoqi@0 | 48 | // public NioEscapeHandler(CharsetEncoder _encoder) { |
aoqi@0 | 49 | // this.encoder = _encoder; |
aoqi@0 | 50 | // if(encoder==null) |
aoqi@0 | 51 | // throw new NullPointerException(); |
aoqi@0 | 52 | // } |
aoqi@0 | 53 | // |
aoqi@0 | 54 | // public NioEscapeHandler(Charset charset) { |
aoqi@0 | 55 | // this(charset.newEncoder()); |
aoqi@0 | 56 | // } |
aoqi@0 | 57 | |
aoqi@0 | 58 | public NioEscapeHandler(String charsetName) { |
aoqi@0 | 59 | // this(Charset.forName(charsetName)); |
aoqi@0 | 60 | this.encoder = Charset.forName(charsetName).newEncoder(); |
aoqi@0 | 61 | } |
aoqi@0 | 62 | |
aoqi@0 | 63 | public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException { |
aoqi@0 | 64 | int limit = start+length; |
aoqi@0 | 65 | for (int i = start; i < limit; i++) { |
aoqi@0 | 66 | switch (ch[i]) { |
aoqi@0 | 67 | case '&': |
aoqi@0 | 68 | out.write("&"); |
aoqi@0 | 69 | break; |
aoqi@0 | 70 | case '<': |
aoqi@0 | 71 | out.write("<"); |
aoqi@0 | 72 | break; |
aoqi@0 | 73 | case '>': |
aoqi@0 | 74 | out.write(">"); |
aoqi@0 | 75 | break; |
aoqi@0 | 76 | case '\"': |
aoqi@0 | 77 | if (isAttVal) { |
aoqi@0 | 78 | out.write("""); |
aoqi@0 | 79 | } else { |
aoqi@0 | 80 | out.write('\"'); |
aoqi@0 | 81 | } |
aoqi@0 | 82 | break; |
aoqi@0 | 83 | default: |
aoqi@0 | 84 | if( encoder.canEncode(ch[i]) ) { |
aoqi@0 | 85 | out.write(ch[i]); |
aoqi@0 | 86 | } else { |
aoqi@0 | 87 | out.write("&#"); |
aoqi@0 | 88 | out.write(Integer.toString(ch[i])); |
aoqi@0 | 89 | out.write(';'); |
aoqi@0 | 90 | } |
aoqi@0 | 91 | } |
aoqi@0 | 92 | } |
aoqi@0 | 93 | } |
aoqi@0 | 94 | |
aoqi@0 | 95 | } |